spl: Move SPL_LDSCRIPT defaults to one place

We want to keep all of the default values for SPL_LDSCRIPT in the same
place both for overall clarity as well as not polluting unrelated config
files.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dab785efad5a54aba2645d8e72d0004039f7898a..e682d65e512508872df3554333f0cdb933103f2d 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -996,11 +996,6 @@ config ARCH_MX6
        imply SYS_THUMB_BUILD
        imply SPL_SEPARATE_BSS
 
-if ARCH_MX6
-config SPL_LDSCRIPT
-       default "arch/arm/mach-omap2/u-boot-spl.lds"
-endif
-
 config ARCH_MX5
        bool "Freescale MX5"
        select BOARD_EARLY_INIT_F
@@ -2368,8 +2363,3 @@ source "board/xen/xenguest_arm64/Kconfig"
 source "arch/arm/Kconfig.debug"
 
 endmenu
-
-config SPL_LDSCRIPT
-       default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK
-       default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
-       default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 80a1642447d60c8fd46a785b451cc8da720666c4..5a809b46118cc99d27f4946261da9a575d1de815 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -701,9 +701,6 @@ config SYS_FSL_HAS_RGMII
        bool
        depends on SYS_FSL_EC1 || SYS_FSL_EC2
 
-config SPL_LDSCRIPT
-       default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A
-
 config HAS_FSL_XHCI_USB
        bool
        help

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 4fee9772bf1c1eaab06b423519e494f90cd10373..11bfd5afe74555d2db0f1361b31267030af5d9da 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -377,8 +377,4 @@ source "board/siemens/corvus/Kconfig"
 source "board/siemens/taurus/Kconfig"
 source "board/siemens/smartweb/Kconfig"
 
-config SPL_LDSCRIPT
-       default "arch/arm/mach-at91/arm926ejs/u-boot-spl.lds" if CPU_ARM926EJS
-       default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if CPU_V7A
-
 endif

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 6eca8db6d5ff5c65a61c64f8b56b9dde290ad6e9..25c5db49915bc4e98eb8fded9daee1ea20176b4f 100644 (file)
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -134,7 +134,4 @@ endif
 source "board/davinci/da8xxevm/Kconfig"
 source "board/lego/ev3/Kconfig"
 
-config SPL_LDSCRIPT
-       default "board/davinci/da8xxevm/u-boot-spl-da850evm.lds"
-
 endif

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index f73dbbb507d148e6e35fc9c1441adf8dc3a05565..77fb9d1775bba147415b9cab3f87a9231f19b3af 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -201,7 +201,4 @@ source "board/samsung/smdk5420/Kconfig"
 source "board/samsung/espresso7420/Kconfig"
 source "board/samsung/axy17lte/Kconfig"
 
-config SPL_LDSCRIPT
-       default "board/samsung/common/exynos-uboot-spl.lds" if ARCH_EXYNOS5 || ARCH_EXYNOS4
-
 endif

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e1b9180a3bb3a4b1ff49c5465d3e48d6b35b4cf9..51d1db4a87b0413536ba9991a4fdbc2e7afc3ee1 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -190,7 +190,4 @@ source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t43/Kconfig"
 source "board/phytec/phycore_am335x_r2/Kconfig"
 
-config SPL_LDSCRIPT
-        default "arch/arm/mach-omap2/u-boot-spl.lds"
-
 endif

diff --git a/arch/arm/mach-rockchip/rk3368/Kconfig b/arch/arm/mach-rockchip/rk3368/Kconfig
index 25afd3cb6077f16d1283c92b1ca655e2fa44b774..c3249a7be457d3c27767c43b1398980da89b5c40 100644 (file)
--- a/arch/arm/mach-rockchip/rk3368/Kconfig
+++ b/arch/arm/mach-rockchip/rk3368/Kconfig
@@ -65,9 +65,6 @@ source "board/rockchip/sheep_rk3368/Kconfig"
 source "board/geekbuying/geekbox/Kconfig"
 source "board/rockchip/evb_px5/Kconfig"
 
-config SPL_LDSCRIPT
-       default "arch/arm/cpu/armv8/u-boot-spl.lds"
-
 config SPL_STACK_R_ADDR
        default 0x04000000
 

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index e712a895340874ceae25fe87b88f46ac0f6d1614..71a7f8dcee06799eba9ef6da82315a70a8dbbe6c 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -1,9 +1,5 @@
 if ARCH_SUNXI
 
