diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/configs/empty b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/configs/empty
new file mode 100644
index 00000000..e69de29b
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/configs/stock b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/configs/stock
deleted file mode 120000
index 45e34f54..00000000
--- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/configs/stock
+++ /dev/null
@@ -1 +0,0 @@
-../defconfig
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/defconfig
index 160b5e3d..02ee0c33 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/defconfig
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/am335x-evm/defconfig
@@ -974,6 +974,7 @@ CONFIG_SMC91X=y
 CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_DAVINCI_CPDMA=y
 CONFIG_TI_CPSW=y
+CONFIG_TLK110_WORKAROUND=y
 # CONFIG_DM9000 is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ETHOC is not set
@@ -1760,23 +1761,26 @@ CONFIG_USB_GADGET_MUSB_HDRC=y
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_G_DBGP=y
+CONFIG_USB_G_DBGP_PRINTK=y
+CONFIG_USB_GADGET_PORT_USB1=y
+# CONFIG_USB_GADGET_PORT_USB0 is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
 # CONFIG_USB_G_NCM is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_MASS_STORAGE=m
 # 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_MULTI is not set
 # CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_DBGP is not set
 
 #
 # OTG and related infrastructure
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/configs/empty b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/configs/empty
new file mode 100644
index 00000000..e69de29b
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/configs/stock b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/configs/stock
deleted file mode 120000
index 45e34f54..00000000
--- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/configs/stock
+++ /dev/null
@@ -1 +0,0 @@
-../defconfig
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/defconfig
index 160b5e3d..02ee0c33 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/defconfig
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/tipspkernel/am335x-evm/defconfig
@@ -974,6 +974,7 @@ CONFIG_SMC91X=y
 CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_DAVINCI_CPDMA=y
 CONFIG_TI_CPSW=y
+CONFIG_TLK110_WORKAROUND=y
 # CONFIG_DM9000 is not set
 # CONFIG_ENC28J60 is not set
 # CONFIG_ETHOC is not set
@@ -1760,23 +1761,26 @@ CONFIG_USB_GADGET_MUSB_HDRC=y
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_G_DBGP=y
+CONFIG_USB_G_DBGP_PRINTK=y
+CONFIG_USB_GADGET_PORT_USB1=y
+# CONFIG_USB_GADGET_PORT_USB0 is not set
 # CONFIG_USB_ZERO is not set
 # CONFIG_USB_AUDIO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
 # CONFIG_USB_G_NCM is not set
 # CONFIG_USB_GADGETFS is not set
 # CONFIG_USB_FUNCTIONFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_MASS_STORAGE is not set
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_MASS_STORAGE=m
 # 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_MULTI is not set
 # CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_DBGP is not set
 
 #
 # OTG and related infrastructure