| Message ID | 1516286852-6132-2-git-send-email-eric@nelint.com |
|---|---|
| State | Accepted |
| Commit | 0093b3fcd83a77b18be2f8d7833a597032df6fdf |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,1/2] mx6memcal: launder through savedefconfig | expand |
On Thu, Jan 18, 2018 at 12:47 PM, Eric Nelson <eric@nelint.com> wrote: > 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 <eric@nelint.com> Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
On 18/01/2018 15:47, Eric Nelson wrote: > 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 <eric@nelint.com> > --- > 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 8ee89ff..805fdab 100644 > --- a/board/freescale/mx6memcal/spl.c > +++ b/board/freescale/mx6memcal/spl.c > @@ -452,5 +452,4 @@ void board_init_f(ulong dummy) > display_calibration(&calibration); > } > } > - reset_cpu(0); > } > diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig > index b27330c..d3720dc 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 f5238a5..28c67c4 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 */ > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/board/freescale/mx6memcal/spl.c b/board/freescale/mx6memcal/spl.c index 8ee89ff..805fdab 100644 --- a/board/freescale/mx6memcal/spl.c +++ b/board/freescale/mx6memcal/spl.c @@ -452,5 +452,4 @@ void board_init_f(ulong dummy) display_calibration(&calibration); } } - reset_cpu(0); } diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index b27330c..d3720dc 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 f5238a5..28c67c4 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 */
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 <eric@nelint.com> --- board/freescale/mx6memcal/spl.c | 1 - configs/mx6memcal_defconfig | 10 ++++++++++ include/configs/mx6memcal.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-)