From: Lu jicong <jiconglu58@gmail.com>
Date: Tue, 2 Jul 2024 13:01:49 +0000 (+0800)
Subject: target.mk: fix arm architecture level detection
X-Git-Tag: v6.1-20240716~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0e257047e39c61fd3333358290fee237eb72ff58;p=librecmc%2Flibrecmc.git

target.mk: fix arm architecture level detection

Now kernel configs of armv6k CPUs don't include CONFIG_CPU_V6.
So armv6k CPUs cannot be detected as arm_v6.
Fix this by adding detection for CONFIG_CPU_V6K.

Signed-off-by: Lu jicong <jiconglu58@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/15855
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit d55083fbcaea9cdd2ebc10a2d38989ad485a5357)
---

diff --git a/include/target.mk b/include/target.mk
index 04fc92fe52..80c5e181b9 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -316,7 +316,15 @@ ifeq ($(DUMP),1)
     ifneq ($(CONFIG_CPU_MIPS32_R2),)
       FEATURES += mips16
     endif
-    FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))
+    ifneq ($(CONFIG_CPU_V6),)
+      FEATURES += arm_v6
+    endif
+    ifneq ($(CONFIG_CPU_V6K),)
+      FEATURES += arm_v6
+    endif
+    ifneq ($(CONFIG_CPU_V7),)
+      FEATURES += arm_v7
+    endif
 
     # remove duplicates
     FEATURES:=$(sort $(FEATURES))