Re: [PATCH 6/7] rockchip: rk3588: Add default u-boot,spl-boot-order prop

[Kever Yang]

On 2024/1/27 06:14, Jonas Karlman wrote:

Add a default u-boot,spl-boot-order prop to rk3588s-u-boot.dtsi and
remove the prop from board u-boot.dtsi files using the default value.

Signed-off-by: Jonas Karlman <jo...@kwiboo.se>

Reviewed-by: Kever Yang <kever.y...@rock-chips.com>

Thanks,
- Kever

---
  arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi       | 6 ------
  arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi | 6 ------
  arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi     | 6 ------
  arch/arm/dts/rk3588-rock-5b-u-boot.dtsi         | 4 ----
  arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi      | 6 ------
  arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi        | 6 ------
  arch/arm/dts/rk3588s-u-boot.dtsi                | 4 ++++
  7 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi 
b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
index 87831c9d432a..60494bb8485f 100644
--- a/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-nanopc-t6-u-boot.dtsi
@@ -6,12 +6,6 @@

#include "rk3588-u-boot.dtsi" -/ {

-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
  &fspim1_pins {
        bootph-all;
  };
diff --git a/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi 
b/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
index b0f5c667197c..5d5fa6ffb214 100644
--- a/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-orangepi-5-plus-u-boot.dtsi
@@ -2,12 +2,6 @@

#include "rk3588-u-boot.dtsi" -/ {

-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
  &fspim1_pins {
        bootph-all;
  };
diff --git a/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi 
b/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
index 191ec988c459..7b937943a53c 100644
--- a/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-quartzpro64-u-boot.dtsi
@@ -4,9 +4,3 @@
   */

#include "rk3588-u-boot.dtsi"

-
-/ {
-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi 
b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
index 5fa20cecc044..e99e60185ebe 100644
--- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi
@@ -7,10 +7,6 @@
  #include <dt-bindings/usb/pd.h>

/ {

-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-
        vcc12v_dcin: vcc12v-dcin-regulator {
                compatible = "regulator-fixed";
                regulator-name = "vcc12v_dcin";
diff --git a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi 
b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
index 06c6f327c14b..e791b572b6bf 100644
--- a/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
+++ b/arch/arm/dts/rk3588-turing-rk1-u-boot.dtsi
@@ -6,12 +6,6 @@

#include "rk3588-u-boot.dtsi" -/ {

-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
  &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
diff --git a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi 
b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
index 584476f77b13..9a6a353088df 100644
--- a/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi
@@ -5,12 +5,6 @@

#include "rk3588s-u-boot.dtsi" -/ {

-       chosen {
-               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
-       };
-};
-
  &sdhci {
        cap-mmc-highspeed;
        mmc-ddr-1_8v;
diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi
index d251a210b313..945b2d62a75e 100644
--- a/arch/arm/dts/rk3588s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-u-boot.dtsi
@@ -10,6 +10,10 @@
                spi5 = &sfc;
        };

+ chosen {

+               u-boot,spl-boot-order = "same-as-spl", &sdmmc, &sdhci;
+       };
+
        dmc {
                compatible = "rockchip,rk3588-dmc";
                bootph-all;