Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5aa49af3114972f62eb02ef0a6a2f0269c937f2d

Authored by Philipp Tomsich
1 parent 4cf4378ed0
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

moveconfig: migrate TPL_STACK, TPL_TEXT_BASE and TPL_MAX_SIZE 

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 Kconfig.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 4 changed files with 10 additions and 7 deletions Side-by-side Diff

arch/arm/mach-rockchip/Kconfig
Diff comments   View file @ 5aa49af
... ... @@ -93,6 +93,15 @@
93 93 config TPL_LDSCRIPT
94 94 default "arch/arm/mach-rockchip/rk3368/u-boot-tpl.lds"
95 95  
  96 +config TPL_TEXT_BASE
  97 + default 0xff8c1000
  98 +
  99 +config TPL_MAX_SIZE
  100 + default 28672
  101 +
  102 +config TPL_STACK
  103 + default 0xff8cffff
  104 +
96 105 endif
97 106  
98 107 config ROCKCHIP_RK3399
... ... @@ -754,6 +754,7 @@
754 754  
755 755 config TPL_MAX_SIZE
756 756 int "Maximum size (in bytes) for the TPL stage"
  757 + default 0
757 758 depends on TPL
758 759 help
759 760 The maximum size (in bytes) of the TPL stage.
include/configs/rk3368_common.h
Diff comments   View file @ 5aa49af
... ... @@ -35,10 +35,6 @@
35 35 #define CONFIG_SPL_BSS_START_ADDR 0x400000
36 36 #define CONFIG_SPL_BSS_MAX_SIZE 0x20000
37 37  
38   -#define CONFIG_TPL_TEXT_BASE 0xff8c1000
39   -#define CONFIG_TPL_MAX_SIZE 0x7000
40   -#define CONFIG_TPL_STACK 0xff8cffff
41   -
42 38 #define CONFIG_BOUNCE_BUFFER
43 39  
44 40 #ifndef CONFIG_SPL_BUILD
scripts/config_whitelist.txt
Diff comments   View file @ 5aa49af
... ... @@ -4908,10 +4908,7 @@
4908 4908 CONFIG_TI_KSNAV
4909 4909 CONFIG_TI_SPI_MMAP
4910 4910 CONFIG_TMU_TIMER
4911   -CONFIG_TPL_MAX_SIZE
4912 4911 CONFIG_TPL_PAD_TO
4913   -CONFIG_TPL_STACK
4914   -CONFIG_TPL_TEXT_BASE
4915 4912 CONFIG_TPM_TIS_BASE_ADDRESS
4916 4913 CONFIG_TPS6586X_POWER
4917 4914 CONFIG_TQM834X