summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-11-09 23:30:07 +0300
committerKever Yang <kever.yang@rock-chips.com>2019-11-17 12:22:53 +0300
commit267b6adf635989d69fc8703ddfce9f7e8be343be (patch)
treecbbfa1d552b055dec5a6282c16a8ae0bda08cf84
parente7505d06bd6f643f25168d3a7b6bdd8bb5a2da8a (diff)
downloadu-boot-267b6adf635989d69fc8703ddfce9f7e8be343be.tar.xz
rockchip: dts: rk3399-firefly: 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-firefly-u-boot.dtsi6
-rw-r--r--arch/arm/dts/rk3399-firefly.dts1
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
index 67b63a8352..38e0897db9 100644
--- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi
@@ -5,3 +5,9 @@
#include "rk3399-u-boot.dtsi"
#include "rk3399-sdram-ddr3-1600.dtsi"
+
+/ {
+ chosen {
+ u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+ };
+};
diff --git a/arch/arm/dts/rk3399-firefly.dts b/arch/arm/dts/rk3399-firefly.dts
index a4cb64f8bd..89c67fd24c 100644
--- a/arch/arm/dts/rk3399-firefly.dts
+++ b/arch/arm/dts/rk3399-firefly.dts
@@ -14,7 +14,6 @@
chosen {
stdout-path = &uart2;
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
};
backlight: backlight {