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>
This commit is contained in:

committed by
Kever Yang

parent
3080945aca
commit
d958801dda
@@ -1,9 +1,3 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
#include "rk3328-nanopi-r2c-u-boot.dtsi"
|
#include "rk3328-nanopi-r2c-u-boot.dtsi"
|
||||||
|
|
||||||
/ {
|
|
||||||
chosen {
|
|
||||||
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
@@ -6,11 +6,6 @@
|
|||||||
|
|
||||||
#include "rk3328-u-boot.dtsi"
|
#include "rk3328-u-boot.dtsi"
|
||||||
#include "rk3328-sdram-ddr4-666.dtsi"
|
#include "rk3328-sdram-ddr4-666.dtsi"
|
||||||
/ {
|
|
||||||
chosen {
|
|
||||||
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
&gpio0 {
|
&gpio0 {
|
||||||
bootph-pre-ram;
|
bootph-pre-ram;
|
||||||
|
@@ -6,11 +6,6 @@
|
|||||||
|
|
||||||
#include "rk3328-u-boot.dtsi"
|
#include "rk3328-u-boot.dtsi"
|
||||||
#include "rk3328-sdram-lpddr3-666.dtsi"
|
#include "rk3328-sdram-lpddr3-666.dtsi"
|
||||||
/ {
|
|
||||||
chosen {
|
|
||||||
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
&gpio0 {
|
&gpio0 {
|
||||||
bootph-pre-ram;
|
bootph-pre-ram;
|
||||||
|
@@ -6,11 +6,6 @@
|
|||||||
|
|
||||||
#include "rk3328-u-boot.dtsi"
|
#include "rk3328-u-boot.dtsi"
|
||||||
#include "rk3328-sdram-ddr4-666.dtsi"
|
#include "rk3328-sdram-ddr4-666.dtsi"
|
||||||
/ {
|
|
||||||
chosen {
|
|
||||||
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
&gpio0 {
|
&gpio0 {
|
||||||
bootph-pre-ram;
|
bootph-pre-ram;
|
||||||
|
@@ -5,11 +5,8 @@
|
|||||||
|
|
||||||
#include "rk3328-u-boot.dtsi"
|
#include "rk3328-u-boot.dtsi"
|
||||||
#include "rk3328-sdram-ddr4-666.dtsi"
|
#include "rk3328-sdram-ddr4-666.dtsi"
|
||||||
/ {
|
|
||||||
chosen {
|
|
||||||
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
/ {
|
||||||
smbios {
|
smbios {
|
||||||
compatible = "u-boot,sysinfo-smbios";
|
compatible = "u-boot,sysinfo-smbios";
|
||||||
|
|
||||||
|
@@ -5,11 +5,8 @@
|
|||||||
|
|
||||||
#include "rk3328-u-boot.dtsi"
|
#include "rk3328-u-boot.dtsi"
|
||||||
#include "rk3328-sdram-lpddr3-1600.dtsi"
|
#include "rk3328-sdram-lpddr3-1600.dtsi"
|
||||||
/ {
|
|
||||||
chosen {
|
|
||||||
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
/ {
|
||||||
smbios {
|
smbios {
|
||||||
compatible = "u-boot,sysinfo-smbios";
|
compatible = "u-boot,sysinfo-smbios";
|
||||||
|
|
||||||
|
@@ -13,7 +13,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
u-boot,spl-boot-order = &emmc, &sdmmc;
|
u-boot,spl-boot-order = "same-as-spl", &sdmmc, &emmc;
|
||||||
};
|
};
|
||||||
|
|
||||||
dmc: dmc {
|
dmc: dmc {
|
||||||
|
Reference in New Issue
Block a user