From: Emmanuel Vadot <manu@freebsd.org>
Date: Tue, 8 Oct 2019 17:59:50 +0000 (+0200)
Subject: rockchip: dts: rk3328: rock64: Add same-as-spl order
X-Git-Tag: v2020.10~506^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5500b20576e8e786d74d92549ca66d31c92b0d9;p=platform%2Fkernel%2Fu-boot.git

rockchip: dts: rk3328: rock64: Add same-as-spl order

rk3328 can use same-as-spl option so next loaders are loaded from the same
medium.
Add the boot order in the rock64 dts otherwise booting from sdcard
will result in u-boot looking into the eMMC.

Signed-off-by: Emmanuel Vadot <manu@freebsd.org>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
Tested-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
---

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 1d441f7..e5946d2 100644
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -5,6 +5,11 @@
 
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-lpddr3-1600.dtsi"
+/ {
+	chosen {
+		u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
+	};
+};
 
 &usb_host0_xhci {
 	status = "okay";