MLK-21846-1 imx8mq_arm2: Enable USB SDP in SPL

Enable the SPL SDP driver and SPL gadget drivers on iMX8MQ DDR4 and
DDR3L validation boards.

Signed-off-by: Ye Li <ye.li@nxp.com>

diff --git a/board/freescale/imx8mq_arm2/spl.c b/board/freescale/imx8mq_arm2/spl.c
index fbc4b30..cee93b2 100644 (file)
--- a/board/freescale/imx8mq_arm2/spl.c
+++ b/board/freescale/imx8mq_arm2/spl.c
@@ -197,11 +197,16 @@ int power_init_board(void)
 
 void spl_board_init(void)
 {
+#ifndef CONFIG_SPL_USB_SDP_SUPPORT
        /* Serial download mode */
        if (is_usb_boot()) {
                puts("Back to ROM, SDP\n");
                restore_boot_params();
        }
+#endif
+
+       init_usb_clk();
+
        puts("Normal Boot\n");
 }
 

diff --git a/configs/imx8mq_ddr3l_arm2_defconfig b/configs/imx8mq_ddr3l_arm2_defconfig
index d757380..294b098 100644 (file)
--- a/configs/imx8mq_ddr3l_arm2_defconfig
+++ b/configs/imx8mq_ddr3l_arm2_defconfig
@@ -46,6 +46,18 @@ CONFIG_NXP_TMU=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_IMX8M=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 
 CONFIG_SPI=y
 CONFIG_DM_SPI=y

diff --git a/configs/imx8mq_ddr4_arm2_defconfig b/configs/imx8mq_ddr4_arm2_defconfig
index 48bb611..594885b 100644 (file)
--- a/configs/imx8mq_ddr4_arm2_defconfig
+++ b/configs/imx8mq_ddr4_arm2_defconfig
@@ -46,6 +46,19 @@ CONFIG_NXP_TMU=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_IMX8M=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+
 CONFIG_CMD_NAND=y
 CONFIG_CMD_UBI=y
 

diff --git a/configs/imx8mq_ddr4_arm2_nand_defconfig b/configs/imx8mq_ddr4_arm2_nand_defconfig
index 033b708..21129a0 100644 (file)
--- a/configs/imx8mq_ddr4_arm2_nand_defconfig
+++ b/configs/imx8mq_ddr4_arm2_nand_defconfig
@@ -45,6 +45,19 @@ CONFIG_NXP_TMU=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x0525
+CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
+CONFIG_USB_GADGET_MANUFACTURER="FSL"
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_USB_SDP_SUPPORT=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_IMX8M=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
+
 CONFIG_CMD_NAND=y
 CONFIG_NAND_BOOT=y
 CONFIG_ENV_IS_IN_NAND=y

diff --git a/include/configs/imx8mq_arm2.h b/include/configs/imx8mq_arm2.h
index 1458fe1..2a53332 100644 (file)
--- a/include/configs/imx8mq_arm2.h
+++ b/include/configs/imx8mq_arm2.h
@@ -296,30 +296,18 @@
 
 /* USB configs */
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_USB_XHCI_IMX8M
-#define CONFIG_USB_XHCI_DWC3
-#define CONFIG_USB_XHCI_HCD
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 
 #define CONFIG_CMD_USB
 #define CONFIG_USB_STORAGE
 
-#define CONFIG_USB_DWC3
-#define CONFIG_USB_DWC3_GADGET
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_GADGET
 #define CONFIG_CMD_USB_MASS_STORAGE
 #define CONFIG_USB_GADGET_MASS_STORAGE
-#define CONFIG_USB_GADGET_DOWNLOAD
 #define CONFIG_USB_GADGET_VBUS_DRAW 2
-#define CONFIG_USB_GADGET_DUALSPEED
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 
-#define CONFIG_USB_GADGET_VENDOR_NUM   0x0525
-#define CONFIG_USB_GADGET_PRODUCT_NUM  0xa4a5
-#define CONFIG_USB_GADGET_MANUFACTURER "FSL"
-
 #endif
 
 #define CONFIG_OF_SYSTEM_SETUP