[PATCH v3 3/6] rockchip: Use common bss and stack addresses on RK3328
Kever Yang
kever.yang at rock-chips.com
Mon Mar 11 10:57:03 CET 2024
On 2024/3/3 03:16, Jonas Karlman wrote:
> With the stack and text base used by U-Boot SPL and proper on RK3328
> there is a high likelihood of overlapping when U-Boot proper + FDT nears
> or exceeded 1 MiB in size.
>
> Currently the following memory layout is typically used on RK3328:
> [ 0, 256K) - SPL binary
> [ 256K, 2M) - TF-A / reserved
> [ 2M, +X) - U-Boot proper binary (TEXT_BASE)
> [ -X, 3M) - U-Boot proper pre-reloc stack (CUSTOM_SYS_INIT_SP_ADDR)
> [ -8K, 3M) - pre-reloc malloc heap (SYS_MALLOC_F_LEN)
> [ -X, 4M) - SPL pre-reloc stack (SPL_STACK)
> [ -8K, 4M) - pre-reloc malloc heap (SPL_SYS_MALLOC_F_LEN)
> [ -X, 6M) - SPL reloc stack (SPL_STACK_R_ADDR)
> [ 5M, 6M) - reloc malloc heap (SPL_STACK_R_MALLOC_SIMPLE_LEN)
> [ 32M, +8K) - SPL bss (SPL_BSS_START_ADDR, SPL_BSS_MAX_SIZE)
>
> SPL can safely load U-Boot proper + FDT to [2M, 4M-8K) with this layout.
> However, the stack at [-X, 3M) used during U-Boot proper pre-reloc is
> restricting the safe size of U-Boot proper + FDT to be less than 1 MiB.
>
> Migrate to use common bss, stack and malloc heap size and addresses to
> fix this restriction and allow for a larger U-Boot proper image size.
>
> 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/rk3328/Kconfig | 11 ++++-------
> configs/evb-rk3328_defconfig | 17 -----------------
> configs/nanopi-r2c-plus-rk3328_defconfig | 15 ---------------
> configs/nanopi-r2c-rk3328_defconfig | 15 ---------------
> configs/nanopi-r2s-rk3328_defconfig | 15 ---------------
> configs/orangepi-r1-plus-lts-rk3328_defconfig | 15 ---------------
> configs/orangepi-r1-plus-rk3328_defconfig | 15 ---------------
> configs/roc-cc-rk3328_defconfig | 15 ---------------
> configs/rock-pi-e-rk3328_defconfig | 17 -----------------
> configs/rock64-rk3328_defconfig | 15 ---------------
> 10 files changed, 4 insertions(+), 146 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig
> index d5cb649ae6ba..70770da5fdf2 100644
> --- a/arch/arm/mach-rockchip/rk3328/Kconfig
> +++ b/arch/arm/mach-rockchip/rk3328/Kconfig
> @@ -21,13 +21,7 @@ config ROCKCHIP_STIMER_BASE
> config SYS_SOC
> default "rk3328"
>
> -config SYS_MALLOC_F_LEN
> - default 0x2000
> -
> -config SPL_LIBCOMMON_SUPPORT
> - default y
> -
> -config SPL_LIBGENERIC_SUPPORT
> +config ROCKCHIP_COMMON_STACK_ADDR
> default y
>
> config TPL_LDSCRIPT
> @@ -39,6 +33,9 @@ config TPL_TEXT_BASE
> config TPL_STACK
> default 0xff098000
>
> +config TPL_SYS_MALLOC_F_LEN
> + default 0x800
> +
> source "board/rockchip/evb_rk3328/Kconfig"
>
> endif
> diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
> index da422c8ba4e7..4fa8a7d365a4 100644
> --- a/configs/evb-rk3328_defconfig
> +++ b/configs/evb-rk3328_defconfig
> @@ -2,22 +2,12 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_TEXT_BASE=0x00200000
> 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="rk3328-evb"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x4000000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> -CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SYS_LOAD_ADDR=0x800800
> @@ -33,16 +23,9 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-evb.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig b/configs/nanopi-r2c-plus-rk3328_defconfig
> index 25850328f8b8..5302fd91a0f5 100644
> --- a/configs/nanopi-r2c-plus-rk3328_defconfig
> +++ b/configs/nanopi-r2c-plus-rk3328_defconfig
> @@ -2,22 +2,13 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-nanopi-r2c-plus"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x600000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SYS_LOAD_ADDR=0x800800
> @@ -33,16 +24,10 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c-plus.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> CONFIG_SPL_POWER=y
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/nanopi-r2c-rk3328_defconfig b/configs/nanopi-r2c-rk3328_defconfig
> index a4cb148246e6..5a722c182631 100644
> --- a/configs/nanopi-r2c-rk3328_defconfig
> +++ b/configs/nanopi-r2c-rk3328_defconfig
> @@ -2,22 +2,13 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-nanopi-r2c"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x600000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SYS_LOAD_ADDR=0x800800
> @@ -33,16 +24,10 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> CONFIG_SPL_POWER=y
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig
> index c5d13788528b..985d02475ece 100644
> --- a/configs/nanopi-r2s-rk3328_defconfig
> +++ b/configs/nanopi-r2s-rk3328_defconfig
> @@ -2,22 +2,13 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-nanopi-r2s"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x600000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SYS_LOAD_ADDR=0x800800
> @@ -33,16 +24,10 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2s.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> CONFIG_SPL_POWER=y
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig b/configs/orangepi-r1-plus-lts-rk3328_defconfig
> index 6360f5df3864..e9f7a1306923 100644
> --- a/configs/orangepi-r1-plus-lts-rk3328_defconfig
> +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig
> @@ -2,23 +2,14 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-orangepi-r1-plus-lts"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x600000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> @@ -36,18 +27,12 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> CONFIG_SPL_POWER=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/orangepi-r1-plus-rk3328_defconfig b/configs/orangepi-r1-plus-rk3328_defconfig
> index 9473a08fe20d..6019f33ae3f5 100644
> --- a/configs/orangepi-r1-plus-rk3328_defconfig
> +++ b/configs/orangepi-r1-plus-rk3328_defconfig
> @@ -2,23 +2,14 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-orangepi-r1-plus"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x600000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> @@ -36,18 +27,12 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> CONFIG_SPL_POWER=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig
> index c66b1ccba267..191dbff928bb 100644
> --- a/configs/roc-cc-rk3328_defconfig
> +++ b/configs/roc-cc-rk3328_defconfig
> @@ -2,22 +2,13 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-roc-cc"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x600000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SYS_LOAD_ADDR=0x800800
> @@ -33,16 +24,10 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-roc-cc.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> CONFIG_SPL_POWER=y
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig
> index 275ffc3ed8f4..e4f2123e0b17 100644
> --- a/configs/rock-pi-e-rk3328_defconfig
> +++ b/configs/rock-pi-e-rk3328_defconfig
> @@ -2,23 +2,13 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-rock-pi-e"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x4000000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> -CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SYS_LOAD_ADDR=0x800800
> @@ -34,17 +24,10 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock-pi-e.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
> CONFIG_SPL_POWER=y
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
> diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig
> index 1cb4e6777d45..f38431891bf8 100644
> --- a/configs/rock64-rk3328_defconfig
> +++ b/configs/rock64-rk3328_defconfig
> @@ -2,23 +2,14 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=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="rk3328-rock64"
> CONFIG_DM_RESET=y
> CONFIG_ROCKCHIP_RK3328=y
> -CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> -CONFIG_TPL_LIBCOMMON_SUPPORT=y
> -CONFIG_TPL_LIBGENERIC_SUPPORT=y
> -CONFIG_SPL_STACK_R_ADDR=0x600000
> -CONFIG_SPL_STACK=0x400000
> -CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
> CONFIG_DEBUG_UART_BASE=0xFF130000
> CONFIG_DEBUG_UART_CLOCK=24000000
> CONFIG_SPL_SPI_FLASH_SUPPORT=y
> @@ -36,18 +27,12 @@ CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-rock64.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_SPL_MAX_SIZE=0x40000
> CONFIG_SPL_PAD_TO=0x7f8000
> -CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
> -CONFIG_SPL_BSS_START_ADDR=0x2000000
> -CONFIG_SPL_BSS_MAX_SIZE=0x2000
> # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
> -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
> -CONFIG_SPL_STACK_R=y
> CONFIG_SPL_POWER=y
> CONFIG_SPL_SPI_LOAD=y
> CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
> CONFIG_SPL_ATF=y
> CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
> -CONFIG_TPL_SYS_MALLOC_SIMPLE=y
> CONFIG_CMD_BOOTZ=y
> CONFIG_CMD_GPIO=y
> CONFIG_CMD_GPT=y
More information about the U-Boot
mailing list