From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Wed, 17 Apr 2024 11:48:41 +0000 (+0200)
Subject: sunxi: update image Makefile to reflect updated DTS structure in 6.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=82df12e98a0e972221389147c30f248eed52ddcf;p=openwrt%2Fstaging%2Fjow.git

sunxi: update image Makefile to reflect updated DTS structure in 6.6

For the ARM arch on 6.6, DTS files are moved into their vendor directories,
mimicking arm64. Reflect this in the image Makefile.

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
---

diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile
index cc1c1ba42d..d462880e90 100644
--- a/target/linux/sunxi/image/Makefile
+++ b/target/linux/sunxi/image/Makefile
@@ -34,7 +34,11 @@ define Device/Default
   KERNEL := kernel-bin | uImage none
   IMAGES := sdcard.img.gz
   IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip
+ifneq ($(LINUX_6_1),)
   SUNXI_DTS_DIR :=
+else
+  SUNXI_DTS_DIR :=allwinner/
+endif
   SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1)))
 endef