| Message ID | 20240430153053.308788-4-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3399: Fix loading FIT from SD-card when booting from eMMC | expand |
On 2024/4/30 23:30, Jonas Karlman wrote: > The rk3399-puma board is currently using SPL stack and bss addr in SRAM, > the same addr typically used by TPL, this differs from most other RK3399 > boards. > > Switch to use the common bss and stack addresses introduced in commit > 008ba0d56d00 ("rockchip: Add common default bss and stack addresses"). > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: New patch > --- > configs/puma-rk3399_defconfig | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig > index ec7d52a6e13e..bd4926cf0fce 100644 > --- a/configs/puma-rk3399_defconfig > +++ b/configs/puma-rk3399_defconfig > @@ -2,11 +2,8 @@ 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_SIZE=0x3000 > CONFIG_ENV_OFFSET=0x3F8000 > @@ -16,12 +13,6 @@ CONFIG_ROCKCHIP_RK3399=y > CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0 > CONFIG_ROCKCHIP_SPI_IMAGE=y > CONFIG_TARGET_PUMA_RK3399=y > -CONFIG_SPL_STACK=0xff8effff > -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=0x10000 > CONFIG_DEBUG_UART_BASE=0xFF180000 > CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_SPL_SPI_FLASH_SUPPORT=y > @@ -33,7 +24,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_SPL_MAX_SIZE=0x2e000 > CONFIG_SPL_PAD_TO=0x38000 > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 > CONFIG_SPL_I2C=y > CONFIG_SPL_POWER=y
diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index ec7d52a6e13e..bd4926cf0fce 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -2,11 +2,8 @@ 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_SIZE=0x3000 CONFIG_ENV_OFFSET=0x3F8000 @@ -16,12 +13,6 @@ CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0 CONFIG_ROCKCHIP_SPI_IMAGE=y CONFIG_TARGET_PUMA_RK3399=y -CONFIG_SPL_STACK=0xff8effff -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=0x10000 CONFIG_DEBUG_UART_BASE=0xFF180000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y @@ -33,7 +24,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_MAX_SIZE=0x2e000 CONFIG_SPL_PAD_TO=0x38000 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 CONFIG_SPL_I2C=y CONFIG_SPL_POWER=y
The rk3399-puma board is currently using SPL stack and bss addr in SRAM, the same addr typically used by TPL, this differs from most other RK3399 boards. Switch to use the common bss and stack addresses introduced in commit 008ba0d56d00 ("rockchip: Add common default bss and stack addresses"). Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: New patch --- configs/puma-rk3399_defconfig | 10 ---------- 1 file changed, 10 deletions(-)