]> git.ipfire.org Git - thirdparty/u-boot.git/commit
ARM: dts: renesas: Stop using the -u-boot DTs for build
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Sun, 17 Mar 2024 06:23:38 +0000 (07:23 +0100)
committerMarek Vasut <marek.vasut+renesas@mailbox.org>
Thu, 18 Apr 2024 03:20:45 +0000 (05:20 +0200)
commit85f4b9114194fbf70960e34765bc788d45bddd4d
tree4c5d59b9d6b347caf8d7a4b92ab340b16ba64de9
parenta712a54dc427708195e6405af4b072d869d0dd8f
ARM: dts: renesas: Stop using the -u-boot DTs for build

The U-Boot build system can automatically paste -u-boot.dtsi at the
end of matching .dts during build. Stop emulating this behavior and
rename the -u-boot.dts files to -u-boot.dtsi, drop "#include...dts"
from those new u-boot.dtsi files, and update board configuration
accordingly.

The rename, '#include...dts` scrubbing and configuration update has
been done using the following script:
```
$ find . -name r[78]\*-u-boot.dts | sort -u | while read line ; do \
  git mv ${line%-u-boot.dts}-u-boot.dts ${line%-u-boot.dts}-u-boot.dtsi ; \
  done
$ sed -i '/^#include.*dts"/ d' `find . -name r[78]\*-u-boot.dtsi`
$ sed -i 's@-u-boot@@g' `git grep -li renesas configs`
```
The Salvator-X and ULCB board files have been updated manually.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Acked-by: Adam Ford <aford173@gmail.com>
55 files changed:
arch/arm/dts/Makefile
arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi [moved from arch/arm/dts/r7s72100-gr-peach-u-boot.dts with 97% similarity]
arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi [moved from arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts with 91% similarity]
arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi [moved from arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts with 91% similarity]
arch/arm/dts/r8a774c0-ek874-u-boot.dtsi [moved from arch/arm/dts/r8a774c0-ek874-u-boot.dts with 95% similarity]
arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi [moved from arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts with 91% similarity]
arch/arm/dts/r8a7790-lager-u-boot.dtsi [moved from arch/arm/dts/r8a7790-lager-u-boot.dts with 91% similarity]
arch/arm/dts/r8a7790-stout-u-boot.dtsi [moved from arch/arm/dts/r8a7790-stout-u-boot.dts with 91% similarity]
arch/arm/dts/r8a7791-koelsch-u-boot.dtsi [moved from arch/arm/dts/r8a7791-koelsch-u-boot.dts with 90% similarity]
arch/arm/dts/r8a7791-porter-u-boot.dtsi [moved from arch/arm/dts/r8a7791-porter-u-boot.dts with 92% similarity]
arch/arm/dts/r8a7792-blanche-u-boot.dtsi [moved from arch/arm/dts/r8a7792-blanche-u-boot.dts with 89% similarity]
arch/arm/dts/r8a7793-gose-u-boot.dtsi [moved from arch/arm/dts/r8a7793-gose-u-boot.dts with 91% similarity]
arch/arm/dts/r8a7794-alt-u-boot.dtsi [moved from arch/arm/dts/r8a7794-alt-u-boot.dts with 96% similarity]
arch/arm/dts/r8a7794-silk-u-boot.dtsi [moved from arch/arm/dts/r8a7794-silk-u-boot.dts with 91% similarity]
arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi [moved from arch/arm/dts/r8a77950-salvator-x-u-boot.dts with 96% similarity]
arch/arm/dts/r8a77950-ulcb-u-boot.dtsi [moved from arch/arm/dts/r8a77950-ulcb-u-boot.dts with 97% similarity]
arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi [moved from arch/arm/dts/r8a77960-salvator-x-u-boot.dts with 96% similarity]
arch/arm/dts/r8a77960-ulcb-u-boot.dtsi [moved from arch/arm/dts/r8a77960-ulcb-u-boot.dts with 97% similarity]
arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi [moved from arch/arm/dts/r8a77965-salvator-x-u-boot.dts with 96% similarity]
arch/arm/dts/r8a77965-ulcb-u-boot.dtsi [moved from arch/arm/dts/r8a77965-ulcb-u-boot.dts with 97% similarity]
arch/arm/dts/r8a77970-eagle-u-boot.dtsi [moved from arch/arm/dts/r8a77970-eagle-u-boot.dts with 96% similarity]
arch/arm/dts/r8a77970-v3msk-u-boot.dtsi [moved from arch/arm/dts/r8a77970-v3msk-u-boot.dts with 97% similarity]
arch/arm/dts/r8a77980-condor-u-boot.dtsi [moved from arch/arm/dts/r8a77980-condor-u-boot.dts with 96% similarity]
arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi [moved from arch/arm/dts/r8a77980-v3hsk-u-boot.dts with 95% similarity]
arch/arm/dts/r8a77990-ebisu-u-boot.dtsi [moved from arch/arm/dts/r8a77990-ebisu-u-boot.dts with 97% similarity]
arch/arm/dts/r8a77995-draak-u-boot.dtsi [moved from arch/arm/dts/r8a77995-draak-u-boot.dts with 94% similarity]
arch/arm/dts/r8a779a0-falcon-u-boot.dtsi [moved from arch/arm/dts/r8a779a0-falcon-u-boot.dts with 94% similarity]
arch/arm/dts/r8a779f0-spider-u-boot.dtsi [moved from arch/arm/dts/r8a779f0-spider-u-boot.dts with 95% similarity]
arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi [moved from arch/arm/dts/r8a779g0-white-hawk-u-boot.dts with 95% similarity]
arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi [moved from arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts with 95% similarity]
board/renesas/salvator-x/salvator-x.c
board/renesas/ulcb/ulcb.c
configs/alt_defconfig
configs/blanche_defconfig
configs/gose_defconfig
configs/grpeach_defconfig
configs/hihope_rzg2_defconfig
configs/koelsch_defconfig
configs/lager_defconfig
configs/porter_defconfig
configs/r8a77970_eagle_defconfig
configs/r8a77970_v3msk_defconfig
configs/r8a77980_condor_defconfig
configs/r8a77980_v3hsk_defconfig
configs/r8a77990_ebisu_defconfig
configs/r8a77995_draak_defconfig
configs/r8a779a0_falcon_defconfig
configs/r8a779f0_spider_defconfig
configs/r8a779g0_whitehawk_defconfig
configs/r8a779h0_grayhawk_defconfig
configs/rcar3_salvator-x_defconfig
configs/rcar3_ulcb_defconfig
configs/silinux_ek874_defconfig
configs/silk_defconfig
configs/stout_defconfig