diff --git a/README.md b/README.md
index cf66f17..83f3ad6 100644
--- a/README.md
+++ b/README.md
@@ -147,6 +147,16 @@ To test the kernel on target device create a USB drive with two partitions one f
         echo "........Done "
         echo "Kernel loading Completed"
         :END
+        
+12. To test USB device you can make use of tools in https://gitlab.com/felipebalbi/usb-tools. Ensure that libcomposite and Zero gadget modules are loaded prior to running the tests and the OTG mode is set to "device".
+
+    > insmod /lib/modules/4.20.0-rc4-quilt-2e5dc0ac-00064-g1ceae536e4c5/kernel/drivers/usb/gadget/libcomposite.ko
+    
+    > insmod /lib/modules/4.20.0-rc4-quilt-2e5dc0ac-00064-g1ceae536e4c5/kernel/drivers/usb/gadget/legacy/g_zero.ko
+    
+    > echo device > /sys/class/usb_role/intel_xhci_usb_sw-role-switch/role
+
+
 
 
 
diff --git a/target-recipes/bxt/gpmrb/kernel.config b/target-recipes/bxt/gpmrb/kernel.config
index 1a43405..580ca77 100644
--- a/target-recipes/bxt/gpmrb/kernel.config
+++ b/target-recipes/bxt/gpmrb/kernel.config
@@ -4066,7 +4066,16 @@ CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_PCI=y
 CONFIG_USB_DWC3_HAPS=y
 CONFIG_USB_DWC2=y
+# CONFIG_USB_DWC2_HOST is not set
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
 CONFIG_USB_DWC2_PERIPHERAL=y
+# CONFIG_USB_DWC2_DUAL_ROLE is not set
+# CONFIG_USB_DWC2_PCI is not set
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 # CONFIG_USB_CHIPIDEA is not set
 # CONFIG_USB_ISP1760 is not set
 
@@ -4172,7 +4181,6 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4191,36 +4199,26 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 # CONFIG_USB_GOKU is not set
 # CONFIG_USB_EG20T is not set
 # CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_F_ACM=y
-CONFIG_USB_U_SERIAL=y
-CONFIG_USB_U_ETHER=y
-CONFIG_USB_F_SERIAL=y
-CONFIG_USB_F_NCM=y
-CONFIG_USB_F_RNDIS=y
-CONFIG_USB_F_MASS_STORAGE=y
-CONFIG_USB_F_FS=y
-CONFIG_USB_F_MIDI=y
-CONFIG_USB_F_HID=y
-CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-# CONFIG_USB_CONFIGFS_OBEX is not set
-CONFIG_USB_CONFIGFS_NCM=y
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-CONFIG_USB_CONFIGFS_RNDIS=y
-# CONFIG_USB_CONFIGFS_EEM is not set
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-CONFIG_USB_CONFIGFS_F_FS=y
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-CONFIG_USB_CONFIGFS_F_MIDI=y
-CONFIG_USB_CONFIGFS_F_HID=y
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_SS_LB=m
+# CONFIG_USB_CONFIGFS is not set
+CONFIG_USB_ZERO=m
+# CONFIG_USB_ZERO_HNPTEST is not set
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_ETH is not set
+# CONFIG_USB_G_NCM is not set
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FUNCTIONFS is not set
+# CONFIG_USB_MASS_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+# CONFIG_USB_G_HID is not set
+# CONFIG_USB_G_DBGP is not set
+# CONFIG_USB_G_WEBCAM is not set
 CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=y
 # CONFIG_TYPEC_TCPCI is not set
@@ -5147,6 +5145,7 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_PHY_CPCAP_USB is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
+# CONFIG_PHY_SAMSUNG_USB2 is not set
 # CONFIG_PHY_TUSB1210 is not set
 CONFIG_POWERCAP=y
 CONFIG_INTEL_RAPL=y