summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorsascha <sascha@nomad.localdomain>2007-10-17 12:21:53 +0200
committersascha <sascha@nomad.localdomain>2007-10-17 12:21:53 +0200
commitd59ca7feb3220ae846a10b6f7da0712e2c1feae3 (patch)
tree5be088d4b9a0b5c8a2101faffc1ca17a668c63e5 /Makefile
parentb36fca0cb81493c26825d4f1df1c61bebd5df942 (diff)
downloadbarebox-d59ca7feb3220ae846a10b6f7da0712e2c1feae3.tar.gz
barebox-d59ca7feb3220ae846a10b6f7da0712e2c1feae3.tar.xz
Linking: Remove linker scripts from (arm based-) boards and add
a generic linker script to arch/arm/lib/u-boot.lds.S. If a board wants to overwrite a linker script it can do so using CONFIG_BOARD_LINKER_SCRIPT. There is no generic linker script for ppc and blackfin yet, so still use the board specific one.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b1dba189df..1d4b5b1d19 100644
--- a/Makefile
+++ b/Makefile
@@ -494,8 +494,8 @@ common-y := $(patsubst %/, %/built-in.o, $(common-y))
# System.map is generated to document addresses of all kernel symbols
uboot-common := $(common-y)
-uboot-all := $(uboot-common)
-uboot-lds := $(BOARD)/u-boot.lds
+uboot-all := $(uboot-common)
+uboot-lds := $(lds-y)
# Rule to link uboot
# May be overridden by arch/$(ARCH)/Makefile
@@ -903,7 +903,7 @@ endif # CONFIG_MODULES
# Directories & files removed with 'make clean'
CLEAN_DIRS += $(MODVERDIR)
CLEAN_FILES += uboot System.map include/uboot_default_env.h \
- .tmp_version .tmp_uboot* uboot.bin uboot.S $(uboot-lds) \
+ .tmp_version .tmp_uboot* uboot.bin uboot.S \
.tmp_kallsyms*
# Directories & files removed with 'make mrproper'