qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2019-10-22 18:23:47 +08:00
parent 191d31cd12
commit 0db1499c05
7 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-rockchip/rk3399/Kconfig
View File

@ -37,6 +37,9 @@ config SYS_SOC
config SYS_MALLOC_F_LEN config SYS_MALLOC_F_LEN
default 0x0800 default 0x0800
config SPL_STACK_R_ADDR
default 0x04000000
source "board/rockchip/evb_rk3399/Kconfig" source "board/rockchip/evb_rk3399/Kconfig"
source "board/theobroma-systems/puma_rk3399/Kconfig" source "board/theobroma-systems/puma_rk3399/Kconfig"

1
configs/android6.0-rk3399_defconfig
View File

@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_RK3399=y
CONFIG_RKIMG_BOOTLOADER=y CONFIG_RKIMG_BOOTLOADER=y
# CONFIG_USING_KERNEL_DTB is not set # CONFIG_USING_KERNEL_DTB is not set
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/evb-rk3399_defconfig
View File

@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_RK3399=y
CONFIG_RKIMG_BOOTLOADER=y CONFIG_RKIMG_BOOTLOADER=y
# CONFIG_USING_KERNEL_DTB is not set # CONFIG_USING_KERNEL_DTB is not set
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/firefly-rk3399_defconfig
View File

@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py" CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_RK3399=y
CONFIG_RKIMG_BOOTLOADER=y CONFIG_RKIMG_BOOTLOADER=y
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly" CONFIG_DEFAULT_DEVICE_TREE="rk3399-firefly"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/puma-rk3399_defconfig
View File

@ -10,7 +10,6 @@ CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
CONFIG_TARGET_PUMA_RK3399=y CONFIG_TARGET_PUMA_RK3399=y
CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y
CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600" CONFIG_DEFAULT_DEVICE_TREE="rk3399-puma-ddr1600"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/rk3399_defconfig
View File

@ -7,7 +7,6 @@ CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.py"
CONFIG_ROCKCHIP_RK3399=y CONFIG_ROCKCHIP_RK3399=y
CONFIG_RKIMG_BOOTLOADER=y CONFIG_RKIMG_BOOTLOADER=y
CONFIG_ROCKCHIP_VENDOR_PARTITION=y CONFIG_ROCKCHIP_VENDOR_PARTITION=y
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_FIT=y CONFIG_FIT=y

1
configs/rk3399pro_defconfig
View File

@ -8,7 +8,6 @@ CONFIG_ROCKCHIP_RK3399=y
CONFIG_ROCKCHIP_RK3399PRO=y CONFIG_ROCKCHIP_RK3399PRO=y
CONFIG_RKIMG_BOOTLOADER=y CONFIG_RKIMG_BOOTLOADER=y
CONFIG_ROCKCHIP_VENDOR_PARTITION=y CONFIG_ROCKCHIP_VENDOR_PARTITION=y
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb"
CONFIG_DEBUG_UART=y CONFIG_DEBUG_UART=y
CONFIG_FIT=y CONFIG_FIT=y