Skip to contentSkip to conversation

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

PATCH New Stefan Roese 1 participant 3 messages Sep 20, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 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.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
---
 arch/arm/mach-imx/spl.c | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/mach-imx/spl.c +5 -0
index 1f230aca33..0ae7db585b 100644
@@ -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;
 }
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/3 ARM: imx: arch/arm/mach-imx/spl_qspi.cfg

Similar to "spl_sd.cfg", this patch introduces "spl_qspi.cfg" so that all i.MX6 based boards can use it, when they use SPL and QSPI boot mode.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
---
 arch/arm/mach-imx/spl_qspi.cfg | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 arch/arm/mach-imx/spl_qspi.cfg
arch/arm/mach-imx/spl_qspi.cfg new file +17 -0
new file mode 100644
index 0000000000..88956e626f
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ */
+
+#define __ASSEMBLY__
+#include <config.h>
+
+IMAGE_VERSION	2
+BOOT_FROM	qspi
+
+/*
+ * Secure boot support
+ */
+#ifdef CONFIG_SECURE_BOOT
+CSF CONFIG_CSF_SIZE
+#endif
Signature · 1 line
2.23.0
#2 lore raw

PATCH 3/3 Kconfig: Set default BUILD_TARGET for ARCH_MX6 with SPL

In reply to Stefan Roese

Use BUILD_TARGET to automatically build "u-boot-with-spl.imx" on MX6 targets with SPL.

Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
---
 Kconfig | 1 +
 1 file changed, 1 insertion(+)
Kconfig +1 -0
index 1f0904f704..66b059f749 100644
@@ -256,6 +256,7 @@ config BUILD_TARGET
 				ARCH_SUNXI || RISCV)
 	default "u-boot.kwb" if KIRKWOOD
 	default "u-boot-with-spl.bin" if ARCH_AT91 && SPL_NAND_SUPPORT
+	default "u-boot-with-spl.imx" if ARCH_MX6 && SPL
 	help
 	  Some SoCs need special image types (e.g. U-Boot binary
 	  with a special header) as build targets. By defining
Signature · 1 line
2.23.0