MLK-22357-4 imx8: Enable usb2 configs on imx8 platform

Enable the configs of usb2 so that both usb2 and usb3 gadget
drivers are now supported on imx8 plaform. And add
CONFIG_USB_PORT_AUTO to support usb port autodetect function
for SDP/fastboot.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>

diff --git a/configs/imx8dx_17x17_val_defconfig b/configs/imx8dx_17x17_val_defconfig
index 2f58312..80d3075 100644 (file)
--- a/configs/imx8dx_17x17_val_defconfig
+++ b/configs/imx8dx_17x17_val_defconfig
@@ -107,6 +107,8 @@ CONFIG_SF_DEFAULT_MODE=0
 
 CONFIG_USB_EHCI_HCD=y
 CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
@@ -131,7 +133,9 @@ CONFIG_FASTBOOT_USB_DEV=0
 
 CONFIG_SPL_USB_HOST_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
-CONFIG_SPL_DM_USB=n
+CONFIG_SPL_DM_USB=y
+CONFIG_SPL_SDP_USB_DEV=0
 CONFIG_SDP_LOADADDR=0x80400000

diff --git a/configs/imx8dxl_phantom_mek_defconfig b/configs/imx8dxl_phantom_mek_defconfig
index cbbd285..20d55c2 100644 (file)
--- a/configs/imx8dxl_phantom_mek_defconfig
+++ b/configs/imx8dxl_phantom_mek_defconfig
@@ -104,6 +104,8 @@ CONFIG_SF_DEFAULT_MODE=0
 
 CONFIG_USB_EHCI_HCD=y
 CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
@@ -127,9 +129,12 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=0
 
 CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
-CONFIG_SPL_DM_USB=n
+CONFIG_SPL_DM_USB=y
+CONFIG_SPL_SDP_USB_DEV=0
 CONFIG_SDP_LOADADDR=0x80400000
 
 CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000

diff --git a/configs/imx8dxl_phantom_mek_fspi_defconfig b/configs/imx8dxl_phantom_mek_fspi_defconfig
index c1b6cb0..c7312da 100644 (file)
--- a/configs/imx8dxl_phantom_mek_fspi_defconfig
+++ b/configs/imx8dxl_phantom_mek_fspi_defconfig
@@ -105,6 +105,8 @@ CONFIG_SF_DEFAULT_MODE=0
 
 CONFIG_USB_EHCI_HCD=y
 CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
@@ -128,9 +130,12 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=0
 
 CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
-CONFIG_SPL_DM_USB=n
+CONFIG_SPL_DM_USB=y
+CONFIG_SPL_SDP_USB_DEV=0
 CONFIG_SDP_LOADADDR=0x80400000
 
 CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000

diff --git a/configs/imx8qm_ddr4_arm2_defconfig b/configs/imx8qm_ddr4_arm2_defconfig
index c0c6f5f..480985a 100644 (file)
--- a/configs/imx8qm_ddr4_arm2_defconfig
+++ b/configs/imx8qm_ddr4_arm2_defconfig
@@ -114,7 +114,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -137,3 +137,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=1
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qm_lpddr4_arm2_defconfig b/configs/imx8qm_lpddr4_arm2_defconfig
index b54e4c4..ffd969c 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_defconfig
@@ -116,7 +116,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -139,3 +139,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=1
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qm_lpddr4_arm2_fspi_defconfig b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
index 9ce5a94..c977649 100644 (file)
--- a/configs/imx8qm_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qm_lpddr4_arm2_fspi_defconfig
@@ -117,7 +117,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -140,3 +140,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=1
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig
index f252749..4db1737 100644 (file)
--- a/configs/imx8qm_mek_defconfig
+++ b/configs/imx8qm_mek_defconfig
@@ -115,7 +115,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -150,3 +150,7 @@ CONFIG_IMX_AHCI=y
 CONFIG_DM_SCSI=y
 CONFIG_SCSI=y
 CONFIG_CMD_SCSI=y
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qm_mek_fspi_defconfig b/configs/imx8qm_mek_fspi_defconfig
index 424d97e..a9a084f 100644 (file)
--- a/configs/imx8qm_mek_fspi_defconfig
+++ b/configs/imx8qm_mek_fspi_defconfig
@@ -116,7 +116,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -142,3 +142,7 @@ CONFIG_FASTBOOT_USB_DEV=1
 
 CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qxp_17x17_val_defconfig b/configs/imx8qxp_17x17_val_defconfig
index 47fd2e0..2481c71 100644 (file)
--- a/configs/imx8qxp_17x17_val_defconfig
+++ b/configs/imx8qxp_17x17_val_defconfig
@@ -107,6 +107,8 @@ CONFIG_SF_DEFAULT_MODE=0
 
 CONFIG_USB_EHCI_HCD=y
 CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
@@ -130,7 +132,10 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=0
 
 CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y
 CONFIG_SPL_USB_GADGET=y
 CONFIG_SPL_USB_SDP_SUPPORT=y
