ipq806x: move Device DTS to dedicated DTS directory

Align the ipq806x target to the pattern already used on other devices where
the device DTS are placed in a dedicated directory separate from the files
directory.

This, while trying to enforce a common pattern for every target, also permits to
do modification to device DTS without having to trigger a recompilation of the
entire kernel (as the files directory is not touched)

Link: https://github.com/openwrt/openwrt/pull/22039
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts b/target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8062-wg2600hp3.dts
rename to target/linux/ipq806x/dts/qcom-ipq8062-wg2600hp3.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi b/target/linux/ipq806x/dts/qcom-ipq8064-ad7200-c2600.dtsi
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200-c2600.dtsi
rename to target/linux/ipq806x/dts/qcom-ipq8064-ad7200-c2600.dtsi

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200.dts b/target/linux/ipq806x/dts/qcom-ipq8064-ad7200.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ad7200.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-ad7200.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/dts/qcom-ipq8064-ap148.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-ap148.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/dts/qcom-ipq8064-ap161.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ap161.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-ap161.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-asus-onhub.dts b/target/linux/ipq806x/dts/qcom-ipq8064-asus-onhub.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-asus-onhub.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-asus-onhub.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/dts/qcom-ipq8064-c2600.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-c2600.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-c2600.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/dts/qcom-ipq8064-d7800.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-d7800.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-d7800.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-db149.dts b/target/linux/ipq806x/dts/qcom-ipq8064-db149.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-db149.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-db149.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-e8350-v1.dts b/target/linux/ipq806x/dts/qcom-ipq8064-e8350-v1.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-e8350-v1.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-e8350-v1.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ea7500-v1.dts b/target/linux/ipq806x/dts/qcom-ipq8064-ea7500-v1.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ea7500-v1.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-ea7500-v1.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ea8500.dts b/target/linux/ipq806x/dts/qcom-ipq8064-ea8500.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-ea8500.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-ea8500.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi b/target/linux/ipq806x/dts/qcom-ipq8064-eax500.dtsi
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-eax500.dtsi
rename to target/linux/ipq806x/dts/qcom-ipq8064-eax500.dtsi

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts b/target/linux/ipq806x/dts/qcom-ipq8064-fap-421e.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-fap-421e.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-fap-421e.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts b/target/linux/ipq806x/dts/qcom-ipq8064-g10.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-g10.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-g10.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi b/target/linux/ipq806x/dts/qcom-ipq8064-onhub.dtsi
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-onhub.dtsi
rename to target/linux/ipq806x/dts/qcom-ipq8064-onhub.dtsi

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/dts/qcom-ipq8064-r7500.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-r7500.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/dts/qcom-ipq8064-r7500v2.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-r7500v2.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-r7500v2.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-tplink-onhub.dts b/target/linux/ipq806x/dts/qcom-ipq8064-tplink-onhub.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-tplink-onhub.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-tplink-onhub.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts b/target/linux/ipq806x/dts/qcom-ipq8064-unifi-ac-hd.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-unifi-ac-hd.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-unifi-ac-hd.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/dts/qcom-ipq8064-vr2600v.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-vr2600v.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-vr2600v.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/dts/qcom-ipq8064-wg2600hp.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wg2600hp.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-wg2600hp.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/dts/qcom-ipq8064-wpq864.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wpq864.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-wpq864.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/dts/qcom-ipq8064-wxr-2533dhp.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8064-wxr-2533dhp.dts
rename to target/linux/ipq806x/dts/qcom-ipq8064-wxr-2533dhp.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts b/target/linux/ipq806x/dts/qcom-ipq8065-ac400i.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-ac400i.dts
rename to target/linux/ipq806x/dts/qcom-ipq8065-ac400i.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/dts/qcom-ipq8065-nbg6817.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nbg6817.dts
rename to target/linux/ipq806x/dts/qcom-ipq8065-nbg6817.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi b/target/linux/ipq806x/dts/qcom-ipq8065-nighthawk.dtsi
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-nighthawk.dtsi
rename to target/linux/ipq806x/dts/qcom-ipq8065-nighthawk.dtsi

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/dts/qcom-ipq8065-r7800.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-r7800.dts
rename to target/linux/ipq806x/dts/qcom-ipq8065-r7800.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/dts/qcom-ipq8065-rt4230w-rev6.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-rt4230w-rev6.dts
rename to target/linux/ipq806x/dts/qcom-ipq8065-rt4230w-rev6.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/dts/qcom-ipq8065-tr4400-v2.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
rename to target/linux/ipq806x/dts/qcom-ipq8065-tr4400-v2.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-xr450.dts b/target/linux/ipq806x/dts/qcom-ipq8065-xr450.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-xr450.dts
rename to target/linux/ipq806x/dts/qcom-ipq8065-xr450.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-xr500.dts b/target/linux/ipq806x/dts/qcom-ipq8065-xr500.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8065-xr500.dts
rename to target/linux/ipq806x/dts/qcom-ipq8065-xr500.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts b/target/linux/ipq806x/dts/qcom-ipq8068-ap3935.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ap3935.dts
rename to target/linux/ipq806x/dts/qcom-ipq8068-ap3935.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi b/target/linux/ipq806x/dts/qcom-ipq8068-cryptid-common.dtsi
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi
rename to target/linux/ipq806x/dts/qcom-ipq8068-cryptid-common.dtsi

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/dts/qcom-ipq8068-ecw5410.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ecw5410.dts
rename to target/linux/ipq806x/dts/qcom-ipq8068-ecw5410.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-mr42.dts b/target/linux/ipq806x/dts/qcom-ipq8068-mr42.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-mr42.dts
rename to target/linux/ipq806x/dts/qcom-ipq8068-mr42.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-mr52.dts b/target/linux/ipq806x/dts/qcom-ipq8068-mr52.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-mr52.dts
rename to target/linux/ipq806x/dts/qcom-ipq8068-mr52.dts

