Message ID | 20191107133013.29418-1-matthias.bgg@kernel.org |
---|---|
State | Superseded |
Delegated to: | Matthias Brugger |
Headers | show |
Series | [U-Boot] fdt: fix bcm283x dm-pre-reloc definitions | expand |
On Thu, Nov 07, 2019 at 02:30:13PM +0100, matthias.bgg@kernel.org wrote: > From: Matthias Brugger <mbrugger@suse.com> > > In commmit > 143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") > we accidently deleted the inclution of bcm283x-uboot.dtsi which > marks, soc, uarts and pincontroller as dm-pre-reloc > > Without this definitions the first call to > bcm283x_mu_serial_ofdata_to_platdata() fails as the pins are not set > correctly. As a result the U-Boot banner isn't shown on boot. > > Reported-by: Tom Rini <trini@konsulko.com> > Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Signed-off-by: Matthias Brugger <mbrugger@suse.com> > > --- > > arch/arm/dts/bcm283x.dtsi | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/dts/bcm283x.dtsi b/arch/arm/dts/bcm283x.dtsi > index 9777644c6c..39d7bd600e 100644 > --- a/arch/arm/dts/bcm283x.dtsi > +++ b/arch/arm/dts/bcm283x.dtsi > @@ -51,7 +51,7 @@ > }; > }; > > - soc { > + soc: soc { > compatible = "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; Is that part needed? > @@ -675,3 +675,5 @@ > #phy-cells = <0>; > }; > }; > + > +#include "bcm283x-uboot.dtsi" This means one of the general rules we have in: u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ $(wildcard $(dir $<)u-boot.dtsi)) isn't being hit and we should probably rename the file (or set CONFIG_SYS_SOC differently?).
On 07/11/2019 14:51, Tom Rini wrote: > On Thu, Nov 07, 2019 at 02:30:13PM +0100, matthias.bgg@kernel.org wrote: > >> From: Matthias Brugger <mbrugger@suse.com> >> >> In commmit >> 143256b353 ("fdt: update bcm283x device tree sources to Linux 5.1-rc6 state") >> we accidently deleted the inclution of bcm283x-uboot.dtsi which >> marks, soc, uarts and pincontroller as dm-pre-reloc >> >> Without this definitions the first call to >> bcm283x_mu_serial_ofdata_to_platdata() fails as the pins are not set >> correctly. As a result the U-Boot banner isn't shown on boot. >> >> Reported-by: Tom Rini <trini@konsulko.com> >> Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de> >> Signed-off-by: Matthias Brugger <mbrugger@suse.com> >> >> --- >> >> arch/arm/dts/bcm283x.dtsi | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/dts/bcm283x.dtsi b/arch/arm/dts/bcm283x.dtsi >> index 9777644c6c..39d7bd600e 100644 >> --- a/arch/arm/dts/bcm283x.dtsi >> +++ b/arch/arm/dts/bcm283x.dtsi >> @@ -51,7 +51,7 @@ >> }; >> }; >> >> - soc { >> + soc: soc { >> compatible = "simple-bus"; >> #address-cells = <1>; >> #size-cells = <1>; > > Is that part needed? > I verified that this is not needed. Will update in v2. >> @@ -675,3 +675,5 @@ >> #phy-cells = <0>; >> }; >> }; >> + >> +#include "bcm283x-uboot.dtsi" > > This means one of the general rules we have in: > u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ > $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ > $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ > $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ > $(wildcard $(dir $<)u-boot.dtsi)) > > isn't being hit and we should probably rename the file (or set > CONFIG_SYS_SOC differently?). > Good catch. I'll send a v2 which fixes this by renaming the file. Regards, Matthias
diff --git a/arch/arm/dts/bcm283x.dtsi b/arch/arm/dts/bcm283x.dtsi index 9777644c6c..39d7bd600e 100644 --- a/arch/arm/dts/bcm283x.dtsi +++ b/arch/arm/dts/bcm283x.dtsi @@ -51,7 +51,7 @@ }; }; - soc { + soc: soc { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; @@ -675,3 +675,5 @@ #phy-cells = <0>; }; }; + +#include "bcm283x-uboot.dtsi"