From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Fri, 26 Apr 2024 09:06:17 +0000 (+0200)
Subject: sunxi: update the 6.6 DTS_DIR hack
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e9f0e5be49757c95ca224e549655f5f67f3f9ec;p=openwrt%2Fstaging%2Fldir.git

sunxi: update the 6.6 DTS_DIR hack

Update and simplify the 6.1 vs. 6.6 DTS_DIR hack until 6.1 support is gone.

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

diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile
index d462880e90..fc1359d173 100644
--- a/target/linux/sunxi/image/Makefile
+++ b/target/linux/sunxi/image/Makefile
@@ -34,9 +34,7 @@ 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
+ifdef CONFIG_LINUX_6_6
   SUNXI_DTS_DIR :=allwinner/
 endif
   SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1)))