-config SPL_LDSCRIPT
-       default "arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds" if MACH_SUNIV
-       default "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" if !ARM64
-
 config IDENT_STRING
        default " Allwinner Technology"
 

diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index cf2e727916ba3752155972c32230d01ab4e0a84a..b4c439b4cd6d673ab7489ceebdfecc9cb974bc75 100644 (file)
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -1,8 +1,5 @@
 if ARCH_ZYNQ
 
-config SPL_LDSCRIPT
-       default "arch/arm/mach-zynq/u-boot-spl.lds"
-
 config SPL_FS_FAT
        default y
 

diff --git a/board/ti/am64x/Kconfig b/board/ti/am64x/Kconfig
index d4ec759d7f9718ecfd2fb91731b009a4241ff50f..8036947e3450e3c0babcb46efcfb023984f23125 100644 (file)
--- a/board/ti/am64x/Kconfig
+++ b/board/ti/am64x/Kconfig
@@ -54,9 +54,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "am64x_evm"
 
-config SPL_LDSCRIPT
-       default "arch/arm/mach-omap2/u-boot-spl.lds"
-
 source "board/ti/common/Kconfig"
 
 endif

diff --git a/board/ti/am65x/Kconfig b/board/ti/am65x/Kconfig
index 47b41cd6afe422ee4bac7bcad21de7503cc4b3f9..16a7476d9c4bc94f782ab23fbf5d8a54af48ee35 100644 (file)
--- a/board/ti/am65x/Kconfig
+++ b/board/ti/am65x/Kconfig
@@ -53,9 +53,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "am65x_evm"
 
-config SPL_LDSCRIPT
-       default "arch/arm/mach-omap2/u-boot-spl.lds"
-
 source "board/ti/common/Kconfig"
 
 endif

diff --git a/board/ti/j721e/Kconfig b/board/ti/j721e/Kconfig
index c28752a658b3d5c9490bdf55e4e50fcd176cfbc9..d19d30d59ef7c8337c797a85fa84c38e0204ea53 100644 (file)
--- a/board/ti/j721e/Kconfig
+++ b/board/ti/j721e/Kconfig
@@ -75,9 +75,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "j721e_evm"
 
-config SPL_LDSCRIPT
-       default "arch/arm/mach-omap2/u-boot-spl.lds"
-
 source "board/ti/common/Kconfig"
 
 endif
@@ -108,9 +105,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "j721e_evm"
 
-config SPL_LDSCRIPT
-       default "arch/arm/mach-omap2/u-boot-spl.lds"
-
 source "board/ti/common/Kconfig"
 
 endif

diff --git a/board/ti/j721s2/Kconfig b/board/ti/j721s2/Kconfig
index 2e115f14171d5aeb8816cf089bd989207a745903..6141798333c0eef244dd99b6aa7f4d8ff30d7515 100644 (file)
--- a/board/ti/j721s2/Kconfig
+++ b/board/ti/j721s2/Kconfig
@@ -55,9 +55,6 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
        default "j721s2_evm"
 
-config SPL_LDSCRIPT
-       default "arch/arm/mach-omap2/u-boot-spl.lds"
-
 source "board/ti/common/Kconfig"
 
 endif

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 2ad2351c6eb3f16674c5e32a04189878b7d92a04..42f2c95228a6f7279eab315d1b1480571cc129d2 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -221,6 +221,18 @@ config SPL_HANDOFF
 
 config SPL_LDSCRIPT
        string "Linker script for the SPL stage"
+       default "arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds" if MACH_SUNIV
+       default "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" if ARCH_SUNXI && !MACH_SUNIV && !ARM64
+       default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK
+       default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
+       default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A
+       default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
+       default "arch/arm/mach-at91/arm926ejs/u-boot-spl.lds" if ARCH_AT91 && CPU_ARM926EJS
+       default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if ARCH_AT91 && CPU_V7A
+       default "arch/arm/mach-omap2/u-boot-spl.lds" if ARCH_MX6 || ARCH_OMAP2PLUS || (ARCH_K3 && !ARM64)
+       default "arch/arm/mach-zynq/u-boot-spl.lds" if ARCH_ZYNQ
+       default "board/samsung/common/exynos-uboot-spl.lds" if ARCH_EXYNOS5 || ARCH_EXYNOS4
+       default "board/davinci/da8xxevm/u-boot-spl-da850evm.lds" if ARCH_DAVINCI
        default "arch/\$(ARCH)/cpu/u-boot-spl.lds"
        help
          The SPL stage will usually require a different linker-script