diff options
| author | Lu jicong | 2024-07-02 13:01:49 +0000 |
|---|---|---|
| committer | Christian Marangi | 2024-07-07 11:56:14 +0000 |
| commit | 4c03fe22b7c4228595ed5903631402dc7f4874d0 (patch) | |
| tree | bedb5cd0dcbab4e535b7dc5da4d41e2105360209 | |
| parent | 2a099d36a7e20a265d49cebf873355bd36f57f6d (diff) | |
| download | openwrt-4c03fe22b7c4228595ed5903631402dc7f4874d0.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>
(cherry picked from commit d55083fbcaea9cdd2ebc10a2d38989ad485a5357)
| -rw-r--r-- | include/target.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/target.mk b/include/target.mk index b5e3e7ff6f..f72ef32bec 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)) |