diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 833794819f2c2ba41aadb6c98e58fc10bae4033d..d6208a4f4014e3f526a207ec7dbb5ce5d8976657 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -42,6 +42,7 @@ CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_STORAGE=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Xilinx"
diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index 6eb8f03d5508556634086c2a8a2afaf9ee665b42..b0927ca6e8f60e599bf279fd233b5c71909665ae 100644
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -32,6 +32,7 @@ CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_STORAGE=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Xilinx"
diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index b9e13f2214b4ef72663d6a285d29630cc08f1fc8..9ee2e06ddd778e6478c2d8e9ad70375fe1fc48a7 100644
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -47,6 +47,7 @@ CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_STORAGE=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Xilinx"
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index c13c077fe75d3bf037e554a3227e203dfd2a3110..a03f96e57ca2c51a82bb0008b0c23c9dc086d897 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -43,6 +43,7 @@ CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_STORAGE=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Xilinx"
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index c23e664db54db9cae2f60420c230b00b3162c28d..959a5350e8519c8118deee05abd3fb12e85cf70e 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -42,6 +42,7 @@ CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_STORAGE=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Xilinx"
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index c5884e21c90b2448f91129a661b8e661d224a68a..520d8c70736556dac9ac4d8beada3fcf569db28e 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -45,6 +45,7 @@ CONFIG_USB_EHCI=y
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_STORAGE=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_G_DNL_MANUFACTURER="Xilinx"
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 08b7602ba170f207a1820ec5a80e688256a068ae..e59e412d58a62ba3c39b97662659da839408ea14 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -87,7 +87,6 @@
 #endif
 
 #ifdef CONFIG_USB_EHCI_ZYNQ
-# define CONFIG_USB_STORAGE
 # define CONFIG_EHCI_IS_TDI
 # define CONFIG_USB_MAX_CONTROLLER_COUNT	2