cpu/cortexm_common: Unify Kconfig and Makefile arch identifiers

RIOT-OS · Jun 16, 2020 · 2c4c04d · 2c4c04d
1 parent 5dc2988
commit 2c4c04d
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/cpu/cortexm_common/Kconfig b/cpu/cortexm_common/Kconfig
@@ -4,25 +4,25 @@
 # General Public License v2.1. See the file LICENSE in the top level
 # directory for more details.
 
-config CPU_ARCH_ARMV6_M
+config CPU_ARCH_ARMV6M
     bool
     select HAS_ARCH_ARM
     select HAS_ARCH_32BIT
 
-config CPU_ARCH_ARMV7_M
+config CPU_ARCH_ARMV7M
     bool
     select HAS_ARCH_ARM
     select HAS_ARCH_32BIT
 
-config CPU_ARCH_ARMV8_M
+config CPU_ARCH_ARMV8M
     bool
     select HAS_ARCH_ARM
     select HAS_ARCH_32BIT
 
 config CPU_ARCH
-    default "armv6_m" if CPU_ARCH_ARMV6_M
-    default "armv7_m" if CPU_ARCH_ARMV7_M
-    default "armv8_m" if CPU_ARCH_ARMV8_M
+    default "armv6m" if CPU_ARCH_ARMV6M
+    default "armv7m" if CPU_ARCH_ARMV7M
+    default "armv8m" if CPU_ARCH_ARMV8M
 
 config CPU_CORE_CORTEX_M
     bool
@@ -45,38 +45,38 @@ config CPU_CORE
 
 config CPU_CORE_CORTEX_M0
     bool
-    select CPU_ARCH_ARMV6_M
+    select CPU_ARCH_ARMV6M
     select CPU_CORE_CORTEX_M
 
 config CPU_CORE_CORTEX_M0PLUS
     bool
-    select CPU_ARCH_ARMV6_M
+    select CPU_ARCH_ARMV6M
     select CPU_CORE_CORTEX_M
 
 config CPU_CORE_CORTEX_M23
     bool
-    select CPU_ARCH_ARMV8_M
+    select CPU_ARCH_ARMV8M
     select CPU_CORE_CORTEX_M
 
 config CPU_CORE_CORTEX_M3
     bool
-    select CPU_ARCH_ARMV7_M
+    select CPU_ARCH_ARMV7M
     select CPU_CORE_CORTEX_M
 
 config CPU_CORE_CORTEX_M4
     bool
-    select CPU_ARCH_ARMV7_M
+    select CPU_ARCH_ARMV7M
     select CPU_CORE_CORTEX_M
 
 config CPU_CORE_CORTEX_M4F
     bool
-    select CPU_ARCH_ARMV7_M
+    select CPU_ARCH_ARMV7M
     select CPU_CORE_CORTEX_M
     select HAS_CORTEXM_FPU
 
 config CPU_CORE_CORTEX_M7
     bool
-    select CPU_ARCH_ARMV7_M
+    select CPU_ARCH_ARMV7M
     select CPU_CORE_CORTEX_M
     select HAS_CORTEXM_FPU