summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-11-21 10:49:40 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-03-30 07:43:37 +0200
commit7e6403a66d9a9c939ee8146436d7d652673b2995 (patch)
tree85448fc765d67dae43baa307ffe3fa8b99bfbce4
parent3a62d8c3a93c63183fdad1d52277bb15ac72ba79 (diff)
downloadu-boot-imx-7e6403a66d9a9c939ee8146436d7d652673b2995.zip
u-boot-imx-7e6403a66d9a9c939ee8146436d7d652673b2995.tar.gz
u-boot-imx-7e6403a66d9a9c939ee8146436d7d652673b2995.tar.bz2
Define CPUDIR for the .lds link script
Most link scripts differ only in the directory containing the start.o file. Make this a #define to remove this last difference. (Note that if start.o were disallowed outside the CPU start directory then we wouldn't even need this. But that is a separate discussion.) Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile1
-rw-r--r--spl/Makefile1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e2a5a84..8204312 100644
--- a/Makefile
+++ b/Makefile
@@ -344,6 +344,7 @@ export PLATFORM_LIBS
# on the fly.
LDPPFLAGS += \
-include $(TOPDIR)/include/u-boot/u-boot.lds.h \
+ -DCPUDIR=$(CPUDIR) \
$(shell $(LD) --version | \
sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
diff --git a/spl/Makefile b/spl/Makefile
index 680f6dd..ea7d475 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -93,6 +93,7 @@ endif
LDPPFLAGS += \
-include $(TOPDIR)/include/u-boot/u-boot.lds.h \
-include $(OBJTREE)/include/config.h \
+ -DCPUDIR=$(CPUDIR) \
$(shell $(LD) --version | \
sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')