From: Heiko Stuebner <heiko@sntech.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v4 05/20] rockchip: Move bootrom helper compilation to a hidden option
Date: Sat, 18 Feb 2017 19:46:25 +0100 [thread overview]
Message-ID: <20170218184640.30635-6-heiko@sntech.de> (raw)
In-Reply-To: <20170218184640.30635-1-heiko@sntech.de>
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(-)
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
--
2.11.0
next prev parent reply other threads:[~2017-02-18 18:46 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-18 18:46 [U-Boot] [PATCH v4 00/20] rk3188 uboot support Heiko Stuebner
2017-02-18 18:46 ` [U-Boot] [PATCH v4 01/20] dm: allow limiting pre-reloc markings to spl or tpl Heiko Stuebner
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 02/20] clk: rk3288: limit gpll and cpll init to SPL build Heiko Stuebner
2017-02-21 18:08 ` Simon Glass
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 03/20] rockchip: rk3288: sdram: use constants in ddrconf table Heiko Stuebner
2017-02-21 18:08 ` Simon Glass
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 04/20] rockchip: rk3288: sdram: style fixes from rk3188 sdram review Heiko Stuebner
2017-02-21 18:08 ` Simon Glass
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` Heiko Stuebner [this message]
2017-02-21 20:34 ` [U-Boot] [PATCH v4 05/20] rockchip: Move bootrom helper compilation to a hidden option Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 06/20] rockchip: Move bootrom-related declarations to a header Heiko Stuebner
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 07/20] rockchip: mkimage: Allow encoding of loader code in spl images Heiko Stuebner
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 08/20] rockchip: mkimage: Add support rk3188 serial Heiko Stuebner
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 09/20] rockchip: serial: Adapt rockchip of-platdata driver for rk3188 Heiko Stuebner
2017-02-21 20:34 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 10/20] rockchip: rk3188: Add header files for PMU and GRF Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 11/20] rockchip: rk3188: Add pinctrl driver Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 12/20] rockchip: rk3188: Add sysreset driver Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 13/20] rockchip: rk3188: Add rk3066/rk3188 clock bindings Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 14/20] rockchip: rk3188: Add clock driver Heiko Stuebner
2017-02-18 18:46 ` [U-Boot] [PATCH v4 15/20] rockchip: rk3188: Add core devicetree files Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 16/20] rockchip: rk3188: Add core support Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 17/20] rockchip: rk3188: Add sdram driver Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 18/20] rockchip: rk3188: Add main, spl and tpl boards Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-02-18 18:46 ` [U-Boot] [PATCH v4 19/20] rockchip: rk3188: Add Radxa Rock board Heiko Stuebner
2017-02-21 20:35 ` Simon Glass
2017-03-23 16:18 ` Simon Glass
2017-03-23 16:34 ` Heiko Stübner
2017-02-18 18:46 ` [U-Boot] [PATCH v4 20/20] rockchip: rk3188: add README.rockchip paragraph describing sd boot Heiko Stuebner
2017-02-21 18:08 ` Simon Glass
2017-02-21 20:35 ` Simon Glass
2017-02-23 3:26 ` [U-Boot] [PATCH v4 00/20] rk3188 uboot support Simon Glass
2017-02-23 3:59 ` Heiko Stuebner
2017-02-23 16:19 ` Simon Glass
2017-02-23 16:29 ` Heiko Stuebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170218184640.30635-6-heiko@sntech.de \
--to=heiko@sntech.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox