| Message ID | 1522142971-20739-23-git-send-email-kever.yang@rock-chips.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | rockchip: clean up board file for rockchip SoCs | expand |
On Tue, Mar 27, 2018 at 10:29 AM, Kever Yang <kever.yang@rock-chips.com> wrote: > Use "uboot,spl-boot-orde" instead of "uboot,boot0". I think these should be in *-u-boot.dtsi files, that enables easy sync between the linux kernel dts files and u-boot like done on a number of other configs, a couple of the rk3368 devices seem to already use this as does devices like AllWinner > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/dts/rk3288-phycore-rdk.dts | 6 +----- > arch/arm/dts/rk3288-veyron.dtsi | 6 +----- > 2 files changed, 2 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/dts/rk3288-phycore-rdk.dts b/arch/arm/dts/rk3288-phycore-rdk.dts > index f2bb7b5..3bf8efb 100644 > --- a/arch/arm/dts/rk3288-phycore-rdk.dts > +++ b/arch/arm/dts/rk3288-phycore-rdk.dts > @@ -53,11 +53,7 @@ > > chosen { > stdout-path = &uart2; > - }; > - > - config { > - u-boot,dm-pre-reloc; > - u-boot,boot0 = &emmc; > + u-boot,spl-boot-order = &emmc; > }; > > user_buttons: user-buttons { > diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi > index a314058..77b9bf8 100644 > --- a/arch/arm/dts/rk3288-veyron.dtsi > +++ b/arch/arm/dts/rk3288-veyron.dtsi > @@ -17,11 +17,7 @@ > > chosen { > stdout-path = &uart2; > - }; > - > - config { > - u-boot,dm-pre-reloc; > - u-boot,boot0 = &spi_flash; > + u-boot,spl-boot-order = &spi_flash; > }; > > firmware { > -- > 1.9.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
Hi Peter, On 03/27/2018 07:55 PM, Peter Robinson wrote: > On Tue, Mar 27, 2018 at 10:29 AM, Kever Yang <kever.yang@rock-chips.com> wrote: >> Use "uboot,spl-boot-orde" instead of "uboot,boot0". > I think these should be in *-u-boot.dtsi files, Yes, you are right about this, and move all this u-boot configs into *-u-boot.dtsi files is also one of my TODO clean up jobs. I didn't do this now because of the frame work do not fit what we already have now. @Simon, @Philipp, Here is what I want to do: - I think in most case, all the boards with same SoC shares the U-Boot configs, eg. it's better to have one rk3288-u-boot.dtsi instead of 12 rk3288-xxboard-u-boot.dtsi - The build system supports to automatic add x-u-boot.dtsi(feature add by Simon), the x could be: <dts>-u-boot.dtsi where <dts> is the base name of the .dts file <CONFIG_SYS_SOC>-u-boot.dtsi <CONFIG_SYS_CPU>-u-boot.dtsi <CONFIG_SYS_VENDOR>-u-boot.dtsi So use CONFIG_SYS_SOC-u-boot.dtsi should be the best choice. - But we can't use it because the value is always "rockchip" - we can not change this into a real soc name because: There is a symbolic link "arch/${ARCH}/include/asm/arch" for header file pointing to the SoC/CPU specific header directory; and all rockchip headers are locate at arch/arm/include/asm/arch-rockchip/, including many common header files and soc specific files. - Are we going to add arch-rk3xxx folder for each soc like arch-mxx and arch-tegraxxx, and copy the common header files into each soc directory? Is there other solution? Thanks, - Kever > that enables easy sync > between the linux kernel dts files and u-boot like done on a number of > other configs, a couple of the rk3368 devices seem to already use this > as does devices like AllWinner > >> Signed-off-by: Kever Yang <kever.yang@rock-chips.com> >> --- >> >> arch/arm/dts/rk3288-phycore-rdk.dts | 6 +----- >> arch/arm/dts/rk3288-veyron.dtsi | 6 +----- >> 2 files changed, 2 insertions(+), 10 deletions(-) >> >> diff --git a/arch/arm/dts/rk3288-phycore-rdk.dts b/arch/arm/dts/rk3288-phycore-rdk.dts >> index f2bb7b5..3bf8efb 100644 >> --- a/arch/arm/dts/rk3288-phycore-rdk.dts >> +++ b/arch/arm/dts/rk3288-phycore-rdk.dts >> @@ -53,11 +53,7 @@ >> >> chosen { >> stdout-path = &uart2; >> - }; >> - >> - config { >> - u-boot,dm-pre-reloc; >> - u-boot,boot0 = &emmc; >> + u-boot,spl-boot-order = &emmc; >> }; >> >> user_buttons: user-buttons { >> diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi >> index a314058..77b9bf8 100644 >> --- a/arch/arm/dts/rk3288-veyron.dtsi >> +++ b/arch/arm/dts/rk3288-veyron.dtsi >> @@ -17,11 +17,7 @@ >> >> chosen { >> stdout-path = &uart2; >> - }; >> - >> - config { >> - u-boot,dm-pre-reloc; >> - u-boot,boot0 = &spi_flash; >> + u-boot,spl-boot-order = &spi_flash; >> }; >> >> firmware { >> -- >> 1.9.1 >> >> _______________________________________________ >> U-Boot mailing list >> U-Boot@lists.denx.de >> https://lists.denx.de/listinfo/u-boot
> Use "uboot,spl-boot-orde" instead of "uboot,boot0". > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/dts/rk3288-phycore-rdk.dts | 6 +----- > arch/arm/dts/rk3288-veyron.dtsi | 6 +----- > 2 files changed, 2 insertions(+), 10 deletions(-) > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Use "uboot,spl-boot-orde" instead of "uboot,boot0". > > Signed-off-by: Kever Yang <kever.yang@rock-chips.com> > --- > > arch/arm/dts/rk3288-phycore-rdk.dts | 6 +----- > arch/arm/dts/rk3288-veyron.dtsi | 6 +----- > 2 files changed, 2 insertions(+), 10 deletions(-) > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
diff --git a/arch/arm/dts/rk3288-phycore-rdk.dts b/arch/arm/dts/rk3288-phycore-rdk.dts index f2bb7b5..3bf8efb 100644 --- a/arch/arm/dts/rk3288-phycore-rdk.dts +++ b/arch/arm/dts/rk3288-phycore-rdk.dts @@ -53,11 +53,7 @@ chosen { stdout-path = &uart2; - }; - - config { - u-boot,dm-pre-reloc; - u-boot,boot0 = &emmc; + u-boot,spl-boot-order = &emmc; }; user_buttons: user-buttons { diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi index a314058..77b9bf8 100644 --- a/arch/arm/dts/rk3288-veyron.dtsi +++ b/arch/arm/dts/rk3288-veyron.dtsi @@ -17,11 +17,7 @@ chosen { stdout-path = &uart2; - }; - - config { - u-boot,dm-pre-reloc; - u-boot,boot0 = &spi_flash; + u-boot,spl-boot-order = &spi_flash; }; firmware {
Use "uboot,spl-boot-orde" instead of "uboot,boot0". Signed-off-by: Kever Yang <kever.yang@rock-chips.com> --- arch/arm/dts/rk3288-phycore-rdk.dts | 6 +----- arch/arm/dts/rk3288-veyron.dtsi | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-)