| Message ID | 20221023182437.15263-1-afd@ti.com |
|---|---|
| Headers | show |
| Series | Rename DTB overlay source files | expand |
On Sun, Oct 23, 2022 at 8:24 PM Andrew Davis <afd@ti.com> wrote: > Currently DTB Overlays (.dtbo) are build from source files with the same > extension (.dts) as the base DTs (.dtb). This may become confusing and > even lead to wrong results. For example, a composite DTB (created from a > base DTB and a set of overlays) might have the same name as one of the > overlays that create it. > > Different files should be generated from differently named sources. > .dtb <-> .dts > .dtbo <-> .dtso > > We do not remove the ability to compile DTBO files from .dts files here, > only add a new rule allowing the .dtso file name. The current .dts named > overlays can be renamed with time. After all have been renamed we can > remove the other rule. > > Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Sun, Oct 23, 2022 at 8:24 PM Andrew Davis <afd@ti.com> wrote: > DTB files can be built into the kernel by converting them to assembly > files then assembling them into object files. We extend this here > for DTB overlays with the .dtso extensions. > > We change the start and end delimiting tag prefix to make it clear that > this data came from overlay files. > > [Based on patch by Frank Rowand <frank.rowand@sony.com>] > Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Sun, Oct 23, 2022 at 8:25 PM Andrew Davis <afd@ti.com> wrote: > From: Frank Rowand <frank.rowand@sony.com> > > In drivers/of/unittest-data/: > - Rename .dts overlay source files to use .dtso suffix. > > Modify driver/of/unitest.c to use .dtbo.o based symbols instead of .dtb.o > > Signed-off-by: Frank Rowand <frank.rowand@sony.com> > Signed-off-by: Andrew Davis <afd@ti.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Andrew, On Sun, Oct 23, 2022 at 8:24 PM Andrew Davis <afd@ti.com> wrote: > This is a series based on my patch here[0]. As suggested by Rob > I've resurrected Frank's patch and appended it to mine as a series. > > First patch here is my original patch, 3rd is Frank's patch but with > the unittest changes pulled out into the 2nd patch. That was re-worked > moving the source building macro into scripts/Makefile.lib. > > Patches 4, 5, and 6 are an attempt at renaming all the existing DTB > overlays. Split out by platform so they could be taken by platform > maintainers or if easier ACK'd here and taken all together. > > This should cover all the DTB overlays so we can remove the old .dts > rule for overlays and make .dtso the only supported way, let me know > if we want that this cycle and I can post that too. Thanks a lot for picking this up! Everything builds still fine, and the OF unit tests still run fine, so Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> BTW, you missed the Smarthome-Wolf Pi433 overlay[1] and its documentation[2] under drivers/staging/, but perhaps that was intentional, as it is not tied into the build system? [1] drivers/staging/pi433/Documentation/devicetree/pi433-overlay.dts [2] drivers/staging/pi433/Documentation/devicetree/pi433.txt Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On 10/24/22 7:28 AM, Geert Uytterhoeven wrote: > Hi Andrew, > > On Sun, Oct 23, 2022 at 8:24 PM Andrew Davis <afd@ti.com> wrote: >> This is a series based on my patch here[0]. As suggested by Rob >> I've resurrected Frank's patch and appended it to mine as a series. >> >> First patch here is my original patch, 3rd is Frank's patch but with >> the unittest changes pulled out into the 2nd patch. That was re-worked >> moving the source building macro into scripts/Makefile.lib. >> >> Patches 4, 5, and 6 are an attempt at renaming all the existing DTB >> overlays. Split out by platform so they could be taken by platform >> maintainers or if easier ACK'd here and taken all together. >> >> This should cover all the DTB overlays so we can remove the old .dts >> rule for overlays and make .dtso the only supported way, let me know >> if we want that this cycle and I can post that too. > > Thanks a lot for picking this up! > > Everything builds still fine, and the OF unit tests still run fine, so > Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> > > BTW, you missed the Smarthome-Wolf Pi433 overlay[1] and its > documentation[2] under drivers/staging/, but perhaps that was > intentional, as it is not tied into the build system? > Wasn't really sure about that one, but it seems simple enough to rename, will add a patch for that in v2. Will also fix the wording in the last 3 patches as suggested. Thanks, Andrew > [1] drivers/staging/pi433/Documentation/devicetree/pi433-overlay.dts > [2] drivers/staging/pi433/Documentation/devicetree/pi433.txt > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
Hello all, This is a series based on my patch here[0]. As suggested by Rob I've resurrected Frank's patch and appended it to mine as a series. First patch here is my original patch, 3rd is Frank's patch but with the unittest changes pulled out into the 2nd patch. That was re-worked moving the source building macro into scripts/Makefile.lib. Patches 4, 5, and 6 are an attempt at renaming all the existing DTB overlays. Split out by platform so they could be taken by platform maintainers or if easier ACK'd here and taken all together. This should cover all the DTB overlays so we can remove the old .dts rule for overlays and make .dtso the only supported way, let me know if we want that this cycle and I can post that too. Thanks, Andrew [0] https://www.spinics.net/lists/kernel/msg4548509.html Andrew Davis (5): kbuild: Allow DTB overlays to built from .dtso named source files kbuild: Allow DTB overlays to built into .dtso.S files arm64: dts: freescale: Rename DTB overlay source files from .dts to .dtso arm64: dts: renesas: Rename DTB overlay source files from .dts to .dtso arm64: dts: xilinx: Rename DTB overlay source files from .dts to .dtso Frank Rowand (1): of: overlay: rename overlay source files from .dts to .dtso ...qds-13bb.dts => fsl-ls1028a-qds-13bb.dtso} | 0 ...qds-65bb.dts => fsl-ls1028a-qds-65bb.dtso} | 0 ...qds-7777.dts => fsl-ls1028a-qds-7777.dtso} | 0 ...qds-85bb.dts => fsl-ls1028a-qds-85bb.dtso} | 0 ...qds-899b.dts => fsl-ls1028a-qds-899b.dtso} | 0 ...qds-9999.dts => fsl-ls1028a-qds-9999.dtso} | 0 ...ts => imx8mm-venice-gw72xx-0x-imx219.dtso} | 0 ...=> imx8mm-venice-gw72xx-0x-rs232-rts.dtso} | 0 ...dts => imx8mm-venice-gw72xx-0x-rs422.dtso} | 0 ...dts => imx8mm-venice-gw72xx-0x-rs485.dtso} | 0 ...ts => imx8mm-venice-gw73xx-0x-imx219.dtso} | 0 ...=> imx8mm-venice-gw73xx-0x-rs232-rts.dtso} | 0 ...dts => imx8mm-venice-gw73xx-0x-rs422.dtso} | 0 ...dts => imx8mm-venice-gw73xx-0x-rs485.dtso} | 0 ...2.dts => draak-ebisu-panel-aa104xd12.dtso} | 0 ...xd12.dts => salvator-panel-aa104xd12.dtso} | 0 ...v-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} | 0 ...v-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} | 0 drivers/of/unittest-data/Makefile | 66 +++++++++---------- .../{overlay.dts => overlay.dtso} | 0 .../{overlay_0.dts => overlay_0.dtso} | 0 .../{overlay_1.dts => overlay_1.dtso} | 0 .../{overlay_10.dts => overlay_10.dtso} | 0 .../{overlay_11.dts => overlay_11.dtso} | 0 .../{overlay_12.dts => overlay_12.dtso} | 0 .../{overlay_13.dts => overlay_13.dtso} | 0 .../{overlay_15.dts => overlay_15.dtso} | 0 .../{overlay_16.dts => overlay_16.dtso} | 0 .../{overlay_17.dts => overlay_17.dtso} | 0 .../{overlay_18.dts => overlay_18.dtso} | 0 .../{overlay_19.dts => overlay_19.dtso} | 0 .../{overlay_2.dts => overlay_2.dtso} | 0 .../{overlay_20.dts => overlay_20.dtso} | 0 .../{overlay_3.dts => overlay_3.dtso} | 0 .../{overlay_4.dts => overlay_4.dtso} | 0 .../{overlay_5.dts => overlay_5.dtso} | 0 .../{overlay_6.dts => overlay_6.dtso} | 0 .../{overlay_7.dts => overlay_7.dtso} | 0 .../{overlay_8.dts => overlay_8.dtso} | 0 .../{overlay_9.dts => overlay_9.dtso} | 0 ...node.dts => overlay_bad_add_dup_node.dtso} | 0 ...prop.dts => overlay_bad_add_dup_prop.dtso} | 0 ...d_phandle.dts => overlay_bad_phandle.dtso} | 0 ...bad_symbol.dts => overlay_bad_symbol.dtso} | 0 .../{overlay_base.dts => overlay_base.dtso} | 0 ...erlay_gpio_01.dts => overlay_gpio_01.dtso} | 0 ...lay_gpio_02a.dts => overlay_gpio_02a.dtso} | 0 ...lay_gpio_02b.dts => overlay_gpio_02b.dtso} | 0 ...erlay_gpio_03.dts => overlay_gpio_03.dtso} | 0 ...lay_gpio_04a.dts => overlay_gpio_04a.dtso} | 0 ...lay_gpio_04b.dts => overlay_gpio_04b.dtso} | 0 .../{testcases.dts => testcases.dtso} | 0 drivers/of/unittest.c | 48 +++++++------- scripts/Makefile.lib | 23 ++++++- 54 files changed, 79 insertions(+), 58 deletions(-) rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-13bb.dts => fsl-ls1028a-qds-13bb.dtso} (100%) rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-65bb.dts => fsl-ls1028a-qds-65bb.dtso} (100%) rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-7777.dts => fsl-ls1028a-qds-7777.dtso} (100%) rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-85bb.dts => fsl-ls1028a-qds-85bb.dtso} (100%) rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-899b.dts => fsl-ls1028a-qds-899b.dtso} (100%) rename arch/arm64/boot/dts/freescale/{fsl-ls1028a-qds-9999.dts => fsl-ls1028a-qds-9999.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-imx219.dts => imx8mm-venice-gw72xx-0x-imx219.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-rs232-rts.dts => imx8mm-venice-gw72xx-0x-rs232-rts.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-rs422.dts => imx8mm-venice-gw72xx-0x-rs422.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw72xx-0x-rs485.dts => imx8mm-venice-gw72xx-0x-rs485.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-imx219.dts => imx8mm-venice-gw73xx-0x-imx219.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-rs232-rts.dts => imx8mm-venice-gw73xx-0x-rs232-rts.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-rs422.dts => imx8mm-venice-gw73xx-0x-rs422.dtso} (100%) rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw73xx-0x-rs485.dts => imx8mm-venice-gw73xx-0x-rs485.dtso} (100%) rename arch/arm64/boot/dts/renesas/{draak-ebisu-panel-aa104xd12.dts => draak-ebisu-panel-aa104xd12.dtso} (100%) rename arch/arm64/boot/dts/renesas/{salvator-panel-aa104xd12.dts => salvator-panel-aa104xd12.dtso} (100%) rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} (100%) rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} (100%) rename drivers/of/unittest-data/{overlay.dts => overlay.dtso} (100%) rename drivers/of/unittest-data/{overlay_0.dts => overlay_0.dtso} (100%) rename drivers/of/unittest-data/{overlay_1.dts => overlay_1.dtso} (100%) rename drivers/of/unittest-data/{overlay_10.dts => overlay_10.dtso} (100%) rename drivers/of/unittest-data/{overlay_11.dts => overlay_11.dtso} (100%) rename drivers/of/unittest-data/{overlay_12.dts => overlay_12.dtso} (100%) rename drivers/of/unittest-data/{overlay_13.dts => overlay_13.dtso} (100%) rename drivers/of/unittest-data/{overlay_15.dts => overlay_15.dtso} (100%) rename drivers/of/unittest-data/{overlay_16.dts => overlay_16.dtso} (100%) rename drivers/of/unittest-data/{overlay_17.dts => overlay_17.dtso} (100%) rename drivers/of/unittest-data/{overlay_18.dts => overlay_18.dtso} (100%) rename drivers/of/unittest-data/{overlay_19.dts => overlay_19.dtso} (100%) rename drivers/of/unittest-data/{overlay_2.dts => overlay_2.dtso} (100%) rename drivers/of/unittest-data/{overlay_20.dts => overlay_20.dtso} (100%) rename drivers/of/unittest-data/{overlay_3.dts => overlay_3.dtso} (100%) rename drivers/of/unittest-data/{overlay_4.dts => overlay_4.dtso} (100%) rename drivers/of/unittest-data/{overlay_5.dts => overlay_5.dtso} (100%) rename drivers/of/unittest-data/{overlay_6.dts => overlay_6.dtso} (100%) rename drivers/of/unittest-data/{overlay_7.dts => overlay_7.dtso} (100%) rename drivers/of/unittest-data/{overlay_8.dts => overlay_8.dtso} (100%) rename drivers/of/unittest-data/{overlay_9.dts => overlay_9.dtso} (100%) rename drivers/of/unittest-data/{overlay_bad_add_dup_node.dts => overlay_bad_add_dup_node.dtso} (100%) rename drivers/of/unittest-data/{overlay_bad_add_dup_prop.dts => overlay_bad_add_dup_prop.dtso} (100%) rename drivers/of/unittest-data/{overlay_bad_phandle.dts => overlay_bad_phandle.dtso} (100%) rename drivers/of/unittest-data/{overlay_bad_symbol.dts => overlay_bad_symbol.dtso} (100%) rename drivers/of/unittest-data/{overlay_base.dts => overlay_base.dtso} (100%) rename drivers/of/unittest-data/{overlay_gpio_01.dts => overlay_gpio_01.dtso} (100%) rename drivers/of/unittest-data/{overlay_gpio_02a.dts => overlay_gpio_02a.dtso} (100%) rename drivers/of/unittest-data/{overlay_gpio_02b.dts => overlay_gpio_02b.dtso} (100%) rename drivers/of/unittest-data/{overlay_gpio_03.dts => overlay_gpio_03.dtso} (100%) rename drivers/of/unittest-data/{overlay_gpio_04a.dts => overlay_gpio_04a.dtso} (100%) rename drivers/of/unittest-data/{overlay_gpio_04b.dts => overlay_gpio_04b.dtso} (100%) rename drivers/of/unittest-data/{testcases.dts => testcases.dtso} (100%)