[openwrt/openwrt] kirkwood: split files into 6.1 and 6.6 version

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/3b5b3d89ed075214d4eb3f47ea372261a3cdad27

commit 3b5b3d89ed075214d4eb3f47ea372261a3cdad27
Author: Pawel Dembicki <paweldembicki at gmail.com>
AuthorDate: Fri Mar 15 11:54:41 2024 +0100

    kirkwood: split files into 6.1 and 6.6 version
    
    Upstream change location of kirkwood dts files.
    Split downstream files location for better upstream follow.
    
    Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com>
---
 .../{files => files-6.1}/arch/arm/boot/dts/kirkwood-e4200-v2.dts       | 0
 .../{files => files-6.1}/arch/arm/boot/dts/kirkwood-ea3500.dts         | 0
 .../{files => files-6.1}/arch/arm/boot/dts/kirkwood-ea4500.dts         | 0
 .../{files => files-6.1}/arch/arm/boot/dts/kirkwood-goflexhome.dts     | 0
 .../{files => files-6.1}/arch/arm/boot/dts/kirkwood-ix4-200d.dts       | 0
 .../kirkwood/{files => files-6.1}/arch/arm/boot/dts/kirkwood-nas1.dts  | 0
 .../{files => files-6.1}/arch/arm/boot/dts/kirkwood-nsa310b.dts        | 0
 .../kirkwood/{files => files-6.1}/arch/arm/boot/dts/kirkwood-on100.dts | 0
 .../kirkwood/{files => files-6.1}/arch/arm/boot/dts/kirkwood-stora.dts | 0
 .../dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-e4200-v2.dts  | 0
 .../dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-ea3500.dts    | 0
 .../dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-ea4500.dts    | 0
 .../arch/arm/boot/dts/marvell}/kirkwood-goflexhome.dts                 | 0
 .../dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-ix4-200d.dts  | 0
 .../boot/dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-nas1.dts | 0
 .../dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-nsa310b.dts   | 0
 .../dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-on100.dts     | 0
 .../dts => files-6.6/arch/arm/boot/dts/marvell}/kirkwood-stora.dts     | 0
 target/linux/kirkwood/image/Makefile                                   | 3 +++
 19 files changed, 3 insertions(+)

diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-e4200-v2.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-e4200-v2.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-e4200-v2.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-e4200-v2.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-ea3500.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-ea3500.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea4500.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-ea4500.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea4500.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-ea4500.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-goflexhome.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-goflexhome.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-goflexhome.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-goflexhome.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ix4-200d.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-ix4-200d.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ix4-200d.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-ix4-200d.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nas1.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nas1.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nas1.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nas1.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310b.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nsa310b.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310b.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-nsa310b.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-on100.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-on100.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-on100.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-on100.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-stora.dts b/target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-stora.dts
similarity index 100%
copy from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-stora.dts
copy to target/linux/kirkwood/files-6.1/arch/arm/boot/dts/kirkwood-stora.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-e4200-v2.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-e4200-v2.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-e4200-v2.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-e4200-v2.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-ea3500.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-ea3500.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea4500.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-ea4500.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea4500.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-ea4500.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-goflexhome.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-goflexhome.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-goflexhome.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-goflexhome.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ix4-200d.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-ix4-200d.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ix4-200d.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-ix4-200d.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nas1.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nas1.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nas1.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nas1.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310b.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nsa310b.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310b.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-nsa310b.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-on100.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-on100.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-on100.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-on100.dts
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-stora.dts b/target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-stora.dts
similarity index 100%
rename from target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-stora.dts
rename to target/linux/kirkwood/files-6.6/arch/arm/boot/dts/marvell/kirkwood-stora.dts
diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 8aa2d69720..cc13648890 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -112,6 +112,9 @@ endef
 
 define Device/Default
   PROFILES := Default
+ifdef CONFIG_LINUX_6_6
+  DEVICE_DTS_DIR := $(DTS_DIR)/marvell
+endif
   DEVICE_DTS = kirkwood-$(lastword $(subst _, ,$(1)))
   KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
   KERNEL := kernel-bin | append-dtb | uImage none