diff --git a/target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts b/target/linux/ipq806x/dts/qcom-ipq8068-ss-w2-ac2600.dts
similarity index 100%
rename from target/linux/ipq806x/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq8068-ss-w2-ac2600.dts
rename to target/linux/ipq806x/dts/qcom-ipq8068-ss-w2-ac2600.dts

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index b616fecfbb73612a225c0130695a8a001a9040d4..834d4d6fac644a90179c119568fa523db93766e7 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -6,7 +6,7 @@ include $(INCLUDE_DIR)/image.mk
 define Device/Default
        PROFILES := Default
        KERNEL_LOADADDR = 0x42208000
-       DEVICE_DTS_DIR = $$(DTS_DIR)/qcom
+       DEVICE_DTS_DIR = ../dts
        DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
        DEVICE_DTS_CONFIG := config@1
        IMAGES := sysupgrade.bin

diff --git a/target/linux/ipq806x/image/chromium.mk b/target/linux/ipq806x/image/chromium.mk
index 637f17a94acade184cb701ecbf18810079759112..563bc70e3365a4fda65451e1c8791fa4795b30c6 100644 (file)
--- a/target/linux/ipq806x/image/chromium.mk
+++ b/target/linux/ipq806x/image/chromium.mk
@@ -1,3 +1,5 @@
+DTS_DIR := $(DTS_DIR)/qcom
+
 define Device/dsa-migration
   DEVICE_COMPAT_VERSION := 1.1
   DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA

diff --git a/target/linux/ipq806x/image/generic.mk b/target/linux/ipq806x/image/generic.mk
index b7608019f068305cd2efc198c7bb65c66e036bd8..7d0299bc9f679f11645422db37952308a1cc4e1f 100644 (file)
--- a/target/linux/ipq806x/image/generic.mk
+++ b/target/linux/ipq806x/image/generic.mk
@@ -1,3 +1,4 @@
+DTS_DIR := $(DTS_DIR)/qcom
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 DEVICE_VARS += TPLINK_BOARD_ID