summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-11-09 23:30:06 +0300
committerKever Yang <kever.yang@rock-chips.com>2019-11-17 12:22:53 +0300
commite7505d06bd6f643f25168d3a7b6bdd8bb5a2da8a (patch)
treea09ca2c61b00a53988d36e81bfe2dcd6a87bf693
parentf459e23ec0a6d0f2df15dc9e9fd1e3a420345bd9 (diff)
downloadu-boot-e7505d06bd6f643f25168d3a7b6bdd8bb5a2da8a.tar.xz
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>
-rw-r--r--arch/arm/dts/rk3399-evb-u-boot.dtsi6
-rw-r--r--arch/arm/dts/rk3399-evb.dts2
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi
index 20910e744b..ccb33d34d1 100644
--- 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 a506e8da37..8e887f3a17 100644
--- 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 {