diff options
| author | Scott Wood <scottwood@freescale.com> | 2011-04-06 13:31:37 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 00:59:47 +0200 |
| commit | 83b7e2a7f2f9cf7651e623c75aa9a27ad6488fb3 (patch) | |
| tree | ded021bb78977fe1a1686fb8868535bc7a509406 /board/amcc/acadia | |
| parent | ec9a3740415ba613d0d84890fdb426e576a7eeef (diff) | |
| download | u-boot-imx-83b7e2a7f2f9cf7651e623c75aa9a27ad6488fb3.zip u-boot-imx-83b7e2a7f2f9cf7651e623c75aa9a27ad6488fb3.tar.gz u-boot-imx-83b7e2a7f2f9cf7651e623c75aa9a27ad6488fb3.tar.bz2 | |
Handle most LDSCRIPT setting centrally
Currently, some linker scripts are found by common code in config.mk.
Some are found using CONFIG_SYS_LDSCRIPT, but the code for that is
sometimes in arch config.mk and sometimes in board config.mk. Some
are found using an arch-specific rule for looking in CPUDIR, etc.
Further, the powerpc config.mk rule relied on CONFIG_NAND_SPL
when it really wanted CONFIG_NAND_U_BOOT -- which covered up the fact
that not all NAND_U_BOOT builds actually wanted CPUDIR/u-boot-nand.lds.
Replace all of this -- except for a handful of boards that are actually
selecting a linker script in a unique way -- with centralized ldscript
finding.
If board code specifies LDSCRIPT, that will be used.
Otherwise, if CONFIG_SYS_LDSCRIPT is specified, that will be used.
If neither of these are specified, then the central config.mk will
check for the existence of the following, in order:
$(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds (only if CONFIG_NAND_U_BOOT)
$(TOPDIR)/$(CPUDIR)/u-boot-nand.lds (only if CONFIG_NAND_U_BOOT)
$(TOPDIR)/board/$(BOARDDIR)/u-boot.lds
$(TOPDIR)/$(CPUDIR)/u-boot.lds
Some boards (sc3, cm5200, munices) provided their own u-boot.lds that
were dead code, because they were overridden by a CPUDIR u-boot.lds under
the old powerpc rules. These boards' own u-boot.lds have bitrotted and
no longer work -- these lds files have been removed.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Tested-by: Graeme Russ <graeme.russ@gmail.com>
Diffstat (limited to 'board/amcc/acadia')
| -rw-r--r-- | board/amcc/acadia/config.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/board/amcc/acadia/config.mk b/board/amcc/acadia/config.mk index 2f2787f..bfc0945 100644 --- a/board/amcc/acadia/config.mk +++ b/board/amcc/acadia/config.mk @@ -28,10 +28,3 @@ ifeq ($(debug),1) PLATFORM_CPPFLAGS += -DDEBUG endif - -ifdef CONFIG_SYS_LDSCRIPT -# need to strip off double quotes -LDSCRIPT := $(subst ",,$(CONFIG_SYS_LDSCRIPT)) -else ifdef CONFIG_NAND_U_BOOT -LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds -endif |