From 0db1499c05b5bbe5d00333e91df953a257fad6db Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Tue, 22 Oct 2019 18:23:47 +0800 Subject: [PATCH] rockchip: rk3399: update SPL_STACK_R_ADDR Use the same SPL_STACK_R_ADDR in Kconfig instead of each board config; default to 0x4000000(64MB) instead of 0x80000(512KB) for this address can support all the SoCs including those may have only 64MB memory, and also reserve enough space for atf, kernel(in falcon mode) loading. After the ATF entry move to 0x40000, the stack from 0x80000 may be override when loading ATF bl31. Change-Id: I9bb524ee0762e908bd390393168f30ca197e2a52 Signed-off-by: Kever Yang --- arch/arm/mach-rockchip/rk3399/Kconfig | 3 +++ configs/android6.0-rk3399_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - configs/firefly-rk3399_defconfig | 1 - configs/puma-rk3399_defconfig | 1 - configs/rk3399_defconfig | 1 - configs/rk3399pro_defconfig | 1 - 7 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig index c4a6d46649..c97b8acd45 100644 --- a/arch/arm/mach-rockchip/rk3399/Kconfig +++ b/arch/arm/mach-rockchip/rk3399/Kconfig @@ -37,6 +37,9 @@ config SYS_SOC config SYS_MALLOC_F_LEN default 0x0800 +config SPL_STACK_R_ADDR + default 0x04000000 + source "board/rockchip/evb_rk3399/Kconfig" source "board/theobroma-systems/puma_rk3399/Kconfig" diff --git a/configs/android6.0-rk3399_defconfig b/configs/android6.0-rk3399_defconfig index 9d5ad1e473..287afbda63 100644 --- a/configs/android6.0-rk3399_defconfig +++ b/configs/android6.0-rk3399_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_ROCKCHIP_RK3399=y CONFIG_RKIMG_BOOTLOADER=y # CONFIG_USING_KERNEL_DTB is not set -CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEBUG_UART=y CONFIG_FIT=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 8816c421cf..c93a836923 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_ROCKCHIP_RK3399=y CONFIG_RKIMG_BOOTLOADER=y # CONFIG_USING_KERNEL_DTB is not set -CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEBUG_UART=y CONFIG_FIT=y diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig index fa4d44c0db..05eb150a7a 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_ROCKCHIP_RK3399=y CONFIG_RKIMG_BOOTLOADER=y -CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly" CONFIG_DEBUG_UART=y CONFIG_FIT=y diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index d537cb06d8..c357effc74 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -10,7 +10,6 @@ CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0 CONFIG_TARGET_PUMA_RK3399=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y -CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600" CONFIG_DEBUG_UART=y CONFIG_FIT=y diff --git a/configs/rk3399_defconfig b/configs/rk3399_defconfig index fddb4474dd..1a201bc913 100755 --- a/configs/rk3399_defconfig +++ b/configs/rk3399_defconfig @@ -7,7 +7,6 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_ROCKCHIP_RK3399=y CONFIG_RKIMG_BOOTLOADER=y CONFIG_ROCKCHIP_VENDOR_PARTITION=y -CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEBUG_UART=y CONFIG_FIT=y diff --git a/configs/rk3399pro_defconfig b/configs/rk3399pro_defconfig index de717eb0a2..3c5df47751 100644 --- a/configs/rk3399pro_defconfig +++ b/configs/rk3399pro_defconfig @@ -8,7 +8,6 @@ CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_RK3399PRO=y CONFIG_RKIMG_BOOTLOADER=y CONFIG_ROCKCHIP_VENDOR_PARTITION=y -CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEBUG_UART=y CONFIG_FIT=y