-CONFIG_SPL_DM_USB=n
+CONFIG_SPL_DM_USB=y
+CONFIG_SPL_SDP_USB_DEV=0
 CONFIG_SDP_LOADADDR=0x80400000

diff --git a/configs/imx8qxp_ddr3_arm2_defconfig b/configs/imx8qxp_ddr3_arm2_defconfig
index 1af7e43..cf906dc 100644 (file)
--- a/configs/imx8qxp_ddr3_arm2_defconfig
+++ b/configs/imx8qxp_ddr3_arm2_defconfig
@@ -116,7 +116,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -139,3 +139,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=1
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qxp_lpddr4_arm2_defconfig b/configs/imx8qxp_lpddr4_arm2_defconfig
index c46d9bb..7c7baf9 100644 (file)
--- a/configs/imx8qxp_lpddr4_arm2_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_defconfig
@@ -116,7 +116,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -139,3 +139,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=1
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
index 7d6cb2e..dcbcca5 100644 (file)
--- a/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_fspi_defconfig
@@ -117,7 +117,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -140,3 +140,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=1
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qxp_lpddr4_arm2_nand_defconfig b/configs/imx8qxp_lpddr4_arm2_nand_defconfig
index ece50cb..5750f40 100644 (file)
--- a/configs/imx8qxp_lpddr4_arm2_nand_defconfig
+++ b/configs/imx8qxp_lpddr4_arm2_nand_defconfig
@@ -106,7 +106,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -137,3 +137,7 @@ CONFIG_FASTBOOT_BUF_ADDR=0x82800000
 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_USB_DEV=1
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig
index d6bd93e..7492de9 100644 (file)
--- a/configs/imx8qxp_mek_defconfig
+++ b/configs/imx8qxp_mek_defconfig
@@ -114,7 +114,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -144,3 +144,7 @@ CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000
 
 CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/configs/imx8qxp_mek_fspi_defconfig b/configs/imx8qxp_mek_fspi_defconfig
index cf91450..0da7aa9 100644 (file)
--- a/configs/imx8qxp_mek_fspi_defconfig
+++ b/configs/imx8qxp_mek_fspi_defconfig
@@ -115,7 +115,7 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB=y
 CONFIG_USB_TCPC=y
 CONFIG_USB_GADGET=y
-# CONFIG_CI_UDC=y
+CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
@@ -145,3 +145,7 @@ CONFIG_IMX_VSERVICE_SHARED_BUFFER=0x90000000
 
 CONFIG_BOOTAUX_RESERVED_MEM_BASE=0x88000000
 CONFIG_BOOTAUX_RESERVED_MEM_SIZE=0x08000000
+
+CONFIG_SPL_USB_HOST_SUPPORT=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_USB_PORT_AUTO=y

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8d8d61e..35b657d 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -159,6 +159,15 @@ config USB_FUNCTION_THOR
          Enable Tizen's THOR download protocol support in U-Boot. It
          allows downloading images into memory and flash them to target device.
 
+config USB_PORT_AUTO
+       bool "Enable USB port autodetect"
+       depends on CI_UDC
+       help
+         Enable usb port autodetect function for i.MX8. There two usb ports -
+         usb2 and usb3 on i.MX8, when use SDP or fastboot which runs automatically
+         when uboot starts, enable this config will autodetect the  connected usb
+         port instead of specify USB port to download in code.
+
 endif # USB_GADGET_DOWNLOAD
 
 config USB_ETHER

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index b0d3b83..776824b 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -114,7 +114,7 @@ endif # USB_XHCI_HCD
 
 config USB_EHCI_HCD
        bool "EHCI HCD (USB 2.0) support"
-       default y if ARCH_MX5 || ARCH_MX6
+       default y if ARCH_MX5 || ARCH_MX6 || ARCH_IMX8
        select USB_HOST
        ---help---
          The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0

diff --git a/include/configs/imx8qm_arm2.h b/include/configs/imx8qm_arm2.h
index e8278d9..7b470a3 100644 (file)
--- a/include/configs/imx8qm_arm2.h
+++ b/include/configs/imx8qm_arm2.h
@@ -370,14 +370,12 @@
 #define CONFIG_USB_GADGET_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_USB_EHCI_HCD
 #endif
 
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 
 /* USB OTG controller configs */
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h
index c9758e0..b9f4e0e 100644 (file)
--- a/include/configs/imx8qm_mek.h
+++ b/include/configs/imx8qm_mek.h
@@ -366,14 +366,12 @@
 #define CONFIG_USB_GADGET_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_USB_EHCI_HCD
 #endif
 
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 
 /* USB OTG controller configs */
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h
index 8367591..3b4405c 100644 (file)
--- a/include/configs/imx8qxp_mek.h
+++ b/include/configs/imx8qxp_mek.h
@@ -327,14 +327,12 @@
 #define CONFIG_USB_GADGET_MASS_STORAGE
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_USB_EHCI_HCD
 #endif
 
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 
 /* USB OTG controller configs */
 #ifdef CONFIG_USB_EHCI_HCD
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)