From 962c78b1dfa6cd69333cad52c9298a3e1f85f606 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 15 Aug 2017 17:49:43 -0700 Subject: [PATCH] imx: use BOOT_DEVICE_BOARD instead of UART i.MX 6 serial downloader is not necessarily booting via UART but can also boot from USB. In fact only some i.MX chips have serial downloader support via UART (e.g. 6UL/ULL and Vybrid) but all of them have serial downloader support via USB. Use the more appropriate BOOT_DEVICE_BOARD define which is used for ROM provided recovery mechanisms in general. Signed-off-by: Stefan Agner --- arch/arm/mach-imx/spl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 836b334fa9..bcd1033fdb 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -27,7 +27,7 @@ u32 spl_boot_device(void) * BOOT_MODE - see IMX6DQRM Table 8-1 */ if (((bmode >> 24) & 0x03) == 0x01) /* Serial Downloader */ - return BOOT_DEVICE_UART; + return BOOT_DEVICE_BOARD; /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */ switch ((reg & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { @@ -43,7 +43,7 @@ u32 spl_boot_device(void) } /* Reserved: Used to force Serial Downloader */ case IMX6_BMODE_RESERVED: - return BOOT_DEVICE_UART; + return BOOT_DEVICE_BOARD; /* SATA: See 8.5.4, Table 8-20 */ case IMX6_BMODE_SATA: return BOOT_DEVICE_SATA; -- 2.39.5