diff --git a/configs/bio_4g_defconfig b/configs/bio_4g_defconfig
index f04075994e94ac1fa4f1df76f006029716682b81..1d7052915f46b4b441f35bedd3ce9573255e32dc 100644
--- a/configs/bio_4g_defconfig
+++ b/configs/bio_4g_defconfig
@@ -25,6 +25,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_GPIO=y
 CONFIG_CMD_GPT=y
@@ -74,6 +77,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/bio.h b/include/configs/bio.h
index 80da4d751ed5804595c91e1ba8752198050ab4f7..947afe03dad09a99e3504d466beb0b50aaaa9364 100644
--- a/include/configs/bio.h
+++ b/include/configs/bio.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
@@ -122,22 +123,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 */