From fb1ac7f8f8884a67eb7b60723a4aa6d02666a505 Mon Sep 17 00:00:00 2001 From: Troy Kisky <troy.kisky@boundarydevices.com> Date: Mon, 19 Aug 2019 18:55:09 -0700 Subject: [PATCH] nitrogen8m_som: use CONFIG_SPL_USB_SDP_SUPPORT Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> --- configs/nitrogen8m_som_2g_defconfig | 5 +++++ configs/nitrogen8m_som_4g_defconfig | 5 +++++ include/configs/nitrogen8m_som.h | 15 +++++---------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/configs/nitrogen8m_som_2g_defconfig b/configs/nitrogen8m_som_2g_defconfig index 5bb376a9874..1e9014d8754 100644 --- a/configs/nitrogen8m_som_2g_defconfig +++ b/configs/nitrogen8m_som_2g_defconfig @@ -23,6 +23,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg,DDR_MB CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y @@ -78,6 +81,8 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y diff --git a/configs/nitrogen8m_som_4g_defconfig b/configs/nitrogen8m_som_4g_defconfig index 0319c3907e4..ae79e632a04 100644 --- a/configs/nitrogen8m_som_4g_defconfig +++ b/configs/nitrogen8m_som_4g_defconfig @@ -23,6 +23,9 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg,DDR_MB CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_POWER_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_MEMTEST=y CONFIG_SYS_ALT_MEMTEST=y @@ -78,6 +81,8 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP=y diff --git a/include/configs/nitrogen8m_som.h b/include/configs/nitrogen8m_som.h index 87b976c59ec..c86b195711a 100644 --- a/include/configs/nitrogen8m_som.h +++ b/include/configs/nitrogen8m_som.h @@ -36,6 +36,7 @@ #define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */ +#undef CONFIG_BLK #undef CONFIG_DM_MMC #undef CONFIG_DM_PMIC #undef CONFIG_DM_PMIC_PFUZE100 @@ -139,22 +140,16 @@ /* USB configs */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_HAS_FSL_XHCI_USB - -#ifdef CONFIG_HAS_FSL_XHCI_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#endif - -#define CONFIG_USB_DWC3 -#define CONFIG_USB_DWC3_GADGET #define CONFIG_USBD_HS #define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USB_GADGET_VBUS_DRAW 2 -#define CONFIG_USB_GADGET_DUALSPEED #endif +#define CONFIG_USB_GADGET_VBUS_DRAW 2 + +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 + #define CONFIG_OF_SYSTEM_SETUP /* Framebuffer */ -- GitLab