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>
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 08dfbdd..2da5edd 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1056,41 +1056,41 @@
imxrt1170-evk.dtb \
dtb-$(CONFIG_RCAR_GEN2) += \
- r8a7790-lager-u-boot.dtb \
- r8a7790-stout-u-boot.dtb \
- r8a7791-koelsch-u-boot.dtb \
- r8a7791-porter-u-boot.dtb \
- r8a7792-blanche-u-boot.dtb \
- r8a7793-gose-u-boot.dtb \
- r8a7794-alt-u-boot.dtb \
- r8a7794-silk-u-boot.dtb
+ r8a7790-lager.dtb \
+ r8a7790-stout.dtb \
+ r8a7791-koelsch.dtb \
+ r8a7791-porter.dtb \
+ r8a7792-blanche.dtb \
+ r8a7793-gose.dtb \
+ r8a7794-alt.dtb \
+ r8a7794-silk.dtb
dtb-$(CONFIG_RCAR_GEN3) += \
r8a774a1-beacon-rzg2m-kit.dtb \
r8a774b1-beacon-rzg2n-kit.dtb \
r8a774e1-beacon-rzg2h-kit.dtb \
- r8a774a1-hihope-rzg2m-u-boot.dtb \
- r8a774b1-hihope-rzg2n-u-boot.dtb \
- r8a774c0-ek874-u-boot.dtb \
- r8a774e1-hihope-rzg2h-u-boot.dtb \
- r8a77950-ulcb-u-boot.dtb \
- r8a77950-salvator-x-u-boot.dtb \
- r8a77960-ulcb-u-boot.dtb \
- r8a77960-salvator-x-u-boot.dtb \
- r8a77965-ulcb-u-boot.dtb \
- r8a77965-salvator-x-u-boot.dtb \
- r8a77970-eagle-u-boot.dtb \
- r8a77970-v3msk-u-boot.dtb \
- r8a77980-condor-u-boot.dtb \
- r8a77980-v3hsk-u-boot.dtb \
- r8a77990-ebisu-u-boot.dtb \
- r8a77995-draak-u-boot.dtb
+ r8a774a1-hihope-rzg2m.dtb \
+ r8a774b1-hihope-rzg2n.dtb \
+ r8a774c0-ek874.dtb \
+ r8a774e1-hihope-rzg2h.dtb \
+ r8a77950-ulcb.dtb \
+ r8a77950-salvator-x.dtb \
+ r8a77960-ulcb.dtb \
+ r8a77960-salvator-x.dtb \
+ r8a77965-ulcb.dtb \
+ r8a77965-salvator-x.dtb \
+ r8a77970-eagle.dtb \
+ r8a77970-v3msk.dtb \
+ r8a77980-condor.dtb \
+ r8a77980-v3hsk.dtb \
+ r8a77990-ebisu.dtb \
+ r8a77995-draak.dtb
dtb-$(CONFIG_RCAR_GEN4) += \
- r8a779a0-falcon-u-boot.dtb \
- r8a779f0-spider-u-boot.dtb \
- r8a779g0-white-hawk-u-boot.dtb \
- r8a779h0-gray-hawk-u-boot.dtb
+ r8a779a0-falcon.dtb \
+ r8a779f0-spider.dtb \
+ r8a779g0-white-hawk.dtb \
+ r8a779h0-gray-hawk.dtb
dtb-$(CONFIG_TARGET_RZG2L) += \
r9a07g044l2-smarc.dts
@@ -1100,7 +1100,7 @@
endif
dtb-$(CONFIG_RZA1) += \
- r7s72100-gr-peach-u-boot.dtb
+ r7s72100-gr-peach.dtb
dtb-$(CONFIG_ARCH_KEYSTONE) += keystone-k2hk-evm.dtb \
keystone-k2l-evm.dtb \
diff --git a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts b/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi
similarity index 97%
rename from arch/arm/dts/r7s72100-gr-peach-u-boot.dts
rename to arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi
index 0ae9f91..34fba29 100644
--- a/arch/arm/dts/r7s72100-gr-peach-u-boot.dts
+++ b/arch/arm/dts/r7s72100-gr-peach-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2019 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r7s72100-gr-peach.dts"
/ {
aliases {
diff --git a/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts b/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi
similarity index 91%
rename from arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts
rename to arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi
index b735e97..3ad619b 100644
--- a/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts
+++ b/arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2021 Renesas Electronics Corporation
*/
-#include "r8a774a1-hihope-rzg2m-ex.dts"
#include "r8a774a1-u-boot.dtsi"
&gpio3 {
diff --git a/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts b/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi
similarity index 91%
rename from arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts
rename to arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi
index 0bdc690..6f2f6c7 100644
--- a/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dts
+++ b/arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2021 Renesas Electronics Corp.
*/
-#include "r8a774b1-hihope-rzg2n-ex.dts"
#include "r8a774b1-u-boot.dtsi"
&gpio3 {
diff --git a/arch/arm/dts/r8a774c0-ek874-u-boot.dts b/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi
similarity index 94%
rename from arch/arm/dts/r8a774c0-ek874-u-boot.dts
rename to arch/arm/dts/r8a774c0-ek874-u-boot.dtsi
index 8fa6d80..dcdddd9 100644
--- a/arch/arm/dts/r8a774c0-ek874-u-boot.dts
+++ b/arch/arm/dts/r8a774c0-ek874-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2021 Renesas Electronisc Corporation
*/
-#include "r8a774c0-ek874.dts"
#include "r8a774c0-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts b/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi
similarity index 91%
rename from arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts
rename to arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi
index 03a17ba..8e57e03 100644
--- a/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dts
+++ b/arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2020 Renesas Electronics Corp.
*/
-#include "r8a774e1-hihope-rzg2h-ex.dts"
#include "r8a774e1-u-boot.dtsi"
&gpio3 {
diff --git a/arch/arm/dts/r8a7790-lager-u-boot.dts b/arch/arm/dts/r8a7790-lager-u-boot.dtsi
similarity index 90%
rename from arch/arm/dts/r8a7790-lager-u-boot.dts
rename to arch/arm/dts/r8a7790-lager-u-boot.dtsi
index 28b8b60..ed18917 100644
--- a/arch/arm/dts/r8a7790-lager-u-boot.dts
+++ b/arch/arm/dts/r8a7790-lager-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7790-lager.dts"
#include "r8a7790-u-boot.dtsi"
&scif0 {
diff --git a/arch/arm/dts/r8a7790-stout-u-boot.dts b/arch/arm/dts/r8a7790-stout-u-boot.dtsi
similarity index 90%
rename from arch/arm/dts/r8a7790-stout-u-boot.dts
rename to arch/arm/dts/r8a7790-stout-u-boot.dtsi
index 85bcb78..3b39304 100644
--- a/arch/arm/dts/r8a7790-stout-u-boot.dts
+++ b/arch/arm/dts/r8a7790-stout-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7790-stout.dts"
#include "r8a7790-u-boot.dtsi"
&scifa0 {
diff --git a/arch/arm/dts/r8a7791-koelsch-u-boot.dts b/arch/arm/dts/r8a7791-koelsch-u-boot.dtsi
similarity index 90%
rename from arch/arm/dts/r8a7791-koelsch-u-boot.dts
rename to arch/arm/dts/r8a7791-koelsch-u-boot.dtsi
index c5a1332..541c419 100644
--- a/arch/arm/dts/r8a7791-koelsch-u-boot.dts
+++ b/arch/arm/dts/r8a7791-koelsch-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7791-koelsch.dts"
#include "r8a7791-u-boot.dtsi"
&scif0 {
diff --git a/arch/arm/dts/r8a7791-porter-u-boot.dts b/arch/arm/dts/r8a7791-porter-u-boot.dtsi
similarity index 91%
rename from arch/arm/dts/r8a7791-porter-u-boot.dts
rename to arch/arm/dts/r8a7791-porter-u-boot.dtsi
index bfec1fc..cbf2c52 100644
--- a/arch/arm/dts/r8a7791-porter-u-boot.dts
+++ b/arch/arm/dts/r8a7791-porter-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7791-porter.dts"
#include "r8a7791-u-boot.dtsi"
&scif0 {
diff --git a/arch/arm/dts/r8a7792-blanche-u-boot.dts b/arch/arm/dts/r8a7792-blanche-u-boot.dtsi
similarity index 88%
rename from arch/arm/dts/r8a7792-blanche-u-boot.dts
rename to arch/arm/dts/r8a7792-blanche-u-boot.dtsi
index 1f33df8..8c36a3e 100644
--- a/arch/arm/dts/r8a7792-blanche-u-boot.dts
+++ b/arch/arm/dts/r8a7792-blanche-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7792-blanche.dts"
#include "r8a7792-u-boot.dtsi"
&iic3 {
diff --git a/arch/arm/dts/r8a7793-gose-u-boot.dts b/arch/arm/dts/r8a7793-gose-u-boot.dtsi
similarity index 91%
rename from arch/arm/dts/r8a7793-gose-u-boot.dts
rename to arch/arm/dts/r8a7793-gose-u-boot.dtsi
index dd0932c..41c4361 100644
--- a/arch/arm/dts/r8a7793-gose-u-boot.dts
+++ b/arch/arm/dts/r8a7793-gose-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7793-gose.dts"
#include "r8a7793-u-boot.dtsi"
&scif0 {
diff --git a/arch/arm/dts/r8a7794-alt-u-boot.dts b/arch/arm/dts/r8a7794-alt-u-boot.dtsi
similarity index 95%
rename from arch/arm/dts/r8a7794-alt-u-boot.dts
rename to arch/arm/dts/r8a7794-alt-u-boot.dtsi
index 0a39039..e156b4c 100644
--- a/arch/arm/dts/r8a7794-alt-u-boot.dts
+++ b/arch/arm/dts/r8a7794-alt-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7794-alt.dts"
#include "r8a7794-u-boot.dtsi"
&i2c7 {
diff --git a/arch/arm/dts/r8a7794-silk-u-boot.dts b/arch/arm/dts/r8a7794-silk-u-boot.dtsi
similarity index 91%
rename from arch/arm/dts/r8a7794-silk-u-boot.dts
rename to arch/arm/dts/r8a7794-silk-u-boot.dtsi
index 3fcb535..e448ea7 100644
--- a/arch/arm/dts/r8a7794-silk-u-boot.dts
+++ b/arch/arm/dts/r8a7794-silk-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a7794-silk.dts"
#include "r8a7794-u-boot.dtsi"
&scif2 {
diff --git a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts b/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi
similarity index 95%
rename from arch/arm/dts/r8a77950-salvator-x-u-boot.dts
rename to arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi
index ba7cf52..23f1254 100644
--- a/arch/arm/dts/r8a77950-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77950-salvator-x.dts"
#include "r8a77950-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77950-ulcb-u-boot.dts b/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi
similarity index 96%
rename from arch/arm/dts/r8a77950-ulcb-u-boot.dts
rename to arch/arm/dts/r8a77950-ulcb-u-boot.dtsi
index e371cde..c65c2e6 100644
--- a/arch/arm/dts/r8a77950-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77950-ulcb-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77950-ulcb.dts"
#include "r8a77950-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
similarity index 95%
rename from arch/arm/dts/r8a77960-salvator-x-u-boot.dts
rename to arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
index 2a9f0aa..84a28bf 100644
--- a/arch/arm/dts/r8a77960-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77960-salvator-x-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77960-salvator-x.dts"
#include "r8a77960-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77960-ulcb-u-boot.dts b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
similarity index 96%
rename from arch/arm/dts/r8a77960-ulcb-u-boot.dts
rename to arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
index 79042b2..6372f95 100644
--- a/arch/arm/dts/r8a77960-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77960-ulcb-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77960-ulcb.dts"
#include "r8a77960-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
similarity index 95%
rename from arch/arm/dts/r8a77965-salvator-x-u-boot.dts
rename to arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
index e5421f9..d9a28fe 100644
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77965-salvator-x.dts"
#include "r8a77965-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77965-ulcb-u-boot.dts b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
similarity index 96%
rename from arch/arm/dts/r8a77965-ulcb-u-boot.dts
rename to arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
index 969911d..aa5de3d 100644
--- a/arch/arm/dts/r8a77965-ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a77965-ulcb-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77965-ulcb.dts"
#include "r8a77965-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77970-eagle-u-boot.dts b/arch/arm/dts/r8a77970-eagle-u-boot.dtsi
similarity index 96%
rename from arch/arm/dts/r8a77970-eagle-u-boot.dts
rename to arch/arm/dts/r8a77970-eagle-u-boot.dtsi
index eb868ed..c7971b9 100644
--- a/arch/arm/dts/r8a77970-eagle-u-boot.dts
+++ b/arch/arm/dts/r8a77970-eagle-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77970-eagle.dts"
#include "r8a77970-u-boot.dtsi"
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/dts/r8a77970-v3msk-u-boot.dts b/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi
similarity index 96%
rename from arch/arm/dts/r8a77970-v3msk-u-boot.dts
rename to arch/arm/dts/r8a77970-v3msk-u-boot.dtsi
index 6ee06d7..c7b2e07 100644
--- a/arch/arm/dts/r8a77970-v3msk-u-boot.dts
+++ b/arch/arm/dts/r8a77970-v3msk-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2019 Cogent Embedded, Inc.
*/
-#include "r8a77970-v3msk.dts"
#include "r8a77970-u-boot.dtsi"
#include <dt-bindings/gpio/gpio.h>
diff --git a/arch/arm/dts/r8a77980-condor-u-boot.dts b/arch/arm/dts/r8a77980-condor-u-boot.dtsi
similarity index 96%
rename from arch/arm/dts/r8a77980-condor-u-boot.dts
rename to arch/arm/dts/r8a77980-condor-u-boot.dtsi
index f4a3b43..34a735a 100644
--- a/arch/arm/dts/r8a77980-condor-u-boot.dts
+++ b/arch/arm/dts/r8a77980-condor-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2019 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77980-condor.dts"
#include "r8a77980-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77980-v3hsk-u-boot.dts b/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi
similarity index 95%
rename from arch/arm/dts/r8a77980-v3hsk-u-boot.dts
rename to arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi
index d083df6..2901d0e 100644
--- a/arch/arm/dts/r8a77980-v3hsk-u-boot.dts
+++ b/arch/arm/dts/r8a77980-v3hsk-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2019 Cogent Embedded, Inc.
*/
-#include "r8a77980-v3hsk.dts"
#include "r8a77980-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
similarity index 96%
rename from arch/arm/dts/r8a77990-ebisu-u-boot.dts
rename to arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
index fc1c4a7..b6b7b8f 100644
--- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts
+++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77990-ebisu.dts"
#include "r8a77990-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a77995-draak-u-boot.dts b/arch/arm/dts/r8a77995-draak-u-boot.dtsi
similarity index 94%
rename from arch/arm/dts/r8a77995-draak-u-boot.dts
rename to arch/arm/dts/r8a77995-draak-u-boot.dtsi
index 41ceae1..1922c40 100644
--- a/arch/arm/dts/r8a77995-draak-u-boot.dts
+++ b/arch/arm/dts/r8a77995-draak-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
-#include "r8a77995-draak.dts"
#include "r8a77995-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a779a0-falcon-u-boot.dts b/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi
similarity index 93%
rename from arch/arm/dts/r8a779a0-falcon-u-boot.dts
rename to arch/arm/dts/r8a779a0-falcon-u-boot.dtsi
index 9d28791..3b8a017 100644
--- a/arch/arm/dts/r8a779a0-falcon-u-boot.dts
+++ b/arch/arm/dts/r8a779a0-falcon-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2020 Renesas Electronics Corp.
*/
-#include "r8a779a0-falcon.dts"
#include "r8a779a0-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a779f0-spider-u-boot.dts b/arch/arm/dts/r8a779f0-spider-u-boot.dtsi
similarity index 95%
rename from arch/arm/dts/r8a779f0-spider-u-boot.dts
rename to arch/arm/dts/r8a779f0-spider-u-boot.dtsi
index 26fc8bc..2fc7e77 100644
--- a/arch/arm/dts/r8a779f0-spider-u-boot.dts
+++ b/arch/arm/dts/r8a779f0-spider-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2021 Renesas Electronics Corp.
*/
-#include "r8a779f0-spider.dts"
#include "r8a779f0-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
similarity index 94%
rename from arch/arm/dts/r8a779g0-white-hawk-u-boot.dts
rename to arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
index bd75603..a102639 100644
--- a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dts
+++ b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2021 Renesas Electronics Corp.
*/
-#include "r8a779g0-white-hawk.dts"
#include "r8a779g0-u-boot.dtsi"
/ {
diff --git a/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts b/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi
similarity index 94%
rename from arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts
rename to arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi
index 935ba94..92c1315 100644
--- a/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dts
+++ b/arch/arm/dts/r8a779h0-gray-hawk-u-boot.dtsi
@@ -5,7 +5,6 @@
* Copyright (C) 2023 Renesas Electronics Corp.
*/
-#include "r8a779h0-gray-hawk.dts"
#include "r8a779h0-u-boot.dtsi"
/ {