[U-Boot,v4,05/20] rockchip: Move bootrom helper compilation to a hidden option
diff mbox

Message ID 20170218184640.30635-6-heiko@sntech.de
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Heiko Stuebner Feb. 18, 2017, 6:46 p.m. UTC
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>
---
 arch/arm/mach-rockchip/Kconfig  | 4 ++++
 arch/arm/mach-rockchip/Makefile | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

Comments

Simon Glass Feb. 21, 2017, 8:34 p.m. UTC | #1
On 18 February 2017 at 11:46, Heiko Stuebner <heiko@sntech.de> wrote:
> 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>
> ---
>  arch/arm/mach-rockchip/Kconfig  | 4 ++++
>  arch/arm/mach-rockchip/Makefile | 2 +-
>  2 files changed, 5 insertions(+), 1 deletion(-)

Applied to u-boot-rockchip, thanks!

Patch
diff mbox

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 5c4a4c2291..a776df35f4 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -37,11 +37,15 @@  config ROCKCHIP_RK3399
 config ROCKCHIP_SPL_BACK_TO_BROM
 	bool "SPL returns to bootrom"
 	default y if ROCKCHIP_RK3036
+	select ROCKCHIP_BROM_HELPER
 	help
 	  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
           binary to keep going on.
 
+config ROCKCHIP_BROM_HELPER
+	bool
+
 config SPL_MMC_SUPPORT
 	default y if !ROCKCHIP_SPL_BACK_TO_BROM
 
diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile
index 6e79fed485..f9ccc9bb2c 100644
--- a/arch/arm/mach-rockchip/Makefile
+++ b/arch/arm/mach-rockchip/Makefile
@@ -7,7 +7,7 @@ 
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-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
 obj-$(CONFIG_ROCKCHIP_RK3288) += rk3288-board.o
 obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board.o