[PATCH 05/12] rockchip: rk3399-gru: Use TPL with common bss and stack addresses

[Kever Yang]

On 2024/12/13 07:57, 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 with other RK3399 boards.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   configs/chromebook_bob_defconfig   | 13 +------------
>   configs/chromebook_kevin_defconfig | 13 +------------
>   2 files changed, 2 insertions(+), 24 deletions(-)
>
> diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig
> index 69a07ef7e01e..f13c4c1e7d63 100644
> --- a/configs/chromebook_bob_defconfig
> +++ b/configs/chromebook_bob_defconfig
> @@ -3,26 +3,15 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
>   CONFIG_SPL_SYS_DCACHE_OFF=y
>   CONFIG_COUNTER_FREQUENCY=24000000
>   CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_TEXT_BASE=0x00200000
>   CONFIG_SPL_GPIO=y
>   CONFIG_NR_DRAM_BANKS=1
> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
>   CONFIG_SF_DEFAULT_SPEED=20000000
>   CONFIG_ENV_OFFSET=0x3F8000
>   CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-bob"
>   CONFIG_DM_RESET=y
>   CONFIG_ROCKCHIP_RK3399=y
>   CONFIG_ROCKCHIP_BOOT_MODE_REG=0
> -CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
>   # CONFIG_SPL_MMC is not set
> -CONFIG_SPL_STACK=0xff8effff
> -CONFIG_SPL_TEXT_BASE=0xff8c2000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0xff8e0000
> -CONFIG_SPL_BSS_MAX_SIZE=0x10000
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
>   CONFIG_SYS_LOAD_ADDR=0x800800
>   CONFIG_SF_DEFAULT_BUS=1
>   CONFIG_DEBUG_UART_BASE=0xff1a0000
> @@ -42,10 +31,10 @@ CONFIG_SPL_MAX_SIZE=0x1e000
>   CONFIG_SPL_PAD_TO=0x7f8000
>   CONFIG_HANDOFF=y
>   # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>   CONFIG_SPL_SPI_LOAD=y
>   CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000
>   CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> +CONFIG_TPL=y
>   CONFIG_CMD_BOOTZ=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y
> diff --git a/configs/chromebook_kevin_defconfig b/configs/chromebook_kevin_defconfig
> index d689eeaf2781..7a2b8e70fe69 100644
> --- a/configs/chromebook_kevin_defconfig
> +++ b/configs/chromebook_kevin_defconfig
> @@ -3,27 +3,16 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
>   CONFIG_SPL_SYS_DCACHE_OFF=y
>   CONFIG_COUNTER_FREQUENCY=24000000
>   CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_TEXT_BASE=0x00200000
>   CONFIG_SPL_GPIO=y
>   CONFIG_NR_DRAM_BANKS=1
> -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
> -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
>   CONFIG_SF_DEFAULT_SPEED=20000000
>   CONFIG_ENV_OFFSET=0x3F8000
>   CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3399-gru-kevin"
>   CONFIG_DM_RESET=y
>   CONFIG_ROCKCHIP_RK3399=y
>   CONFIG_ROCKCHIP_BOOT_MODE_REG=0
> -CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
>   # CONFIG_SPL_MMC is not set
>   CONFIG_TARGET_CHROMEBOOK_KEVIN=y
> -CONFIG_SPL_STACK=0xff8effff
> -CONFIG_SPL_TEXT_BASE=0xff8c2000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0xff8e0000
> -CONFIG_SPL_BSS_MAX_SIZE=0x10000
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
>   CONFIG_SYS_LOAD_ADDR=0x800800
>   CONFIG_SF_DEFAULT_BUS=1
>   CONFIG_DEBUG_UART_BASE=0xff1a0000
> @@ -43,10 +32,10 @@ CONFIG_SPL_MAX_SIZE=0x1e000
>   CONFIG_SPL_PAD_TO=0x7f8000
>   CONFIG_HANDOFF=y
>   # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
>   CONFIG_SPL_SPI_LOAD=y
>   CONFIG_SYS_SPI_U_BOOT_OFFS=0xE0000
>   CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> +CONFIG_TPL=y
>   CONFIG_CMD_BOOTZ=y
>   CONFIG_CMD_GPIO=y
>   CONFIG_CMD_GPT=y