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>
This commit is contained in:
parent
49958813e2
commit
5858b90f50
|
@ -996,11 +996,6 @@ config ARCH_MX6
|
||||||
imply SYS_THUMB_BUILD
|
imply SYS_THUMB_BUILD
|
||||||
imply SPL_SEPARATE_BSS
|
imply SPL_SEPARATE_BSS
|
||||||
|
|
||||||
if ARCH_MX6
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-omap2/u-boot-spl.lds"
|
|
||||||
endif
|
|
||||||
|
|
||||||
config ARCH_MX5
|
config ARCH_MX5
|
||||||
bool "Freescale MX5"
|
bool "Freescale MX5"
|
||||||
select BOARD_EARLY_INIT_F
|
select BOARD_EARLY_INIT_F
|
||||||
|
@ -2368,8 +2363,3 @@ source "board/xen/xenguest_arm64/Kconfig"
|
||||||
source "arch/arm/Kconfig.debug"
|
source "arch/arm/Kconfig.debug"
|
||||||
|
|
||||||
endmenu
|
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
|
|
||||||
|
|
|
@ -701,9 +701,6 @@ config SYS_FSL_HAS_RGMII
|
||||||
bool
|
bool
|
||||||
depends on SYS_FSL_EC1 || SYS_FSL_EC2
|
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
|
config HAS_FSL_XHCI_USB
|
||||||
bool
|
bool
|
||||||
help
|
help
|
||||||
|
|
|
@ -377,8 +377,4 @@ source "board/siemens/corvus/Kconfig"
|
||||||
source "board/siemens/taurus/Kconfig"
|
source "board/siemens/taurus/Kconfig"
|
||||||
source "board/siemens/smartweb/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
|
endif
|
||||||
|
|
|
@ -134,7 +134,4 @@ endif
|
||||||
source "board/davinci/da8xxevm/Kconfig"
|
source "board/davinci/da8xxevm/Kconfig"
|
||||||
source "board/lego/ev3/Kconfig"
|
source "board/lego/ev3/Kconfig"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "board/davinci/da8xxevm/u-boot-spl-da850evm.lds"
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -201,7 +201,4 @@ source "board/samsung/smdk5420/Kconfig"
|
||||||
source "board/samsung/espresso7420/Kconfig"
|
source "board/samsung/espresso7420/Kconfig"
|
||||||
source "board/samsung/axy17lte/Kconfig"
|
source "board/samsung/axy17lte/Kconfig"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "board/samsung/common/exynos-uboot-spl.lds" if ARCH_EXYNOS5 || ARCH_EXYNOS4
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -190,7 +190,4 @@ source "board/compulab/cm_t335/Kconfig"
|
||||||
source "board/compulab/cm_t43/Kconfig"
|
source "board/compulab/cm_t43/Kconfig"
|
||||||
source "board/phytec/phycore_am335x_r2/Kconfig"
|
source "board/phytec/phycore_am335x_r2/Kconfig"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-omap2/u-boot-spl.lds"
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -65,9 +65,6 @@ source "board/rockchip/sheep_rk3368/Kconfig"
|
||||||
source "board/geekbuying/geekbox/Kconfig"
|
source "board/geekbuying/geekbox/Kconfig"
|
||||||
source "board/rockchip/evb_px5/Kconfig"
|
source "board/rockchip/evb_px5/Kconfig"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/cpu/armv8/u-boot-spl.lds"
|
|
||||||
|
|
||||||
config SPL_STACK_R_ADDR
|
config SPL_STACK_R_ADDR
|
||||||
default 0x04000000
|
default 0x04000000
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,5 @@
|
||||||
if ARCH_SUNXI
|
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
|
config IDENT_STRING
|
||||||
default " Allwinner Technology"
|
default " Allwinner Technology"
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
if ARCH_ZYNQ
|
if ARCH_ZYNQ
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-zynq/u-boot-spl.lds"
|
|
||||||
|
|
||||||
config SPL_FS_FAT
|
config SPL_FS_FAT
|
||||||
default y
|
default y
|
||||||
|
|
||||||
|
|
|
@ -54,9 +54,6 @@ config SYS_VENDOR
|
||||||
config SYS_CONFIG_NAME
|
config SYS_CONFIG_NAME
|
||||||
default "am64x_evm"
|
default "am64x_evm"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-omap2/u-boot-spl.lds"
|
|
||||||
|
|
||||||
source "board/ti/common/Kconfig"
|
source "board/ti/common/Kconfig"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -53,9 +53,6 @@ config SYS_VENDOR
|
||||||
config SYS_CONFIG_NAME
|
config SYS_CONFIG_NAME
|
||||||
default "am65x_evm"
|
default "am65x_evm"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-omap2/u-boot-spl.lds"
|
|
||||||
|
|
||||||
source "board/ti/common/Kconfig"
|
source "board/ti/common/Kconfig"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -75,9 +75,6 @@ config SYS_VENDOR
|
||||||
config SYS_CONFIG_NAME
|
config SYS_CONFIG_NAME
|
||||||
default "j721e_evm"
|
default "j721e_evm"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-omap2/u-boot-spl.lds"
|
|
||||||
|
|
||||||
source "board/ti/common/Kconfig"
|
source "board/ti/common/Kconfig"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -108,9 +105,6 @@ config SYS_VENDOR
|
||||||
config SYS_CONFIG_NAME
|
config SYS_CONFIG_NAME
|
||||||
default "j721e_evm"
|
default "j721e_evm"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-omap2/u-boot-spl.lds"
|
|
||||||
|
|
||||||
source "board/ti/common/Kconfig"
|
source "board/ti/common/Kconfig"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -55,9 +55,6 @@ config SYS_VENDOR
|
||||||
config SYS_CONFIG_NAME
|
config SYS_CONFIG_NAME
|
||||||
default "j721s2_evm"
|
default "j721s2_evm"
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
|
||||||
default "arch/arm/mach-omap2/u-boot-spl.lds"
|
|
||||||
|
|
||||||
source "board/ti/common/Kconfig"
|
source "board/ti/common/Kconfig"
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -221,6 +221,18 @@ config SPL_HANDOFF
|
||||||
|
|
||||||
config SPL_LDSCRIPT
|
config SPL_LDSCRIPT
|
||||||
string "Linker script for the SPL stage"
|
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"
|
default "arch/\$(ARCH)/cpu/u-boot-spl.lds"
|
||||||
help
|
help
|
||||||
The SPL stage will usually require a different linker-script
|
The SPL stage will usually require a different linker-script
|
||||||
|
|
Loading…
Reference in New Issue
Block a user