| Message ID | 20230911214623.2201324-1-robh@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | arm64: dts: renesas: Apply overlays to base dtbs | expand |
Hi Rob, On Mon, Sep 11, 2023 at 11:47 PM Rob Herring <robh@kernel.org> wrote: > DT overlays in tree need to be applied to a base DTB to validate they > apply, to run schema checks on them, and to catch any errors at compile > time. > > Signed-off-by: Rob Herring <robh@kernel.org> Thanks for your patch! > Looks like some of these apply to multiple base DTs. I've only added them > to 1 base. Indeed: - draak-ebisu-panel-aa104xd12.dtbo applies to r8a77990-ebisu.dtb, too, - salvator-panel-aa104xd12.dtbo applies to all salvator-x(s) variants. So should they be added to all bases they apply to? Or, if you intend none of the composite DTBs to be consumed as-is, but only intend them to be created for validation, perhaps the additional rules should be grouped together at the bottom of the Makefile? > --- a/arch/arm64/boot/dts/renesas/Makefile > +++ b/arch/arm64/boot/dts/renesas/Makefile > @@ -64,6 +65,8 @@ dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb > > dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb > dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo Do you still need the individual *.dtbo rules? Perhaps you are afraid that make will auto-delete them as they are only used as intermediaries? > +r8a779g0-white-hawk-ard-audio-da7212-dtbs := r8a779g0-white-hawk.dtb r8a779g0-white-hawk-ard-audio-da7212.dtbo > +dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtb Gr{oetje,eeting}s, Geert
On Mon, Sep 18, 2023 at 7:08 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > Hi Rob, > > On Mon, Sep 11, 2023 at 11:47 PM Rob Herring <robh@kernel.org> wrote: > > DT overlays in tree need to be applied to a base DTB to validate they > > apply, to run schema checks on them, and to catch any errors at compile > > time. > > > > Signed-off-by: Rob Herring <robh@kernel.org> > > Thanks for your patch! > > > Looks like some of these apply to multiple base DTs. I've only added them > > to 1 base. > > Indeed: > - draak-ebisu-panel-aa104xd12.dtbo applies to r8a77990-ebisu.dtb, too, > - salvator-panel-aa104xd12.dtbo applies to all salvator-x(s) variants. > > So should they be added to all bases they apply to? I'll leave that to you. All depends what combinations you want to validate. I just don't want overlays in the kernel that don't have a base in the kernel. > Or, if you intend none of the composite DTBs to be consumed as-is, but > only intend them to be created for validation, perhaps the additional > rules should be grouped together at the bottom of the Makefile? Folks may want the composite DTBs if their bootloader can't apply them or they don't want to mess with it in the bootloader. > > --- a/arch/arm64/boot/dts/renesas/Makefile > > +++ b/arch/arm64/boot/dts/renesas/Makefile > > @@ -64,6 +65,8 @@ dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb > > > > dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb > > dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo > > Do you still need the individual *.dtbo rules? Perhaps you are > afraid that make will auto-delete them as they are only used as > intermediaries? Yes you need them if you want to install the .dtbo's. I'm not sure offhand if it matters for cleaning. Rob
diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index 7114cbbd8713..5b23bdb71804 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -56,7 +56,8 @@ dtb-$(CONFIG_ARCH_R8A77980) += r8a77980a-condor-i.dtb dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb -dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb +r8a77995-draak-panel-aa104xd12-dtbs := r8a77995-draak.dtb draak-ebisu-panel-aa104xd12.dtbo +dtb-$(CONFIG_ARCH_R8A77995) += r8a77995-draak.dtb r8a77995-draak-panel-aa104xd12.dtb dtb-$(CONFIG_ARCH_R8A779A0) += r8a779a0-falcon.dtb @@ -64,6 +65,8 @@ dtb-$(CONFIG_ARCH_R8A779F0) += r8a779f0-spider.dtb dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk.dtb dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtbo +r8a779g0-white-hawk-ard-audio-da7212-dtbs := r8a779g0-white-hawk.dtb r8a779g0-white-hawk-ard-audio-da7212.dtbo +dtb-$(CONFIG_ARCH_R8A779G0) += r8a779g0-white-hawk-ard-audio-da7212.dtb dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77951) += r8a779m1-ulcb.dtb @@ -73,18 +76,28 @@ dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-ulcb.dtb dtb-$(CONFIG_ARCH_R8A77961) += r8a779m3-ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A77965) += r8a779m5-salvator-xs.dtb +r8a779m5-salvator-xs-panel-aa104xd12-dtbs := r8a779m5-salvator-xs.dtb salvator-panel-aa104xd12.dtbo +dtb-$(CONFIG_ARCH_R8A77965) += r8a779m5-salvator-xs.dtb r8a779m5-salvator-xs-panel-aa104xd12.dtb dtb-$(CONFIG_ARCH_R9A07G043) += r9a07g043u11-smarc.dtb dtb-$(CONFIG_ARCH_R9A07G043) += r9a07g043-smarc-pmod.dtbo +r9a07g043u11-smarc-pmod-dtbs := r9a07g043u11-smarc.dtb r9a07g043-smarc-pmod.dtbo +dtb-$(CONFIG_ARCH_R9A07G043) += r9a07g043u11-smarc-pmod.dtb dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044c2-smarc.dtb dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044c2-smarc-cru-csi-ov5645.dtbo +r9a07g044c2-smarc-cru-csi-ov5645-dtbs := r9a07g044c2-smarc.dtb r9a07g044c2-smarc-cru-csi-ov5645.dtbo +dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044c2-smarc-cru-csi-ov5645.dtb + dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc.dtb dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc-cru-csi-ov5645.dtbo +r9a07g044l2-smarc-cru-csi-ov5645-dtbs := r9a07g044l2-smarc.dtb r9a07g044l2-smarc-cru-csi-ov5645.dtbo +dtb-$(CONFIG_ARCH_R9A07G044) += r9a07g044l2-smarc-cru-csi-ov5645.dtb dtb-$(CONFIG_ARCH_R9A07G054) += r9a07g054l2-smarc.dtb dtb-$(CONFIG_ARCH_R9A07G054) += r9a07g054l2-smarc-cru-csi-ov5645.dtbo +r9a07g054l2-smarc-cru-csi-ov5645-dtbs := r9a07g054l2-smarc.dtb r9a07g054l2-smarc-cru-csi-ov5645.dtbo +dtb-$(CONFIG_ARCH_R9A07G054) += r9a07g054l2-smarc-cru-csi-ov5645.dtb dtb-$(CONFIG_ARCH_R9A09G011) += r9a09g011-v2mevk2.dtb
DT overlays in tree need to be applied to a base DTB to validate they apply, to run schema checks on them, and to catch any errors at compile time. Signed-off-by: Rob Herring <robh@kernel.org> --- Looks like some of these apply to multiple base DTs. I've only added them to 1 base. --- arch/arm64/boot/dts/renesas/Makefile | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)