Skip to content

Commit 5858b90

Browse files
committed
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 <[email protected]>
1 parent 4995881 commit 5858b90

File tree

14 files changed

+12
-51
lines changed

14 files changed

+12
-51
lines changed

arch/arm/Kconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -996,11 +996,6 @@ config ARCH_MX6
996996
imply SYS_THUMB_BUILD
997997
imply SPL_SEPARATE_BSS
998998

999-
if ARCH_MX6
1000-
config SPL_LDSCRIPT
1001-
default "arch/arm/mach-omap2/u-boot-spl.lds"
1002-
endif
1003-
1004999
config ARCH_MX5
10051000
bool "Freescale MX5"
10061001
select BOARD_EARLY_INIT_F
@@ -2368,8 +2363,3 @@ source "board/xen/xenguest_arm64/Kconfig"
23682363
source "arch/arm/Kconfig.debug"
23692364

23702365
endmenu
2371-
2372-
config SPL_LDSCRIPT
2373-
default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK
2374-
default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136
2375-
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64

arch/arm/cpu/armv8/fsl-layerscape/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,9 +701,6 @@ config SYS_FSL_HAS_RGMII
701701
bool
702702
depends on SYS_FSL_EC1 || SYS_FSL_EC2
703703

704-
config SPL_LDSCRIPT
705-
default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARCH_LS1043A || ARCH_LS1046A || ARCH_LS2080A
706-
707704
config HAS_FSL_XHCI_USB
708705
bool
709706
help

arch/arm/mach-at91/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,4 @@ source "board/siemens/corvus/Kconfig"
377377
source "board/siemens/taurus/Kconfig"
378378
source "board/siemens/smartweb/Kconfig"
379379

380-
config SPL_LDSCRIPT
381-
default "arch/arm/mach-at91/arm926ejs/u-boot-spl.lds" if CPU_ARM926EJS
382-
default "arch/arm/mach-at91/armv7/u-boot-spl.lds" if CPU_V7A
383-
384380
endif

arch/arm/mach-davinci/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,4 @@ endif
134134
source "board/davinci/da8xxevm/Kconfig"
135135
source "board/lego/ev3/Kconfig"
136136

137-
config SPL_LDSCRIPT
138-
default "board/davinci/da8xxevm/u-boot-spl-da850evm.lds"
139-
140137
endif

arch/arm/mach-exynos/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,4 @@ source "board/samsung/smdk5420/Kconfig"
201201
source "board/samsung/espresso7420/Kconfig"
202202
source "board/samsung/axy17lte/Kconfig"
203203

204-
config SPL_LDSCRIPT
205-
default "board/samsung/common/exynos-uboot-spl.lds" if ARCH_EXYNOS5 || ARCH_EXYNOS4
206-
207204
endif

arch/arm/mach-omap2/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,4 @@ source "board/compulab/cm_t335/Kconfig"
190190
source "board/compulab/cm_t43/Kconfig"
191191
source "board/phytec/phycore_am335x_r2/Kconfig"
192192

193-
config SPL_LDSCRIPT
194-
default "arch/arm/mach-omap2/u-boot-spl.lds"
195-
196193
endif

arch/arm/mach-rockchip/rk3368/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ source "board/rockchip/sheep_rk3368/Kconfig"
6565
source "board/geekbuying/geekbox/Kconfig"
6666
source "board/rockchip/evb_px5/Kconfig"
6767

68-
config SPL_LDSCRIPT
69-
default "arch/arm/cpu/armv8/u-boot-spl.lds"
70-
7168
config SPL_STACK_R_ADDR
7269
default 0x04000000
7370

arch/arm/mach-sunxi/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
if ARCH_SUNXI
22

3-
config SPL_LDSCRIPT
4-
default "arch/arm/cpu/arm926ejs/sunxi/u-boot-spl.lds" if MACH_SUNIV
5-
default "arch/arm/cpu/armv7/sunxi/u-boot-spl.lds" if !ARM64
6-
73
config IDENT_STRING
84
default " Allwinner Technology"
95

arch/arm/mach-zynq/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
if ARCH_ZYNQ
22

3-
config SPL_LDSCRIPT
4-
default "arch/arm/mach-zynq/u-boot-spl.lds"
5-
63
config SPL_FS_FAT
74
default y
85

board/ti/am64x/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ config SYS_VENDOR
5454
config SYS_CONFIG_NAME
5555
default "am64x_evm"
5656

57-
config SPL_LDSCRIPT
58-
default "arch/arm/mach-omap2/u-boot-spl.lds"
59-
6057
source "board/ti/common/Kconfig"
6158

6259
endif

0 commit comments

Comments
 (0)