GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: Kconfig: migrate $(SPL_TPL_)LDSCRIPT to Kconfig

Browse source 
Now that we have split up SPL_LDSCRIPT into a SPL and TPL variant and
have started to use the TPL-variant for the RK3368, it's time to clean
up behind ourselves: move both variants into Kconfig and remove them
from the whitelist.

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-07-28 19:20:49 +02:00
parent 4d02d20605
commit dd6fbcb938
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/spl/Kconfig
View file

@ -18,6 +18,16 @@ config SPL
if SPL if SPL
config SPL_LDSCRIPT
string "Linker script for the SPL stage"
default "arch/$(ARCH)/cpu/u-boot-spl.lds"
depends on SPL
help
The SPL stage will usually require a different linker-script
(as it runs from a different memory region) than the regular
U-Boot stage. Set this to the path of the linker-script to
be used for SPL.
config SPL_BOARD_INIT config SPL_BOARD_INIT
bool "Call board-specific initialization in SPL" bool "Call board-specific initialization in SPL"
help help
@ -707,6 +717,15 @@ config TPL
if TPL if TPL
config TPL_LDSCRIPT
string "Linker script for the TPL stage"
depends on TPL
help
The TPL stage will usually require a different linker-script
(as it runs from a different memory region) than the regular
U-Boot stage. Set this to the path of the linker-script to
be used for TPL.
config TPL_BOOTROM_SUPPORT config TPL_BOOTROM_SUPPORT
bool "Support returning to the BOOTROM (from TPL)" bool "Support returning to the BOOTROM (from TPL)"
help help

9
scripts/Makefile.spl
View file

@ -103,9 +103,16 @@ u-boot-spl-platdata := $(obj)/dts/dt-platdata.o
endif endif
# Linker Script # Linker Script
ifdef CONFIG_$(SPL_TPL_)LDSCRIPT # First test whether there's a linker-script for the specific stage defined...
ifneq ($(CONFIG_$(SPL_TPL_)LDSCRIPT),)
# need to strip off double quotes # need to strip off double quotes
LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_$(SPL_TPL_)LDSCRIPT:"%"=%)) LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_$(SPL_TPL_)LDSCRIPT:"%"=%))
else
# ...then fall back to the generic SPL linker-script
ifneq ($(CONFIG_SPL_LDSCRIPT),)
# need to strip off double quotes
LDSCRIPT := $(addprefix $(srctree)/,$(CONFIG_SPL_LDSCRIPT:"%"=%))
endif
endif endif
ifeq ($(wildcard $(LDSCRIPT)),) ifeq ($(wildcard $(LDSCRIPT)),)

2
scripts/config_whitelist.txt
View file

@ -2207,7 +2207,6 @@ CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER
CONFIG_SPL_INIT_MINIMAL CONFIG_SPL_INIT_MINIMAL
CONFIG_SPL_JR0_LIODN_NS CONFIG_SPL_JR0_LIODN_NS
CONFIG_SPL_JR0_LIODN_S CONFIG_SPL_JR0_LIODN_S
CONFIG_SPL_LDSCRIPT
CONFIG_SPL_LOAD_FIT_ADDRESS CONFIG_SPL_LOAD_FIT_ADDRESS
CONFIG_SPL_MAX_FOOTPRINT CONFIG_SPL_MAX_FOOTPRINT
CONFIG_SPL_MAX_PEB_SIZE CONFIG_SPL_MAX_PEB_SIZE
@ -4909,7 +4908,6 @@ CONFIG_TI_KEYSTONE_SERDES
CONFIG_TI_KSNAV CONFIG_TI_KSNAV
CONFIG_TI_SPI_MMAP CONFIG_TI_SPI_MMAP
CONFIG_TMU_TIMER CONFIG_TMU_TIMER
CONFIG_TPL_LDSCRIPT
CONFIG_TPL_MAX_SIZE CONFIG_TPL_MAX_SIZE
CONFIG_TPL_PAD_TO CONFIG_TPL_PAD_TO
CONFIG_TPL_STACK CONFIG_TPL_STACK