Re: [PATCH 4/4] ARM: dts: Move .dts files to vendor sub-directories
From: Neil Armstrong
Date: Fri May 05 2023 - 02:48:57 EST
On 05/05/2023 05:29, Rob Herring wrote:
The arm dts directory has grown to 1553 boards which makes it a bit
unwieldy to maintain and use. Past attempts stalled out due to plans to
move .dts files out of the kernel tree. Doing that is no longer planned
(any time soon at least), so let's go ahead and group .dts files by
vendors. This move aligns arm with arm64 .dts file structure.
Doing this enables building subsets of dts files by vendor easily
without changing kernel configs:
make allyesconfig
make arch/arm/boot/dts/ti/
There's no change to dtbs_install as the flat structure is maintained on
install.
The naming of vendor directories is roughly in this order of preference:
- Matching original and current SoC vendor prefix/name (e.g. ti, qcom)
- Current vendor prefix/name if still actively sold (SoCs which have
been aquired) (e.g. nxp/imx)
- Existing platform name for older platforms not sold/maintained by any
company (e.g. gemini, nspire)
The whole move was scripted with the exception of MAINTAINERS.
Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
---
MAINTAINERS | 181 +--
<snip>
arch/arm/boot/dts/amlogic/Makefile | 9 +
arch/arm/boot/dts/{ => amlogic}/meson.dtsi | 0
arch/arm/boot/dts/{ => amlogic}/meson6-atv1200.dts | 0
arch/arm/boot/dts/{ => amlogic}/meson6.dtsi | 0
.../boot/dts/{ => amlogic}/meson8-minix-neo-x8.dts | 0
arch/arm/boot/dts/{ => amlogic}/meson8.dtsi | 0
arch/arm/boot/dts/{ => amlogic}/meson8b-ec100.dts | 0
arch/arm/boot/dts/{ => amlogic}/meson8b-mxq.dts | 0
.../boot/dts/{ => amlogic}/meson8b-odroidc1.dts | 0
arch/arm/boot/dts/{ => amlogic}/meson8b.dtsi | 0
.../boot/dts/{ => amlogic}/meson8m2-mxiii-plus.dts | 0
arch/arm/boot/dts/{ => amlogic}/meson8m2.dtsi | 0
<snip>
@@ -1909,7 +1909,7 @@ L: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
L: linux-amlogic@xxxxxxxxxxxxxxxxxxx
S: Maintained
W: http://linux-meson.com/
-F: arch/arm/boot/dts/meson*
+F: arch/arm/boot/dts/amlogic/
F: arch/arm/mach-meson/
F: arch/arm64/boot/dts/amlogic/
F: drivers/mmc/host/meson*
<snip>
diff --git a/arch/arm/boot/dts/amlogic/Makefile b/arch/arm/boot/dts/amlogic/Makefile
new file mode 100644
index 000000000000..a84310780ea3
--- /dev/null
+++ b/arch/arm/boot/dts/amlogic/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+dtb-$(CONFIG_MACH_MESON6) += \
+ meson6-atv1200.dtb
+dtb-$(CONFIG_MACH_MESON8) += \
+ meson8-minix-neo-x8.dtb \
+ meson8b-ec100.dtb \
+ meson8b-mxq.dtb \
+ meson8b-odroidc1.dtb \
+ meson8m2-mxiii-plus.dtb
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/amlogic/meson.dtsi
similarity index 100%
rename from arch/arm/boot/dts/meson.dtsi
rename to arch/arm/boot/dts/amlogic/meson.dtsi
diff --git a/arch/arm/boot/dts/meson6-atv1200.dts b/arch/arm/boot/dts/amlogic/meson6-atv1200.dts
similarity index 100%
rename from arch/arm/boot/dts/meson6-atv1200.dts
rename to arch/arm/boot/dts/amlogic/meson6-atv1200.dts
diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/amlogic/meson6.dtsi
similarity index 100%
rename from arch/arm/boot/dts/meson6.dtsi
rename to arch/arm/boot/dts/amlogic/meson6.dtsi
diff --git a/arch/arm/boot/dts/meson8-minix-neo-x8.dts b/arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts
similarity index 100%
rename from arch/arm/boot/dts/meson8-minix-neo-x8.dts
rename to arch/arm/boot/dts/amlogic/meson8-minix-neo-x8.dts
diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
similarity index 100%
rename from arch/arm/boot/dts/meson8.dtsi
rename to arch/arm/boot/dts/amlogic/meson8.dtsi
diff --git a/arch/arm/boot/dts/meson8b-ec100.dts b/arch/arm/boot/dts/amlogic/meson8b-ec100.dts
similarity index 100%
rename from arch/arm/boot/dts/meson8b-ec100.dts
rename to arch/arm/boot/dts/amlogic/meson8b-ec100.dts
diff --git a/arch/arm/boot/dts/meson8b-mxq.dts b/arch/arm/boot/dts/amlogic/meson8b-mxq.dts
similarity index 100%
rename from arch/arm/boot/dts/meson8b-mxq.dts
rename to arch/arm/boot/dts/amlogic/meson8b-mxq.dts
diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
similarity index 100%
rename from arch/arm/boot/dts/meson8b-odroidc1.dts
rename to arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi
similarity index 100%
rename from arch/arm/boot/dts/meson8b.dtsi
rename to arch/arm/boot/dts/amlogic/meson8b.dtsi
diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts
similarity index 100%
rename from arch/arm/boot/dts/meson8m2-mxiii-plus.dts
rename to arch/arm/boot/dts/amlogic/meson8m2-mxiii-plus.dts
diff --git a/arch/arm/boot/dts/meson8m2.dtsi b/arch/arm/boot/dts/amlogic/meson8m2.dtsi
similarity index 100%
rename from arch/arm/boot/dts/meson8m2.dtsi
rename to arch/arm/boot/dts/amlogic/meson8m2.dtsi
<snip>
Acked-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>