5 files changed, 4 insertions, 3 deletions

diff --git a/configs/imx8mm_ddr4_evk_defconfig b/configs/imx8mm_ddr4_evk_defconfig
index 1675d6fc135..784c30baf99 100644
--- a/configs/imx8mm_ddr4_evk_defconfig
+++ b/configs/imx8mm_ddr4_evk_defconfig
@@ -100,6 +100,7 @@ CONFIG_USB_TCPC=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_DM_USB=y
+CONFIG_CI_UDC=y
 CONFIG_USB_EHCI_HCD=y
 
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
diff --git a/configs/imx8mm_ddr4_evk_nand_defconfig b/configs/imx8mm_ddr4_evk_nand_defconfig
index 25094c5edab..bd554bfcec5 100644
--- a/configs/imx8mm_ddr4_evk_nand_defconfig
+++ b/configs/imx8mm_ddr4_evk_nand_defconfig
@@ -98,6 +98,7 @@ CONFIG_USB_TCPC=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_DM_USB=y
+CONFIG_CI_UDC=y
 CONFIG_USB_EHCI_HCD=y
 
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
index 61406f1a32c..cb6e614f167 100644
--- a/configs/imx8mm_evk_defconfig
+++ b/configs/imx8mm_evk_defconfig
@@ -112,6 +112,7 @@ CONFIG_USB_TCPC=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_DM_USB=y
+CONFIG_CI_UDC=y
 CONFIG_USB_EHCI_HCD=y
 
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
diff --git a/configs/imx8mm_evk_fspi_defconfig b/configs/imx8mm_evk_fspi_defconfig
index 6a09770d370..b20e7bfee92 100644
--- a/configs/imx8mm_evk_fspi_defconfig
+++ b/configs/imx8mm_evk_fspi_defconfig
@@ -113,6 +113,7 @@ CONFIG_USB_TCPC=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_DM_USB=y
+CONFIG_CI_UDC=y
 CONFIG_USB_EHCI_HCD=y
 
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index 9f64624d9a6..8958fa7e100 100644
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -268,11 +268,8 @@
 
 #endif
 
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_GADGET_VBUS_DRAW 2
 
-#define CONFIG_CI_UDC
-
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         2