We can finally drop TPL_STACK, TPL_TEXT_BASE and TPL_MAX_SIZE off the whitelist (this time it's really happening!) and migrate the setting (only used on the RK3368-uQ7 so far) into defconfig.
One major caveat: other RK3368 boards that move to use SPL/TPL will also need to set these values in their defconfig. Signed-off-by: Philipp Tomsich <philipp.toms...@theobroma-systems.com> --- Changes in v3: - runs moveconfig.py TPL_STACK TPL_TEXT_BASE TPL_MAX_SIZE Changes in v2: None configs/lion-rk3368_defconfig | 3 +++ include/configs/rk3368_common.h | 4 ---- scripts/config_whitelist.txt | 3 --- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index 701a78f..cee79c1 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -33,6 +33,9 @@ CONFIG_SPL_ATF_SUPPORT=y CONFIG_SPL_ATF_TEXT_BASE=0x10000 CONFIG_TPL=y CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds" +CONFIG_TPL_TEXT_BASE=0xff8c1000 +CONFIG_TPL_MAX_SIZE=28672 +CONFIG_TPL_STACK=0xff8cffff CONFIG_TPL_BOOTROM_SUPPORT=y CONFIG_TPL_DRIVERS_MISC_SUPPORT=y CONFIG_FASTBOOT=y diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 513adab..a89c69a 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -35,10 +35,6 @@ #define CONFIG_SPL_BSS_START_ADDR 0x400000 #define CONFIG_SPL_BSS_MAX_SIZE 0x20000 -#define CONFIG_TPL_TEXT_BASE 0xff8c1000 -#define CONFIG_TPL_MAX_SIZE 0x7000 -#define CONFIG_TPL_STACK 0xff8cffff - #define CONFIG_BOUNCE_BUFFER #ifndef CONFIG_SPL_BUILD diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0e09a52..167ea55 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4980,10 +4980,7 @@ CONFIG_TI_KEYSTONE_SERDES CONFIG_TI_KSNAV CONFIG_TI_SPI_MMAP CONFIG_TMU_TIMER -CONFIG_TPL_MAX_SIZE CONFIG_TPL_PAD_TO -CONFIG_TPL_STACK -CONFIG_TPL_TEXT_BASE CONFIG_TPM_TIS_BASE_ADDRESS CONFIG_TPS6586X_POWER CONFIG_TQM834X -- 2.1.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
