| Message ID | 20241212221000.94501-5-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | 14c13f295a2e5d5c8790b52fc7ead1eeeacdd2ee |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3288-firefly: Migrate to OF_UPSTREAM | expand |
On 2024/12/13 06:09, Jonas Karlman wrote: > Migrate to use 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@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/mach-rockchip/rk3288/Kconfig | 1 + > configs/firefly-rk3288_defconfig | 10 ---------- > 2 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig > index 9cc97bacc41d..e563bf455e68 100644 > --- a/arch/arm/mach-rockchip/rk3288/Kconfig > +++ b/arch/arm/mach-rockchip/rk3288/Kconfig > @@ -75,6 +75,7 @@ config TARGET_FENNEC_RK3288 > config TARGET_FIREFLY_RK3288 > bool "Firefly-RK3288" > select BOARD_LATE_INIT > + select ROCKCHIP_COMMON_STACK_ADDR > select TPL > help > Firefly is a RK3288-based development board with 2 USB ports, > diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig > index eed0806b2321..87ed0c0d2aea 100644 > --- a/configs/firefly-rk3288_defconfig > +++ b/configs/firefly-rk3288_defconfig > @@ -5,19 +5,11 @@ CONFIG_SYS_ARCH_TIMER=y > CONFIG_ARCH_ROCKCHIP=y > 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-firefly" > CONFIG_DM_RESET=y > -CONFIG_SYS_MONITOR_LEN=614400 > CONFIG_ROCKCHIP_RK3288=y > CONFIG_TARGET_FIREFLY_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_SPL_SIZE_LIMIT=0x40000 > @@ -31,8 +23,6 @@ CONFIG_SILENT_CONSOLE=y > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_MISC_INIT_R=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
diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 9cc97bacc41d..e563bf455e68 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -75,6 +75,7 @@ config TARGET_FENNEC_RK3288 config TARGET_FIREFLY_RK3288 bool "Firefly-RK3288" select BOARD_LATE_INIT + select ROCKCHIP_COMMON_STACK_ADDR select TPL help Firefly is a RK3288-based development board with 2 USB ports, diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index eed0806b2321..87ed0c0d2aea 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -5,19 +5,11 @@ CONFIG_SYS_ARCH_TIMER=y CONFIG_ARCH_ROCKCHIP=y 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-firefly" CONFIG_DM_RESET=y -CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_TARGET_FIREFLY_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_SPL_SIZE_LIMIT=0x40000 @@ -31,8 +23,6 @@ CONFIG_SILENT_CONSOLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_MISC_INIT_R=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
Migrate to use 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@kwiboo.se> --- arch/arm/mach-rockchip/rk3288/Kconfig | 1 + configs/firefly-rk3288_defconfig | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-)