From 40f4839ce12adfc0223d6e3035cf9c3a4754a0ec Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Fri, 11 Dec 2015 17:30:42 +0100 Subject: imx_common: check for Serial Downloader in spl_boot_device Check for bmode before reading the boot device to check if a serial downloader is started, and returns UART if the serial downloader is set, letting SPL to wait for an image if CONFIG_SPL_YMODEM_SUPPORT is set. This allows to load again a SPL based board with imx_usb_loader together with a tool such as kermit. Signed-off-by: Stefano Babic CC: Tim Harvey CC: Fabio Estevam CC: Eric Nelson Reviewed-by: Eric Nelson Tested-by: Eric Nelson --- arch/arm/imx-common/spl.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch/arm/imx-common/spl.c') diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index ac6e40e83b..caa45cfabf 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -20,7 +20,15 @@ u32 spl_boot_device(void) struct src *psrc = (struct src *)SRC_BASE_ADDR; unsigned int gpr10_boot = readl(&psrc->gpr10) & (1 << 28); unsigned reg = gpr10_boot ? readl(&psrc->gpr9) : readl(&psrc->sbmr1); + unsigned int bmode = readl(&psrc->sbmr2); + /* + * Check for BMODE if serial downloader is enabled + * BOOT_MODE - see IMX6DQRM Table 8-1 + */ + if ((((bmode >> 24) & 0x03) == 0x01) || /* Serial Downloader */ + (gpr10_boot && (reg == 1))) + return BOOT_DEVICE_UART; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & 0x000000FF) >> 4) { /* EIM: See 8.5.1, Table 8-9 */ -- cgit v1.2.1