diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 506463c12cc482eb1fb70a04957e1e603cf8f9c8..fc8c435bbb2555f4a7184769787b92234591774e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -625,14 +625,6 @@ config RMOBILE
 	bool "Renesas ARM SoCs"
 	select CPU_V7
 
-config TARGET_CM_FX6
-	bool "Support cm_fx6"
-	select CPU_V7
-	select SUPPORT_SPL
-	select DM
-	select DM_SERIAL
-	select DM_GPIO
-
 config ARCH_SOCFPGA
 	bool "Altera SOCFPGA family"
 	select CPU_V7
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 10908c4c4a295d1b2da47422aaa5056a6887abb0..2c18bcd7a29677f3f12da9bf3044b0c8e8eb1e30 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -29,6 +29,14 @@ choice
 	prompt "MX6 board select"
 	optional
 
+config TARGET_CM_FX6
+	bool "Support CM-FX6"
+	select CPU_V7
+	select SUPPORT_SPL
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
+
 config TARGET_SECOMX6
 	bool "Support secomx6 boards"
 	select CPU_V7
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 25829dbf457e40640b4e2f39e7e0196785b09f9a..7ad5c217834c15fba6fce982c8d3ea739dd15573 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
 CONFIG_TARGET_CM_FX6=y
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"