| Message ID | 20190405083013.5473-8-heiko@sntech.de |
|---|---|
| State | Changes Requested |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | arm-trusted-firmware support for rk3288 | expand |
Heiko, On 04/05/2019 04:30 PM, Heiko Stuebner wrote: > We want to use ATF loaded by the SPL, so need support for the itb FIT > in SPL which therefore needs real mmc reading capabilities making it > too big for the sram. So convert to use TPL for memory init beforehand > similar to rk3288-vyasa. > > Signed-off-by: Heiko Stuebner <heiko@sntech.de> > --- > arch/arm/mach-rockchip/Kconfig | 1 + > arch/arm/mach-rockchip/rk3288/Kconfig | 1 + > board/rockchip/evb_rk3288/evb-rk3288.c | 4 ++++ > configs/evb-rk3288-act8846_defconfig | 3 +-- > configs/evb-rk3288-rk808_defconfig | 3 +-- > 5 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig > index ba11e8a497..bfcf12d1ab 100644 > --- a/arch/arm/mach-rockchip/Kconfig > +++ b/arch/arm/mach-rockchip/Kconfig > @@ -188,6 +188,7 @@ config SPL_ROCKCHIP_BACK_TO_BROM > > config TPL_ROCKCHIP_BACK_TO_BROM > bool "TPL returns to bootrom" > + default y if ROCKCHIP_RK3288 This TPL_ROCKCHIP_BACK_TO_BROM should be default y to all SoCs, has apply in another patch from me, please rebase this patch. Thanks, - Kever > default y if ROCKCHIP_RK3368 > select ROCKCHIP_BROM_HELPER > depends on TPL > diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig > index 936faf75ca..800902a683 100644 > --- a/arch/arm/mach-rockchip/rk3288/Kconfig > +++ b/arch/arm/mach-rockchip/rk3288/Kconfig > @@ -44,6 +44,7 @@ config TARGET_CHROMEBOOK_SPEEDY > config TARGET_EVB_RK3288 > bool "Evb-RK3288" > select BOARD_LATE_INIT > + select TPL > help > EVB-RK3288 is a RK3288-based development board with 2 USB ports, > HDMI, VGA, micro-SD card, audio, WiFi and Gigabit Ethernet, It > diff --git a/board/rockchip/evb_rk3288/evb-rk3288.c b/board/rockchip/evb_rk3288/evb-rk3288.c > index d6992a26ca..ec1d03c86c 100644 > --- a/board/rockchip/evb_rk3288/evb-rk3288.c > +++ b/board/rockchip/evb_rk3288/evb-rk3288.c > @@ -3,6 +3,8 @@ > * (C) Copyright 2016 Rockchip Electronics Co., Ltd > */ > > +#ifndef CONFIG_TPL_BUILD > + > #include <common.h> > #include <spl.h> > > @@ -12,3 +14,5 @@ void board_boot_order(u32 *spl_boot_list) > spl_boot_list[0] = BOOT_DEVICE_MMC2; > spl_boot_list[1] = BOOT_DEVICE_MMC1; > } > + > +#endif > \ No newline at end of file > diff --git a/configs/evb-rk3288-act8846_defconfig b/configs/evb-rk3288-act8846_defconfig > index 878367dea9..9c7be78ad7 100644 > --- a/configs/evb-rk3288-act8846_defconfig > +++ b/configs/evb-rk3288-act8846_defconfig > @@ -1,9 +1,8 @@ > CONFIG_ARM=y > CONFIG_ARCH_ROCKCHIP=y > -CONFIG_SYS_TEXT_BASE=0x00000000 > +CONFIG_SYS_TEXT_BASE=0x00100000 > CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_ROCKCHIP_RK3288=y > -CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y > CONFIG_TARGET_EVB_RK3288=y > CONFIG_DEBUG_UART_BASE=0xff690000 > CONFIG_DEBUG_UART_CLOCK=24000000 > diff --git a/configs/evb-rk3288-rk808_defconfig b/configs/evb-rk3288-rk808_defconfig > index 0cc1b2f601..73d30c9958 100644 > --- a/configs/evb-rk3288-rk808_defconfig > +++ b/configs/evb-rk3288-rk808_defconfig > @@ -1,9 +1,8 @@ > CONFIG_ARM=y > CONFIG_ARCH_ROCKCHIP=y > -CONFIG_SYS_TEXT_BASE=0x00000000 > +CONFIG_SYS_TEXT_BASE=0x00100000 > CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_ROCKCHIP_RK3288=y > -CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y > CONFIG_TARGET_EVB_RK3288=y > CONFIG_DEBUG_UART_BASE=0xff690000 > CONFIG_DEBUG_UART_CLOCK=24000000
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index ba11e8a497..bfcf12d1ab 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -188,6 +188,7 @@ config SPL_ROCKCHIP_BACK_TO_BROM config TPL_ROCKCHIP_BACK_TO_BROM bool "TPL returns to bootrom" + default y if ROCKCHIP_RK3288 default y if ROCKCHIP_RK3368 select ROCKCHIP_BROM_HELPER depends on TPL diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 936faf75ca..800902a683 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -44,6 +44,7 @@ config TARGET_CHROMEBOOK_SPEEDY config TARGET_EVB_RK3288 bool "Evb-RK3288" select BOARD_LATE_INIT + select TPL help EVB-RK3288 is a RK3288-based development board with 2 USB ports, HDMI, VGA, micro-SD card, audio, WiFi and Gigabit Ethernet, It diff --git a/board/rockchip/evb_rk3288/evb-rk3288.c b/board/rockchip/evb_rk3288/evb-rk3288.c index d6992a26ca..ec1d03c86c 100644 --- a/board/rockchip/evb_rk3288/evb-rk3288.c +++ b/board/rockchip/evb_rk3288/evb-rk3288.c @@ -3,6 +3,8 @@ * (C) Copyright 2016 Rockchip Electronics Co., Ltd */ +#ifndef CONFIG_TPL_BUILD + #include <common.h> #include <spl.h> @@ -12,3 +14,5 @@ void board_boot_order(u32 *spl_boot_list) spl_boot_list[0] = BOOT_DEVICE_MMC2; spl_boot_list[1] = BOOT_DEVICE_MMC1; } + +#endif \ No newline at end of file diff --git a/configs/evb-rk3288-act8846_defconfig b/configs/evb-rk3288-act8846_defconfig index 878367dea9..9c7be78ad7 100644 --- a/configs/evb-rk3288-act8846_defconfig +++ b/configs/evb-rk3288-act8846_defconfig @@ -1,9 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_SYS_TEXT_BASE=0x00100000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y -CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y CONFIG_TARGET_EVB_RK3288=y CONFIG_DEBUG_UART_BASE=0xff690000 CONFIG_DEBUG_UART_CLOCK=24000000 diff --git a/configs/evb-rk3288-rk808_defconfig b/configs/evb-rk3288-rk808_defconfig index 0cc1b2f601..73d30c9958 100644 --- a/configs/evb-rk3288-rk808_defconfig +++ b/configs/evb-rk3288-rk808_defconfig @@ -1,9 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y -CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_SYS_TEXT_BASE=0x00100000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y -CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y CONFIG_TARGET_EVB_RK3288=y CONFIG_DEBUG_UART_BASE=0xff690000 CONFIG_DEBUG_UART_CLOCK=24000000
We want to use ATF loaded by the SPL, so need support for the itb FIT in SPL which therefore needs real mmc reading capabilities making it too big for the sram. So convert to use TPL for memory init beforehand similar to rk3288-vyasa. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/rk3288/Kconfig | 1 + board/rockchip/evb_rk3288/evb-rk3288.c | 4 ++++ configs/evb-rk3288-act8846_defconfig | 3 +-- configs/evb-rk3288-rk808_defconfig | 3 +-- 5 files changed, 8 insertions(+), 4 deletions(-)