From e7505d06bd6f643f25168d3a7b6bdd8bb5a2da8a Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 9 Nov 2019 20:30:06 +0000 Subject: [PATCH] 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 Reviewed-by: Kever Yang --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-evb.dts | 2 -- 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 { -- 2.25.1