| Message ID | 20240217002304.2141064-2-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | d958801dda1f65c40747df5bfae613dae7083b4c |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: rk3328: Update defconfigs, DTs and enable boot from SPI | expand |
On 2024/2/17 08:22, Jonas Karlman wrote: > 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> Thanks, - Kever > --- > v2: > - No change > - Collect r-b tag > --- > arch/arm/dts/rk3328-nanopi-r2c-plus-u-boot.dtsi | 6 ------ > arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 5 ----- > arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 5 ----- > arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 5 ----- > arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 5 +---- > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 5 +---- > arch/arm/dts/rk3328-u-boot.dtsi | 2 +- > 7 files changed, 3 insertions(+), 30 deletions(-) > > 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 f8adb9e5e1ff..1dc3c022c504 100644 > --- 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 78d37ab47558..d969b008775e 100644 > --- 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 ebe33e48cb9c..5aaa5ccb15c1 100644 > --- 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 637c70adf194..6d3db86dce6a 100644 > --- 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 2062f34bf825..8bc2f134f8f4 100644 > --- 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 6904515b9693..bfe506fd2249 100644 > --- 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 a9f2536de2a2..a12be7876db0 100644 > --- 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 {
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 f8adb9e5e1ff..1dc3c022c504 100644 --- 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 78d37ab47558..d969b008775e 100644 --- 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 ebe33e48cb9c..5aaa5ccb15c1 100644 --- 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 637c70adf194..6d3db86dce6a 100644 --- 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 2062f34bf825..8bc2f134f8f4 100644 --- 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 6904515b9693..bfe506fd2249 100644 --- 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 a9f2536de2a2..a12be7876db0 100644 --- 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 {