diff mbox series

[U-Boot,v2,06/10] rockchip: dts: rk3399-puma: add 'same-as-spl' to the front of the boot-order

Message ID 1506706083-33489-7-git-send-email-philipp.tomsich@theobroma-systems.com
State Accepted
Delegated to: Philipp Tomsich
Headers show
Series rockchip: puma-rk3399: support 'same-as-spl' for boot-order and always power-up eMMC/SPI | expand

Commit Message

Philipp Tomsich Sept. 29, 2017, 5:27 p.m. UTC 
In the general case, we want to continue booting the full U-Boot
(contained in a discoverable FIT image) from the same device the SPL
stage was loaded from.  This prepends the 'same-as-spl' specifier to
our configurable boot-order to make this the default behaviour.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 arch/arm/dts/rk3399-puma.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Philipp Tomsich Sept. 29, 2017, 5:46 p.m. UTC | #1 
> In the general case, we want to continue booting the full U-Boot
> (contained in a discoverable FIT image) from the same device the SPL
> stage was loaded from.  This prepends the 'same-as-spl' specifier to
> our configurable boot-order to make this the default behaviour.
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
> 
> Changes in v2: None
> 
>  arch/arm/dts/rk3399-puma.dtsi | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

Applied to u-boot-rockchip, thanks!
diff mbox series

Patch

diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index a04878e..f95c68e 100644
--- a/arch/arm/dts/rk3399-puma.dtsi
+++ b/arch/arm/dts/rk3399-puma.dtsi
@@ -20,7 +20,8 @@ 
 
 	chosen {
 		stdout-path = "serial0:115200n8";
-		u-boot,spl-boot-order = &spiflash, &sdhci, &sdmmc;
+		u-boot,spl-boot-order = \
+			"same-as-spl", &spiflash, &sdhci, &sdmmc;
 	};
 
 	aliases {