From: Stefano Babic <sbabic@denx.de>
Date: Thu, 27 Jan 2011 06:03:49 +0000 (+0000)
Subject: ARM: fix broken build of ARM
X-Git-Tag: v2011.03-rc1~2^2~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a4594e41b907f60c85ed1cf96b65602f6b587a50;p=oweals%2Fu-boot.git

ARM: fix broken build of ARM

Commit 8aba9dceebb14144e07d19593111ee3a999c37fc breaks
ARM boards because for ARM the -pie option is used
for partial linking together with -r option.

The patch adds the -pie option to link u-boot.bin only.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Jason Liu <liu.h.jason@gmail.com>
CC: lool@dooz.org
CC: Wolfgang Denk <wd@denx.de>
CC: Albert Aribaud <albert.aribaud@free.fr>
Tested-by: Alexander Holler <holler@ahsoftware.de>
---

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 4e165bfda4..a6a4742451 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -67,5 +67,5 @@ LDSCRIPT := $(SRCTREE)/$(CPUDIR)/u-boot.lds
 
 # needed for relocation
 ifndef CONFIG_NAND_SPL
-PLATFORM_LDFLAGS += -pie
+LDFLAGS_u-boot += -pie
 endif