brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-10-02 09:30:43 +09:00
Code Issues Projects Releases Wiki Activity

rockchip: Migrate to use BOOTROM_SUPPORT driver

Browse Source 
SPL bootrom support is a boot device just like mmc and etc,
use formal boot device instead of jump to bootrom directly.
Enable the Kconfig by default if ROCKCHIP_BACK_TO_BROM is enabled.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2019-07-22 19:59:15 +08:00
parent 4dd4fc32db
commit bf1133b1e9
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-rockchip/Kconfig
View File

@ -34,8 +34,8 @@ config ROCKCHIP_RK3188
select SPL_RAM select SPL_RAM
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC_SUPPORT
select SPL_ROCKCHIP_EARLYRETURN_TO_BROM select SPL_ROCKCHIP_EARLYRETURN_TO_BROM
select SPL_ROCKCHIP_BACK_TO_BROM
select BOARD_LATE_INIT select BOARD_LATE_INIT
select ROCKCHIP_BROM_HELPER
help help
The Rockchip RK3188 is a ARM-based SoC with a quad-core Cortex-A9 The Rockchip RK3188 is a ARM-based SoC with a quad-core Cortex-A9
including NEON and GPU, 512KB L2 cache, Mali-400 graphics, two including NEON and GPU, 512KB L2 cache, Mali-400 graphics, two
@ -59,9 +59,7 @@ config ROCKCHIP_RK322X
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC_SUPPORT
imply SPL_SERIAL_SUPPORT imply SPL_SERIAL_SUPPORT
imply TPL_SERIAL_SUPPORT imply TPL_SERIAL_SUPPORT
imply TPL_BOOTROM_SUPPORT
imply TPL_ROCKCHIP_COMMON_BOARD imply TPL_ROCKCHIP_COMMON_BOARD
select ROCKCHIP_BROM_HELPER
select TPL_LIBCOMMON_SUPPORT select TPL_LIBCOMMON_SUPPORT
select TPL_LIBGENERIC_SUPPORT select TPL_LIBGENERIC_SUPPORT
help help
@ -77,7 +75,6 @@ config ROCKCHIP_RK3288
select SUPPORT_SPL select SUPPORT_SPL
select SPL select SPL
select SUPPORT_TPL select SUPPORT_TPL
imply TPL_BOOTROM_SUPPORT
imply TPL_CLK imply TPL_CLK
imply TPL_DM imply TPL_DM
imply TPL_DRIVERS_MISC_SUPPORT imply TPL_DRIVERS_MISC_SUPPORT
@ -169,12 +166,10 @@ config ROCKCHIP_RK3399
select DM_PMIC select DM_PMIC
select DM_REGULATOR_FIXED select DM_REGULATOR_FIXED
select BOARD_LATE_INIT select BOARD_LATE_INIT
select ROCKCHIP_BROM_HELPER
imply TPL_SERIAL_SUPPORT imply TPL_SERIAL_SUPPORT
imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBCOMMON_SUPPORT
imply TPL_LIBGENERIC_SUPPORT imply TPL_LIBGENERIC_SUPPORT
imply TPL_SYS_MALLOC_SIMPLE imply TPL_SYS_MALLOC_SIMPLE
imply TPL_BOOTROM_SUPPORT
imply TPL_DRIVERS_MISC_SUPPORT imply TPL_DRIVERS_MISC_SUPPORT
imply TPL_OF_CONTROL imply TPL_OF_CONTROL
imply TPL_DM imply TPL_DM
@ -211,6 +206,7 @@ config SPL_ROCKCHIP_BACK_TO_BROM
bool "SPL returns to bootrom" bool "SPL returns to bootrom"
default y if ROCKCHIP_RK3036 default y if ROCKCHIP_RK3036
select ROCKCHIP_BROM_HELPER select ROCKCHIP_BROM_HELPER
select SPL_BOOTROM_SUPPORT
depends on SPL depends on SPL
help help
Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled, Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled,
@ -221,6 +217,7 @@ config TPL_ROCKCHIP_BACK_TO_BROM
bool "TPL returns to bootrom" bool "TPL returns to bootrom"
default y default y
select ROCKCHIP_BROM_HELPER select ROCKCHIP_BROM_HELPER
select TPL_BOOTROM_SUPPORT
depends on TPL depends on TPL
help help
Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled, Rockchip SoCs have ability to load SPL & U-Boot binary. If enabled,

13
arch/arm/mach-rockchip/rk3188-board-spl.c
View File

@ -26,6 +26,11 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
void board_return_to_bootrom(void)
{
back_to_bootrom(BROM_BOOT_NEXTSTAGE);
}
u32 spl_boot_device(void) u32 spl_boot_device(void)
{ {
#if !CONFIG_IS_ENABLED(OF_PLATDATA) #if !CONFIG_IS_ENABLED(OF_PLATDATA)
@ -109,10 +114,6 @@ void board_init_f(ulong dummy)
debug("DRAM init failed: %d\n", ret); debug("DRAM init failed: %d\n", ret);
return; return;
} }
#if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT)
back_to_bootrom(BROM_BOOT_NEXTSTAGE);
#endif
} }
static int setup_led(void) static int setup_led(void)
@ -149,8 +150,6 @@ void spl_board_init(void)
} }
preloader_console_init(); preloader_console_init();
#if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM)
back_to_bootrom(BROM_BOOT_NEXTSTAGE);
#endif
return; return;
} }

13
arch/arm/mach-rockchip/rk3288-board-spl.c
View File

@ -30,6 +30,11 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
void board_return_to_bootrom(void)
{
back_to_bootrom(BROM_BOOT_NEXTSTAGE);
}
u32 spl_boot_device(void) u32 spl_boot_device(void)
{ {
#if !CONFIG_IS_ENABLED(OF_PLATDATA) #if !CONFIG_IS_ENABLED(OF_PLATDATA)
@ -187,10 +192,6 @@ void board_init_f(ulong dummy)
return; return;
} }
#endif #endif
#if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM) && !defined(CONFIG_SPL_BOARD_INIT)
back_to_bootrom(BROM_BOOT_NEXTSTAGE);
#endif
} }
static int setup_led(void) static int setup_led(void)
@ -227,9 +228,7 @@ void spl_board_init(void)
} }
preloader_console_init(); preloader_console_init();
#if CONFIG_IS_ENABLED(ROCKCHIP_BACK_TO_BROM)
back_to_bootrom(BROM_BOOT_NEXTSTAGE);
#endif
return; return;
} }