Eric Lee / smarc-uboot

6
Download as
Browse Code ยป

Commit 29625003b8d8f96f25d8a9f530db5c95f5ce2a8a

Authored by Ye Li
1 parent ae52af0908
Exists in smarc-imx_v2017.03_o8.1.0_1.3.0_8m and in 1 other branch smarc-imx_v2017.03_4.9.88_2.0.0_ga

MLK-17821-4 imx8qm/qxp: Enable CDNS3 USB gadget driver for MEK and ARM2 

The u-boot does not support to use two different gadget drivers at same time.
So for all iMX8QM/QXP MEK and ARM2 defconfigs, enable the CDNS3 usb gadget
to support device mode on typec port and disable CI UDC driver for OTG port.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

Showing 11 changed files with 67 additions and 21 deletions Side-by-side Diff

configs/imx8qm_ddr4_arm2_defconfig
Diff comments   View file @ 2962500
... ... @@ -27,11 +27,15 @@
27 27  
28 28 CONFIG_CMD_USB_MASS_STORAGE=y
29 29 CONFIG_USB_GADGET=y
30   -CONFIG_CI_UDC=y
  30 +# CONFIG_CI_UDC=y
31 31 CONFIG_USB_GADGET_DOWNLOAD=y
32 32 CONFIG_G_DNL_MANUFACTURER="FSL"
33 33 CONFIG_G_DNL_VENDOR_NUM=0x0525
34 34 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  35 +
  36 +CONFIG_USB_CDNS3=y
  37 +CONFIG_USB_CDNS3_GADGET=y
  38 +CONFIG_USB_GADGET_DUALSPEED=y
35 39  
36 40 CONFIG_CMD_GPIO=y
37 41 CONFIG_DM_GPIO=y
configs/imx8qm_lpddr4_arm2_defconfig
Diff comments   View file @ 2962500
... ... @@ -27,11 +27,15 @@
27 27  
28 28 CONFIG_CMD_USB_MASS_STORAGE=y
29 29 CONFIG_USB_GADGET=y
30   -CONFIG_CI_UDC=y
  30 +# CONFIG_CI_UDC=y
31 31 CONFIG_USB_GADGET_DOWNLOAD=y
32 32 CONFIG_G_DNL_MANUFACTURER="FSL"
33 33 CONFIG_G_DNL_VENDOR_NUM=0x0525
34 34 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  35 +
  36 +CONFIG_USB_CDNS3=y
  37 +CONFIG_USB_CDNS3_GADGET=y
  38 +CONFIG_USB_GADGET_DUALSPEED=y
35 39  
36 40 CONFIG_CMD_GPIO=y
37 41 CONFIG_DM_GPIO=y
configs/imx8qm_lpddr4_arm2_fspi_defconfig
Diff comments   View file @ 2962500
... ... @@ -27,11 +27,15 @@
27 27  
28 28 CONFIG_CMD_USB_MASS_STORAGE=y
29 29 CONFIG_USB_GADGET=y
30   -CONFIG_CI_UDC=y
  30 +# CONFIG_CI_UDC=y
31 31 CONFIG_USB_GADGET_DOWNLOAD=y
32 32 CONFIG_G_DNL_MANUFACTURER="FSL"
33 33 CONFIG_G_DNL_VENDOR_NUM=0x0525
34 34 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  35 +
  36 +CONFIG_USB_CDNS3=y
  37 +CONFIG_USB_CDNS3_GADGET=y
  38 +CONFIG_USB_GADGET_DUALSPEED=y
35 39  
36 40 CONFIG_CMD_GPIO=y
37 41 CONFIG_DM_GPIO=y
configs/imx8qm_mek_defconfig
Diff comments   View file @ 2962500
... ... @@ -19,19 +19,24 @@
19 19 CONFIG_USB_XHCI_IMX8=y
20 20  
21 21 CONFIG_DM_USB=y
  22 +CONFIG_USB_EHCI_HCD=y
