* [U-Boot] [PATCH] fdt: fix bcm283x dm-pre-reloc definitions
@ 2019-11-07 13:30 matthias.bgg at kernel.org
2019-11-07 13:51 ` Tom Rini
0 siblings, 1 reply; 3+ messages in thread
From: matthias.bgg at kernel.org @ 2019-11-07 13:30 UTC (permalink / raw)
To: u-boot
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>;
@@ -675,3 +675,5 @@
#phy-cells = <0>;
};
};
+
+#include "bcm283x-uboot.dtsi"
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] fdt: fix bcm283x dm-pre-reloc definitions
2019-11-07 13:30 [U-Boot] [PATCH] fdt: fix bcm283x dm-pre-reloc definitions matthias.bgg at kernel.org
@ 2019-11-07 13:51 ` Tom Rini
2019-11-07 16:37 ` Matthias Brugger
0 siblings, 1 reply; 3+ messages in thread
From: Tom Rini @ 2019-11-07 13:51 UTC (permalink / raw)
To: u-boot
On Thu, Nov 07, 2019 at 02:30:13PM +0100, matthias.bgg at 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?).
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191107/5490f2a5/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] fdt: fix bcm283x dm-pre-reloc definitions
2019-11-07 13:51 ` Tom Rini
@ 2019-11-07 16:37 ` Matthias Brugger
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Brugger @ 2019-11-07 16:37 UTC (permalink / raw)
To: u-boot
On 07/11/2019 14:51, Tom Rini wrote:
> On Thu, Nov 07, 2019 at 02:30:13PM +0100, matthias.bgg at 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-07 16:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-07 13:30 [U-Boot] [PATCH] fdt: fix bcm283x dm-pre-reloc definitions matthias.bgg at kernel.org
2019-11-07 13:51 ` Tom Rini
2019-11-07 16:37 ` Matthias Brugger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.