spl: add hierarchical defaults for SPL_LDSCRIPT

With SPL_LDSCRIPT moved to Kconfig (and this being a 'string' config
node), all the lingering definitions in header files will cause
warnings/errors due to the redefinition of the configuration item.

As we don't want to pollute the defconfig files (and values should
usually be identical for entire architectures), the defaults are moved
into Kconfig.  Kconfig will always pick the first default that
matches, so please keep these values at the end of each file (to allow
any board-specific Kconfig, which will be included earlier) to
override with an unconditional default setting.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Philipp Tomsich
2017-08-03 23:23:55 +02:00
parent 96b9082c64
commit b529993e02
13 changed files with 50 additions and 0 deletions

View File

@@ -1,5 +1,8 @@
if TARGET_APF27
config SPL_LDSCRIPT
default "arch/$(ARCH)/cpu/u-boot-spl.lds"
config SYS_BOARD
default "apf27"

View File

@@ -1,5 +1,8 @@
if TARGET_MX31PDK
config SPL_LDSCRIPT
default "arch/$(ARCH)/cpu/u-boot-spl.lds"
config SYS_BOARD
default "mx31pdk"

View File

@@ -1,5 +1,8 @@
if TARGET_X600
config SPL_LDSCRIPT
default "arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds"
config SYS_BOARD
default "x600"