diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index af2d4f4135e390ca52c5b68955661a758e11f0f3..3702bb084f84414bb7327dc9b75e30d2bd8facc6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -630,6 +630,9 @@ config TARGET_CM_FX6
 	bool "Support cm_fx6"
 	select CPU_V7
 	select SUPPORT_SPL
+	select DM
+	select DM_SERIAL
+	select DM_GPIO
 
 config TARGET_SOCFPGA_ARRIA5
 	bool "Support socfpga_arria5"
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index f10a5c2c90b679364dddd6afe96bc86aeedb56c5..c83a0e8dac4c124b5ecf10b52095a70c6ba7c04b 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -2,6 +2,3 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_ARM=y
 CONFIG_TARGET_CM_FX6=y
-CONFIG_DM=y
-CONFIG_DM_GPIO=y
-CONFIG_DM_SERIAL=y