diff --git a/Kconfig b/Kconfig
index 1fd3455a..c2f61431 100644
--- a/Kconfig
+++ b/Kconfig
@@ -604,7 +604,7 @@ config SECURE_TRUSTZONE
     bool "Enable ARM TrustZone"
     default n
     depends on ARCH_ARM
-    select ARCH_ARM_V8M
+    depends on ARCH_ARM_V8M
 config SECURE_HEAP_SIZE
     int "TrustZone Heap Size (bytes)"
     default 2048
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dc020629..dfff72b5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -88,15 +88,13 @@ config ARCH_CORTEX_M7
     select ARCH_ARM_AARCH32
     select ARCH_FPU_VFP_V4
     select ARCH_FPU_VFP_D32
-    select ARCH_FPU_VFP_NEON
 
 config ARCH_CORTEX_M33
     bool
-    select ARCH_ARM_V7M
+    select ARCH_ARM_V8M
     select ARCH_ARM_AARCH32
     select ARCH_FPU_VFP_V4
     select ARCH_FPU_VFP_D32
-    select ARCH_FPU_VFP_NEON
 
 config ARCH_CORTEX_M55
     bool
@@ -104,7 +102,6 @@ config ARCH_CORTEX_M55
     select ARCH_ARM_AARCH32
     select ARCH_FPU_VFP_V4
     select ARCH_FPU_VFP_D32
-    select ARCH_FPU_VFP_NEON
 
 config ARCH_ARM9
     bool