| Message ID | 1513581199-14373-1-git-send-email-kever.yang@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | 8a8106f06639314f750c9f8dc2b72df3925f7fbf |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | [U-Boot] rockchip: update ROCKCHIP_SPL_RESERVE_IRAM to 0 | expand |
> Only rk3399 atf need ROCKCHIP_SPL_RESERVE_IRAM, so update it dtfault > 0 so that other SoCs do not need to define it. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/mach-rockchip/Kconfig | 2 +- > configs/evb-rk3399_defconfig | 1 + > configs/firefly-rk3399_defconfig | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Only rk3399 atf need ROCKCHIP_SPL_RESERVE_IRAM, so update it dtfault > 0 so that other SoCs do not need to define it. > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > arch/arm/mach-rockchip/Kconfig | 2 +- > configs/evb-rk3399_defconfig | 1 + > configs/firefly-rk3399_defconfig | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > Applied to u-boot-rockchip, thanks!
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 1e74db3..967290f 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -179,7 +179,7 @@ config ROCKCHIP_BOOT_MODE_REG config ROCKCHIP_SPL_RESERVE_IRAM hex "Size of IRAM reserved in SPL" - default 0x4000 + default 0 help SPL may need reserve memory for firmware loaded by SPL, whose load address is in IRAM and may overlay with SPL text area if not diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 7b5ea82..e8e52c3 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_ROCKCHIP_RK3399=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEBUG_UART=y diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index 731222c..b8d0654 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -4,6 +4,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_ROCKCHIP_RK3399=y +CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000 CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly" CONFIG_DEBUG_UART=y
Only rk3399 atf need ROCKCHIP_SPL_RESERVE_IRAM, so update it dtfault 0 so that other SoCs do not need to define it. Signed-off-by: Kever Yang <kever.yang@rock-chips.com> --- arch/arm/mach-rockchip/Kconfig | 2 +- configs/evb-rk3399_defconfig | 1 + configs/firefly-rk3399_defconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)