rockchip: dts: rk3399-evb: move u-boot, spl-boot-order to to the u-boot.dtsi

The u-boot specific device tree directives should be in u-boot.dtsi

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
index 20910e744bb9a32b95c9f7303a1003246c2f1e48..ccb33d34d12d0ed20856b0c042a37d80a8962e0e 100644 (file)
--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi
@@ -5,3 +5,9 @@
 
 #include "rk3399-u-boot.dtsi"
 #include "rk3399-sdram-lpddr3-4GB-1600.dtsi"
+
+/ {
+       chosen {
+               u-boot,spl-boot-order = &sdhci, &sdmmc;
+       };
+};

diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts
index a506e8da370232aab5486d2acd0ec9ee3e8f7450..8e887f3a177faaa770363e9433825cecba82c789 100644 (file)
--- a/arch/arm/dts/rk3399-evb.dts
+++ b/arch/arm/dts/rk3399-evb.dts
@@ -15,8 +15,6 @@
 
        chosen {
                stdout-path = &uart2;
-               u-boot,spl-boot-order = \
-                       &sdhci, &sdmmc;
        };
 
        vdd_center: vdd-center {