rockchip: rk3328: Update default u-boot, spl-boot-order prop

Change to use a common FIT load order, same-as-spl > SD-card > eMMC on
RK3328 boards. Only EVB and Radxa ROCK Pi E is affected by this change.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
index f8adb9e5e1ff758a4bcfdfe100984354b71ca5e8..1dc3c022c50451242352103defae808c95841d42 100644 (file)
--- a/arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi
@@ -1,9 +1,3 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "rk3328-nanopi-r2c-u-boot.dtsi"
-
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
-       };
-};

diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
index 78d37ab47558001ad16272d397d368f89dd7e42a..d969b008775eb2ec08aa949559bb7bc0a0e58ff2 100644 (file)
--- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi
@@ -6,11 +6,6 @@
 
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-ddr4-666.dtsi"
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
-       };
-};
 
 &gpio0 {
        bootph-pre-ram;

diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
index ebe33e48cb9c1faeaf004f863c891522da20ad2b..5aaa5ccb15c1cc2c0c77acff6d1659d69eaaca92 100644 (file)
--- a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi
@@ -6,11 +6,6 @@
 
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-lpddr3-666.dtsi"
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
-       };
-};
 
 &gpio0 {
        bootph-pre-ram;

diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
index 637c70adf194a3f29cbd54baff9764f2fbc7f42d..6d3db86dce6a359436604508147e276017aa6db0 100644 (file)
--- a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi
@@ -6,11 +6,6 @@
 
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-ddr4-666.dtsi"
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
-       };
-};
 
 &gpio0 {
        bootph-pre-ram;

diff --git a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
index 2062f34bf825532f4eeca57a3c6c9cf82c1aecb5..8bc2f134f8f46d192b3360409ca6d89ead3c58bb 100644 (file)
--- a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi
@@ -5,11 +5,8 @@
 
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-ddr4-666.dtsi"
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
-       };
 
+/ {
        smbios {
                compatible = "u-boot,sysinfo-smbios";
 

diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
index 6904515b96938d604d545f234eb168c323fb58a0..bfe506fd2249cbb8546617dfab80e2107e7725a4 100644 (file)
--- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi
@@ -5,11 +5,8 @@
 
 #include "rk3328-u-boot.dtsi"
 #include "rk3328-sdram-lpddr3-1600.dtsi"
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
-       };
 
+/ {
        smbios {
                compatible = "u-boot,sysinfo-smbios";
 

diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi
index a9f2536de2a21c87603502b0317683e54198c8b9..a12be7876db046312d7ebb5d7fd71a46fdba538d 100644 (file)
--- a/arch/arm/dts/rk3328-u-boot.dtsi
+++ b/arch/arm/dts/rk3328-u-boot.dtsi
@@ -13,7 +13,7 @@
        };
 
        chosen {
-               u-boot,spl-boot-order = &emmc, &sdmmc;
+               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
        };
 
        dmc: dmc {