22 23  
23 24 CONFIG_CMD_USB=y
24 25 CONFIG_USB=y
25 26 CONFIG_USB_STORAGE=y
26 27 CONFIG_USB_TCPC=y
27 28  
28   -# CONFIG_CMD_USB_MASS_STORAGE=y
29   -# CONFIG_USB_GADGET=y
  29 +CONFIG_CMD_USB_MASS_STORAGE=y
  30 +CONFIG_USB_GADGET=y
30 31 # CONFIG_CI_UDC=y
31   -# CONFIG_USB_GADGET_DOWNLOAD=y
32   -# CONFIG_G_DNL_MANUFACTURER="FSL"
33   -# CONFIG_G_DNL_VENDOR_NUM=0x0525
34   -# CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  32 +CONFIG_USB_GADGET_DOWNLOAD=y
  33 +CONFIG_G_DNL_MANUFACTURER="FSL"
  34 +CONFIG_G_DNL_VENDOR_NUM=0x0525
  35 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  36 +
  37 +CONFIG_USB_CDNS3=y
  38 +CONFIG_USB_CDNS3_GADGET=y
  39 +CONFIG_USB_GADGET_DUALSPEED=y
35 40  
36 41 CONFIG_CMD_GPIO=y
37 42 CONFIG_DM_GPIO=y
configs/imx8qm_mek_fspi_defconfig
Diff comments   View file @ 2962500
... ... @@ -19,19 +19,24 @@
19 19 CONFIG_USB_XHCI_IMX8=y
20 20  
21 21 CONFIG_DM_USB=y
  22 +CONFIG_USB_EHCI_HCD=y
22 23  
23 24 CONFIG_CMD_USB=y
24 25 CONFIG_USB=y
25 26 CONFIG_USB_STORAGE=y
26 27 CONFIG_USB_TCPC=y
27 28  
28   -# CONFIG_CMD_USB_MASS_STORAGE=y
29   -# CONFIG_USB_GADGET=y
  29 +CONFIG_CMD_USB_MASS_STORAGE=y
  30 +CONFIG_USB_GADGET=y
30 31 # CONFIG_CI_UDC=y
31   -# CONFIG_USB_GADGET_DOWNLOAD=y
32   -# CONFIG_G_DNL_MANUFACTURER="FSL"
33   -# CONFIG_G_DNL_VENDOR_NUM=0x0525
34   -# CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  32 +CONFIG_USB_GADGET_DOWNLOAD=y
  33 +CONFIG_G_DNL_MANUFACTURER="FSL"
  34 +CONFIG_G_DNL_VENDOR_NUM=0x0525
  35 +CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  36 +
  37 +CONFIG_USB_CDNS3=y
  38 +CONFIG_USB_CDNS3_GADGET=y
  39 +CONFIG_USB_GADGET_DUALSPEED=y
35 40  
36 41 CONFIG_CMD_GPIO=y
37 42 CONFIG_DM_GPIO=y
configs/imx8qxp_ddr3_arm2_defconfig
Diff comments   View file @ 2962500
... ... @@ -27,11 +27,15 @@
27 27  
28 28 CONFIG_CMD_USB_MASS_STORAGE=y
29 29 CONFIG_USB_GADGET=y
30   -CONFIG_CI_UDC=y
  30 +# CONFIG_CI_UDC=y
31 31 CONFIG_USB_GADGET_DOWNLOAD=y
32 32 CONFIG_G_DNL_MANUFACTURER="FSL"
33 33 CONFIG_G_DNL_VENDOR_NUM=0x0525
34 34 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  35 +
  36 +CONFIG_USB_CDNS3=y
  37 +CONFIG_USB_CDNS3_GADGET=y
  38 +CONFIG_USB_GADGET_DUALSPEED=y
35 39  
36 40 CONFIG_CMD_GPIO=y
37 41 CONFIG_DM_GPIO=y
configs/imx8qxp_lpddr4_arm2_defconfig
Diff comments   View file @ 2962500
... ... @@ -27,11 +27,15 @@
27 27  
28 28 CONFIG_CMD_USB_MASS_STORAGE=y
29 29 CONFIG_USB_GADGET=y
30   -CONFIG_CI_UDC=y
  30 +# CONFIG_CI_UDC=y
