| Message ID | 20180924102228.19656-1-liviu@dudau.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: dts: broadcom: Use the .dtb name in the rule, rather than .dts | expand |
Am 24.09.2018 um 12:22 schrieb Liviu Dudau: > Commit a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > Module IO Board V3") adds the bcm2837-rpi-cm3-io3.dts file as a target > in the Makefile, rather than the .dtb name. This will skip the > generation of the .dtb file at compile time and will fail the dtbs_install > target. > > Fixes: a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > Module IO Board V3") > > Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> Acked-by: Stefan Wahren <stefan.wahren@i2se.com> Thanks, i will add a dtbs_install step to my test jobs. @Arnd @Olof Should this fix for 4.20 go via pull request or can you apply it directly to your tree? > --- > arch/arm64/boot/dts/broadcom/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile > index 3d98f5f5ab88..667ca989c11b 100644 > --- a/arch/arm64/boot/dts/broadcom/Makefile > +++ b/arch/arm64/boot/dts/broadcom/Makefile > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0 > dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ > bcm2837-rpi-3-b-plus.dtb \ > - bcm2837-rpi-cm3-io3.dts > + bcm2837-rpi-cm3-io3.dtb > > subdir-y += northstar2 > subdir-y += stingray
On 09/24/2018 04:03 AM, Stefan Wahren wrote: > Am 24.09.2018 um 12:22 schrieb Liviu Dudau: >> Commit a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute >> Module IO Board V3") adds the bcm2837-rpi-cm3-io3.dts file as a target >> in the Makefile, rather than the .dtb name. This will skip the >> generation of the .dtb file at compile time and will fail the dtbs_install >> target. >> >> Fixes: a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute >> Module IO Board V3") >> >> Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> > > Acked-by: Stefan Wahren <stefan.wahren@i2se.com> > > Thanks, i will add a dtbs_install step to my test jobs. Same here. > > @Arnd @Olof Should this fix for 4.20 go via pull request or can you > apply it directly to your tree? That would be my preference here as well.
On Tue, Sep 25, 2018 at 11:17:52AM -0700, Florian Fainelli wrote: > On 09/24/2018 04:03 AM, Stefan Wahren wrote: > > Am 24.09.2018 um 12:22 schrieb Liviu Dudau: > >> Commit a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > >> Module IO Board V3") adds the bcm2837-rpi-cm3-io3.dts file as a target > >> in the Makefile, rather than the .dtb name. This will skip the > >> generation of the .dtb file at compile time and will fail the dtbs_install > >> target. > >> > >> Fixes: a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > >> Module IO Board V3") > >> > >> Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> > > > > Acked-by: Stefan Wahren <stefan.wahren@i2se.com> > > > > Thanks, i will add a dtbs_install step to my test jobs. > > Same here. I do but I don't seem to catch any errors from it. :-/ > > @Arnd @Olof Should this fix for 4.20 go via pull request or can you > > apply it directly to your tree? > > That would be my preference here as well. Applied to next/dt now. Thanks! -Olof
> Olof Johansson <olof@lixom.net> hat am 25. September 2018 um 20:51 geschrieben: > > > On Tue, Sep 25, 2018 at 11:17:52AM -0700, Florian Fainelli wrote: > > On 09/24/2018 04:03 AM, Stefan Wahren wrote: > > > Am 24.09.2018 um 12:22 schrieb Liviu Dudau: > > >> Commit a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > > >> Module IO Board V3") adds the bcm2837-rpi-cm3-io3.dts file as a target > > >> in the Makefile, rather than the .dtb name. This will skip the > > >> generation of the .dtb file at compile time and will fail the dtbs_install > > >> target. > > >> > > >> Fixes: a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > > >> Module IO Board V3") > > >> > > >> Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> > > > > > > Acked-by: Stefan Wahren <stefan.wahren@i2se.com> > > > > > > Thanks, i will add a dtbs_install step to my test jobs. > > > > Same here. > > I do but I don't seem to catch any errors from it. :-/ Strange, i'm get getting this: scripts/Makefile.dtbinst:31: Target „bcm2837-rpi-cm3-io3.dts“ passt nicht zum Ziel-Muster INSTALL arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dtb INSTALL arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dtb INSTALL cp: Fehlender Zieldatei‐Operand hinter '/tmp/broadcom' „cp --help“ liefert weitere Informationen. scripts/Makefile.dtbinst:32: die Regel für Ziel „bcm2837-rpi-cm3-io3.dts“ scheiterte make[2]: *** [bcm2837-rpi-cm3-io3.dts] Fehler 1 scripts/Makefile.dtbinst:35: die Regel für Ziel „broadcom“ scheiterte make[1]: *** [broadcom] Fehler 2 arch/arm64/Makefile:139: die Regel für Ziel „dtbs_install“ scheiterte make: *** [dtbs_install] Fehler 2 > > > > @Arnd @Olof Should this fix for 4.20 go via pull request or can you > > > apply it directly to your tree? > > > > That would be my preference here as well. > > Applied to next/dt now. Thanks! Thanks > > > -Olof > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On Tue, Sep 25, 2018 at 10:33 PM Stefan Wahren <stefan.wahren@i2se.com> wrote: > > > > Olof Johansson <olof@lixom.net> hat am 25. September 2018 um 20:51 geschrieben: > > > > > > On Tue, Sep 25, 2018 at 11:17:52AM -0700, Florian Fainelli wrote: > > > On 09/24/2018 04:03 AM, Stefan Wahren wrote: > > > > Am 24.09.2018 um 12:22 schrieb Liviu Dudau: > > > >> Commit a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > > > >> Module IO Board V3") adds the bcm2837-rpi-cm3-io3.dts file as a target > > > >> in the Makefile, rather than the .dtb name. This will skip the > > > >> generation of the .dtb file at compile time and will fail the dtbs_install > > > >> target. > > > >> > > > >> Fixes: a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute > > > >> Module IO Board V3") > > > >> > > > >> Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> > > > > > > > > Acked-by: Stefan Wahren <stefan.wahren@i2se.com> > > > > > > > > Thanks, i will add a dtbs_install step to my test jobs. > > > > > > Same here. > > > > I do but I don't seem to catch any errors from it. :-/ > > Strange, i'm get getting this: > > scripts/Makefile.dtbinst:31: Target „bcm2837-rpi-cm3-io3.dts“ passt nicht zum Ziel-Muster > INSTALL arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dtb > INSTALL arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dtb > INSTALL > cp: Fehlender Zieldatei‐Operand hinter '/tmp/broadcom' > „cp --help“ liefert weitere Informationen. > scripts/Makefile.dtbinst:32: die Regel für Ziel „bcm2837-rpi-cm3-io3.dts“ scheiterte > make[2]: *** [bcm2837-rpi-cm3-io3.dts] Fehler 1 > scripts/Makefile.dtbinst:35: die Regel für Ziel „broadcom“ scheiterte > make[1]: *** [broadcom] Fehler 2 > arch/arm64/Makefile:139: die Regel für Ziel „dtbs_install“ scheiterte > make: *** [dtbs_install] Fehler 2 Oh, it fails but my reporting scripts don't notice it since I usually don't capture errors from the install phase. -Olof
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile index 3d98f5f5ab88..667ca989c11b 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb \ bcm2837-rpi-3-b-plus.dtb \ - bcm2837-rpi-cm3-io3.dts + bcm2837-rpi-cm3-io3.dtb subdir-y += northstar2 subdir-y += stingray
Commit a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") adds the bcm2837-rpi-cm3-io3.dts file as a target in the Makefile, rather than the .dtb name. This will skip the generation of the .dtb file at compile time and will fail the dtbs_install target. Fixes: a7eb26392b893 ("arm64: dts: broadcom: Add reference to Compute Module IO Board V3") Signed-off-by: Liviu Dudau <liviu@dudau.co.uk> --- arch/arm64/boot/dts/broadcom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)