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>
Showing
- arch/arm/config.mk 0 additions, 1 deletionarch/arm/config.mk
- arch/nios2/config.mk 0 additions, 2 deletionsarch/nios2/config.mk
- arch/powerpc/config.mk 0 additions, 11 deletionsarch/powerpc/config.mk
- arch/sh/config.mk 0 additions, 6 deletionsarch/sh/config.mk
- arch/x86/config.mk 0 additions, 1 deletionarch/x86/config.mk
- board/actux1/config.mk 0 additions, 2 deletionsboard/actux1/config.mk
- board/actux2/config.mk 0 additions, 2 deletionsboard/actux2/config.mk
- board/actux3/config.mk 0 additions, 2 deletionsboard/actux3/config.mk
- board/altera/nios2-generic/config.mk 0 additions, 2 deletionsboard/altera/nios2-generic/config.mk
- board/amcc/acadia/config.mk 0 additions, 7 deletionsboard/amcc/acadia/config.mk
- board/amcc/bamboo/config.mk 0 additions, 7 deletionsboard/amcc/bamboo/config.mk
- board/amcc/canyonlands/config.mk 0 additions, 7 deletionsboard/amcc/canyonlands/config.mk
- board/amcc/kilauea/config.mk 0 additions, 7 deletionsboard/amcc/kilauea/config.mk
- board/amcc/sequoia/config.mk 0 additions, 7 deletionsboard/amcc/sequoia/config.mk
- board/atmel/atstk1000/config.mk 0 additions, 1 deletionboard/atmel/atstk1000/config.mk
- board/avnet/fx12mm/config.mk 0 additions, 29 deletionsboard/avnet/fx12mm/config.mk
- board/avnet/v5fx30teval/config.mk 0 additions, 29 deletionsboard/avnet/v5fx30teval/config.mk
- board/cm5200/u-boot.lds 0 additions, 120 deletionsboard/cm5200/u-boot.lds
- board/cogent/config.mk 0 additions, 2 deletionsboard/cogent/config.mk
- board/earthlcd/favr-32-ezkit/config.mk 0 additions, 1 deletionboard/earthlcd/favr-32-ezkit/config.mk
Loading
Please register or sign in to comment