summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLu jicong2024-07-02 13:01:49 +0000
committerChristian Marangi2024-07-03 11:09:47 +0000
commitd55083fbcaea9cdd2ebc10a2d38989ad485a5357 (patch)
treeb6b49cc2bdf21146a8741b1c911bb5bd529ff8c7
parentc27fd6fd97d06c0630c67ef1f57d2eaf4dafa09f (diff)
downloadopenwrt-d55083fbcaea9cdd2ebc10a2d38989ad485a5357.tar.gz
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>
-rw-r--r--include/target.mk10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/target.mk b/include/target.mk
index 386abf2ef1..c9ff3cbb7c 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -346,7 +346,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))