From 0093b3fcd83a77b18be2f8d7833a597032df6fdf Mon Sep 17 00:00:00 2001 From: Eric Nelson Date: Thu, 18 Jan 2018 07:47:32 -0700 Subject: [PATCH] mx6memcal: enable SDP support The initial implementation of mx6memcal reset the CPU after running the memory calibration procedure because the generic board has no information about which boot devices are available. Now that we have SDP support in SPL, use it to allow a full U-Boot to be uploaded (i.e. to use "mtest"). Signed-off-by: Eric Nelson Reviewed-by: Fabio Estevam --- board/freescale/mx6memcal/spl.c | 1 - configs/mx6memcal_defconfig | 10 ++++++++++ include/configs/mx6memcal.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c index 027da4fbbc..b4b50db772 100644 --- a/board/freescale/mx6memcal/spl.c +++ b/board/freescale/mx6memcal/spl.c @@ -453,5 +453,4 @@ void board_init_f(ulong dummy) display_calibration(&calibration); } } - reset_cpu(0); } diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index b27330c589..d3720dccdb 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -8,6 +8,10 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL" CONFIG_SPL=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set @@ -29,4 +33,10 @@ CONFIG_CMD_MEMTEST=y # CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_MMC is not set +CONFIG_USB=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="FSL" +CONFIG_USB_GADGET_VENDOR_NUM=0x0525 +CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 +CONFIG_CI_UDC=y CONFIG_REGEX=y diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h index f5238a52f5..28c67c493e 100644 --- a/include/configs/mx6memcal.h +++ b/include/configs/mx6memcal.h @@ -56,4 +56,6 @@ #define CONFIG_ENV_SIZE (8 * 1024) +#define CONFIG_MXC_USB_PORTSC PORT_PTS_UTMI + #endif /* __CONFIG_H */ -- 2.39.2