Handle most LDSCRIPT setting centrally
authorScott Wood <scottwood@freescale.com>
Wed, 6 Apr 2011 13:31:37 +0000 (13:31 +0000)
committerWolfgang Denk <wd@denx.de>
Fri, 29 Apr 2011 22:59:47 +0000 (00:59 +0200)
commit83b7e2a7f2f9cf7651e623c75aa9a27ad6488fb3
treeded021bb78977fe1a1686fb8868535bc7a509406
parentec9a3740415ba613d0d84890fdb426e576a7eeef
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>
30 files changed:
arch/arm/config.mk
arch/nios2/config.mk
arch/powerpc/config.mk
arch/sh/config.mk
arch/x86/config.mk
board/actux1/config.mk
board/actux2/config.mk
board/actux3/config.mk
board/altera/nios2-generic/config.mk
board/amcc/acadia/config.mk
board/amcc/bamboo/config.mk
board/amcc/canyonlands/config.mk
board/amcc/kilauea/config.mk
board/amcc/sequoia/config.mk
board/atmel/atstk1000/config.mk
board/avnet/fx12mm/config.mk [deleted file]
board/avnet/v5fx30teval/config.mk [deleted file]
board/cm5200/u-boot.lds [deleted file]
board/cogent/config.mk
board/earthlcd/favr-32-ezkit/config.mk
board/freescale/mx31ads/config.mk
board/hymod/config.mk
board/munices/u-boot.lds [deleted file]
board/samsung/smdk6400/config.mk
board/sc3/u-boot.lds [deleted file]
board/trab/config.mk
board/xilinx/ml507/config.mk [deleted file]
board/xilinx/ppc405-generic/config.mk [deleted file]
board/xilinx/ppc440-generic/config.mk [deleted file]
config.mk