[PATCH 04/11] rockchip: rk3288-miqi: Use TPL with common bss and stack addresses

[Kever Yang]

On 2024/11/6 05:51, Jonas Karlman wrote:
> Migrate to use TPL, common bss, stack and malloc heap size and addresses
> to unify memory use in TPL, SPL and pre-reloc.
>
> ENV_OFFSET is using the default value of 0x3f8000 and is also dropped.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   arch/arm/mach-rockchip/rk3288/Kconfig |  2 ++
>   configs/miqi-rk3288_defconfig         | 15 ++-------------
>   2 files changed, 4 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
> index 672d634f7fb5..ff16d258b4f5 100644
> --- a/arch/arm/mach-rockchip/rk3288/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3288/Kconfig
> @@ -86,6 +86,8 @@ config TARGET_FIREFLY_RK3288
>   config TARGET_MIQI_RK3288
>   	bool "MiQi-RK3288"
>   	select BOARD_LATE_INIT
> +	select ROCKCHIP_COMMON_STACK_ADDR
> +	select TPL
>   	help
>   	  MiQi-RK3288 is a RK3288-based development board with 4 USB 2.0
>   	  ports, HDMI, micro-SD card, 16 GB eMMC and Gigabit Ethernet. It
> diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
> index 764b4351e94c..2bb8bf2ac060 100644
> --- a/configs/miqi-rk3288_defconfig
> +++ b/configs/miqi-rk3288_defconfig
> @@ -1,24 +1,15 @@
>   CONFIG_ARM=y
>   CONFIG_SPL_SKIP_LOWLEVEL_INIT_ONLY=y
> +CONFIG_TPL_SKIP_LOWLEVEL_INIT_ONLY=y
>   CONFIG_SYS_ARCH_TIMER=y
>   CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_TEXT_BASE=0x00000000
> +CONFIG_TEXT_BASE=0x01000000
>   CONFIG_NR_DRAM_BANKS=1
> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000
>   CONFIG_SF_DEFAULT_SPEED=20000000
> -CONFIG_ENV_OFFSET=0x3F8000
>   CONFIG_DEFAULT_DEVICE_TREE="rk3288-miqi"
> -CONFIG_SPL_TEXT_BASE=0xff704000
>   CONFIG_DM_RESET=y
> -CONFIG_SYS_MONITOR_LEN=614400
>   CONFIG_ROCKCHIP_RK3288=y
> -CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
>   CONFIG_TARGET_MIQI_RK3288=y
> -CONFIG_SPL_STACK_R_ADDR=0x80000
> -CONFIG_SPL_STACK=0xff718000
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
>   CONFIG_SYS_BOOTM_LEN=0x4000000
>   CONFIG_SYS_LOAD_ADDR=0x800800
>   CONFIG_DEBUG_UART_BASE=0xff690000
> @@ -31,8 +22,6 @@ CONFIG_MISC_INIT_R=y
>   CONFIG_SILENT_CONSOLE=y
>   CONFIG_DISPLAY_BOARDINFO_LATE=y
>   CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_NO_BSS_LIMIT=y
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y
>   CONFIG_CMD_I2C=y