On Thu, Nov 07, 2019 at 02:30:13PM +0100, [email protected] wrote: > From: Matthias Brugger <[email protected]> > > 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 <[email protected]> > Reported-by: Heinrich Schuchardt <[email protected]> > Signed-off-by: Matthias Brugger <[email protected]> > > --- > > 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?).
--
Tom
signature.asc
Description: PGP signature
_______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