31 31 CONFIG_USB_GADGET_DOWNLOAD=y
32 32 CONFIG_G_DNL_MANUFACTURER="FSL"
33 33 CONFIG_G_DNL_VENDOR_NUM=0x0525
34 34 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  35 +
  36 +CONFIG_USB_CDNS3=y
  37 +CONFIG_USB_CDNS3_GADGET=y
  38 +CONFIG_USB_GADGET_DUALSPEED=y
35 39  
36 40 CONFIG_CMD_GPIO=y
37 41 CONFIG_DM_GPIO=y
configs/imx8qxp_lpddr4_arm2_fspi_defconfig
Diff comments   View file @ 2962500
... ... @@ -27,11 +27,15 @@
27 27  
28 28 CONFIG_CMD_USB_MASS_STORAGE=y
29 29 CONFIG_USB_GADGET=y
30   -CONFIG_CI_UDC=y
  30 +# CONFIG_CI_UDC=y
31 31 CONFIG_USB_GADGET_DOWNLOAD=y
32 32 CONFIG_G_DNL_MANUFACTURER="FSL"
33 33 CONFIG_G_DNL_VENDOR_NUM=0x0525
34 34 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  35 +
  36 +CONFIG_USB_CDNS3=y
  37 +CONFIG_USB_CDNS3_GADGET=y
  38 +CONFIG_USB_GADGET_DUALSPEED=y
35 39  
36 40 CONFIG_CMD_GPIO=y
37 41 CONFIG_DM_GPIO=y
configs/imx8qxp_lpddr4_arm2_nand_defconfig
Diff comments   View file @ 2962500
... ... @@ -26,11 +26,15 @@
26 26  
27 27 CONFIG_CMD_USB_MASS_STORAGE=y
28 28 CONFIG_USB_GADGET=y
29   -CONFIG_CI_UDC=y
  29 +# CONFIG_CI_UDC=y
30 30 CONFIG_USB_GADGET_DOWNLOAD=y
31 31 CONFIG_G_DNL_MANUFACTURER="FSL"
32 32 CONFIG_G_DNL_VENDOR_NUM=0x0525
33 33 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  34 +
  35 +CONFIG_USB_CDNS3=y
  36 +CONFIG_USB_CDNS3_GADGET=y
  37 +CONFIG_USB_GADGET_DUALSPEED=y
34 38  
35 39 CONFIG_CMD_GPIO=y
36 40 CONFIG_DM_GPIO=y
configs/imx8qxp_mek_defconfig
Diff comments   View file @ 2962500
... ... @@ -30,11 +30,15 @@
30 30  
31 31 CONFIG_CMD_USB_MASS_STORAGE=y
32 32 CONFIG_USB_GADGET=y
33   -CONFIG_CI_UDC=y
  33 +# CONFIG_CI_UDC=y
34 34 CONFIG_USB_GADGET_DOWNLOAD=y
35 35 CONFIG_G_DNL_MANUFACTURER="FSL"
36 36 CONFIG_G_DNL_VENDOR_NUM=0x0525
37 37 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  38 +
  39 +CONFIG_USB_CDNS3=y
  40 +CONFIG_USB_CDNS3_GADGET=y
  41 +CONFIG_USB_GADGET_DUALSPEED=y
38 42  
39 43 CONFIG_CMD_GPIO=y
40 44 CONFIG_DM_GPIO=y
configs/imx8qxp_mek_fspi_defconfig
Diff comments   View file @ 2962500
... ... @@ -30,11 +30,15 @@
30 30  
31 31 CONFIG_CMD_USB_MASS_STORAGE=y
32 32 CONFIG_USB_GADGET=y
33   -CONFIG_CI_UDC=y
  33 +# CONFIG_CI_UDC=y
34 34 CONFIG_USB_GADGET_DOWNLOAD=y
35 35 CONFIG_G_DNL_MANUFACTURER="FSL"
36 36 CONFIG_G_DNL_VENDOR_NUM=0x0525
37 37 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
  38 +
  39 +CONFIG_USB_CDNS3=y
  40 +CONFIG_USB_CDNS3_GADGET=y
  41 +CONFIG_USB_GADGET_DUALSPEED=y
38 42  
39 43 CONFIG_CMD_GPIO=y
40 44 CONFIG_DM_GPIO=y