diff --git a/configs/nitrogen8m_som_2g_defconfig b/configs/nitrogen8m_som_2g_defconfig
index 5bb376a9874139281f303d5b6e2fa4b44c19af28..1e9014d87544deb71246890c6dcbdb4ee42a7cdf 100644
--- a/configs/nitrogen8m_som_2g_defconfig
+++ b/configs/nitrogen8m_som_2g_defconfig
@@ -23,6 +23,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg,DDR_MB
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
@@ -78,6 +81,8 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
diff --git a/configs/nitrogen8m_som_4g_defconfig b/configs/nitrogen8m_som_4g_defconfig
index 0319c3907e496c52a21aac4a2a5de37da90b7c3f..ae79e632a0466d9ae78ee73e56c45c5d4d519b85 100644
--- a/configs/nitrogen8m_som_4g_defconfig
+++ b/configs/nitrogen8m_som_4g_defconfig
@@ -23,6 +23,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg,DDR_MB
 CONFIG_SPL_BOARD_INIT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_SPL_WATCHDOG_SUPPORT=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_SYS_ALT_MEMTEST=y
@@ -78,6 +81,8 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y
diff --git a/include/configs/nitrogen8m_som.h b/include/configs/nitrogen8m_som.h
index 87b976c59ecc15882bf91febdd6104cf2d098009..c86b195711ad4533f559a9d88962647e9acbb6bc 100644
--- a/include/configs/nitrogen8m_som.h
+++ b/include/configs/nitrogen8m_som.h
@@ -36,6 +36,7 @@
 
 #define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */
 
+#undef CONFIG_BLK
 #undef CONFIG_DM_MMC
 #undef CONFIG_DM_PMIC
 #undef CONFIG_DM_PMIC_PFUZE100
@@ -139,22 +140,16 @@
 
 /* USB configs */
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_HAS_FSL_XHCI_USB
-
-#ifdef CONFIG_HAS_FSL_XHCI_USB
-#define CONFIG_USB_MAX_CONTROLLER_COUNT         2
-#endif
-
-#define CONFIG_USB_DWC3
-#define CONFIG_USB_DWC3_GADGET
 #define CONFIG_USBD_HS
 
 #define CONFIG_USB_GADGET_MASS_STORAGE
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
-#define CONFIG_USB_GADGET_DUALSPEED
 
 #endif
 
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+
+#define CONFIG_USB_MAX_CONTROLLER_COUNT         2
+
 #define CONFIG_OF_SYSTEM_SETUP
 
 /* Framebuffer */