From: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Date: Fri, 29 Sep 2017 17:27:59 +0000 (+0200)
Subject: rockchip: dts: rk3399-puma: add 'same-as-spl' to the front of the boot-order
X-Git-Tag: v2017.11-rc1~3^2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=775bd78a1126497f57bdab8be2419a063cf12111;p=oweals%2Fu-boot.git

rockchip: dts: rk3399-puma: add 'same-as-spl' to the front of the boot-order

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>
---

diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi
index a04878e223..f95c68e9f6 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 {