| Message ID | 20191109203007.248686-2-pbrobinson@gmail.com |
|---|---|
| State | Accepted |
| Commit | e7505d06bd6f643f25168d3a7b6bdd8bb5a2da8a |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [U-Boot,1/3] rockchip: dts: rk3399: move the u-boot, dm-pre-reloc to the u-boot.dtsi | expand |
On 2019/11/10 上午4:30, Peter Robinson wrote: > 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> Thanks, - Kever > --- > 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 {
On 2019/11/10 下午10:35, Kever Yang wrote: > > On 2019/11/10 上午4:30, Peter Robinson wrote: >> 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> Applied to u-boot-rockchip master. Thanks, - Kever > > Thanks, > - Kever >> --- >> 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 { > > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
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 {
The u-boot specific device tree directives should be in u-boot.dtsi Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- arch/arm/dts/rk3399-evb-u-boot.dtsi | 6 ++++++ arch/arm/dts/rk3399-evb.dts | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-)