From: Stefan Roese <sr@denx.de>
Date: Fri, 20 Sep 2019 16:09:08 +0000 (+0200)
Subject: ARM: imx: Add QSPI boot mode for i.MX6UL/ULL
X-Git-Tag: v2020.01-rc1~33^2~66
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d10d1386a0fae143ee96dee69bde2e63309913fb;p=oweals%2Fu-boot.git

ARM: imx: Add QSPI boot mode for i.MX6UL/ULL

This patch adds the missing boot mode detection for QSPI boot on
i.MX6UL/ULL. Without it, booting with SPL from QSPI NOR does not work.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
---

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index cda719226a..f33b9f0962 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -94,6 +94,11 @@ u32 spl_boot_device(void)
 	/* NAND Flash: 8.5.2, Table 8-10 */
 	case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX:
 		return BOOT_DEVICE_NAND;
+#if defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)
+	/* QSPI boot */
+	case IMX6_BMODE_QSPI:
+		return BOOT_DEVICE_SPI;
+#endif
 	}
 	return BOOT_DEVICE_NONE;
 }