diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a6d2a41a449b8bf87c1b318055b2f4237ba70649..efd08f22e7bebcbf5816b92bca45cea454ce4e35 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -631,11 +631,17 @@ config TARGET_SOCFPGA_ARRIA5
 	bool "Support socfpga_arria5"
 	select CPU_V7
 	select SUPPORT_SPL
+	select DM
+	select DM_SPI_FLASH
+	select DM_SPI
 
 config TARGET_SOCFPGA_CYCLONE5
 	bool "Support socfpga_cyclone5"
 	select CPU_V7
 	select SUPPORT_SPL
+	select DM
+	select DM_SPI_FLASH
+	select DM_SPI
 
 config ARCH_SUNXI
 	bool "Support sunxi (Allwinner) SoCs"
diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
index 87d6007f0dfc8c94d83381c6553481829ac0a330..52032e523eb7d445e683c57ee5f28d010ed64bb3 100644
--- a/configs/socfpga_arria5_defconfig
+++ b/configs/socfpga_arria5_defconfig
@@ -3,6 +3,3 @@ CONFIG_ARM=y
 CONFIG_TARGET_SOCFPGA_ARRIA5=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
-CONFIG_DM=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig
index 0ebfbfcece6b2b2e3d5d333624ed8ca4e736c1a1..56b618365984a946547a2e0b4d301fb9f549cec3 100644
--- a/configs/socfpga_cyclone5_defconfig
+++ b/configs/socfpga_cyclone5_defconfig
@@ -3,6 +3,3 @@ CONFIG_ARM=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
-CONFIG_DM=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y
diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig
index 873b721ead139fe901704f60725361faa93308e7..d68b9cc2884252e3612caa198679d9e810c3569a 100644
--- a/configs/socfpga_socrates_defconfig
+++ b/configs/socfpga_socrates_defconfig
@@ -3,6 +3,3 @@ CONFIG_ARM=y
 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
-CONFIG_DM=y
-CONFIG_DM_SPI=y
-CONFIG_DM_SPI_FLASH=y