Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-26 06:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

rockchip: Move bootrom helper compilation to a hidden option

Browse source 
Right now the ROCKCHIP_SPL_BACK_TO_BROM option both triggers
compilation of the bootrom hook-code as well as enabling the
behaviour of loading the full U-Boot via the boot.

New added socs may always need the bootrom code, while still
being able to decide between loading U-Boot regularly or via
the bootrom separately.

So move the compilation of the bootrom code to a hidden option
that gets selected by ROCKCHIP_SPL_BACK_TO_BROM, but can also
be selected by other parts.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Heiko Stübner 2017-02-18 19:46:25 +01:00 committed by Simon Glass
parent 8f3cbef57d
commit 1d845947a3
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/mach-rockchip/Kconfig
View file

@ -37,11 +37,15 @@ config ROCKCHIP_RK3399
config ROCKCHIP_SPL_BACK_TO_BROM config ROCKCHIP_SPL_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
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,
SPL will return to the boot rom, which will then load the U-Boot SPL will return to the boot rom, which will then load the U-Boot
binary to keep going on. binary to keep going on.
config ROCKCHIP_BROM_HELPER
bool
config SPL_MMC_SUPPORT config SPL_MMC_SUPPORT
default y if !ROCKCHIP_SPL_BACK_TO_BROM default y if !ROCKCHIP_SPL_BACK_TO_BROM

2
arch/arm/mach-rockchip/Makefile
View file

@ -7,7 +7,7 @@
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o
obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board-spl.o
obj-$(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM) += save_boot_param.o obj-$(CONFIG_ROCKCHIP_BROM_HELPER) += save_boot_param.o
else else
obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o
obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board.o obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board.o