summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-rockchip/Kconfig9
-rw-r--r--common/spl/Kconfig1
-rw-r--r--include/configs/rk3368_common.h4
-rw-r--r--scripts/config_whitelist.txt3
4 files changed, 10 insertions, 7 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 45029d1d1c..d9b25d5de4 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -93,6 +93,15 @@ if ROCKCHIP_RK3368
config TPL_LDSCRIPT
default "arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds"
+config TPL_TEXT_BASE
+ default 0xff8c1000
+
+config TPL_MAX_SIZE
+ default 28672
+
+config TPL_STACK
+ default 0xff8cffff
+
endif
config ROCKCHIP_RK3399
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 1a90588492..192f7f66dd 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -754,6 +754,7 @@ config TPL_TEXT_BASE
config TPL_MAX_SIZE
int "Maximum size (in bytes) for the TPL stage"
+ default 0
depends on TPL
help
The maximum size (in bytes) of the TPL stage.
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 513adab636..a89c69a72b 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 95ae3bfa41..d9aeb62a02 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4908,10 +4908,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