diff --git a/include/target.mk b/include/target.mk
index b5153ff69c..0a42411d17 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -259,7 +259,7 @@ ifeq ($(DUMP),1)
     ifneq ($(CONFIG_RTC_CLASS),)
       FEATURES += rtc
     endif
-    FEATURES += $(foreach v,v4 v5 v6 v7,$(if $(filter -march=arm$(v)%,$(CPU_CFLAGS_$(CPU_TYPE))),arm_$(v)))
+    FEATURES += $(foreach v,6 7,$(if $(CONFIG_CPU_V$(v)),arm_v$(v)))
 
     # remove duplicates
     FEATURES:=$(sort $(FEATURES))
diff --git a/target/Config.in b/target/Config.in
index 6a29d53324..ee928143ff 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -117,12 +117,6 @@ config armeb
 	select BIG_ENDIAN
 	bool
 
-config arm_v4
-	bool
-
-config arm_v5
-	bool
-
 config arm_v6
 	bool