public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/3] ARM: imx: Add QSPI boot mode for i.MX6UL/ULL
@ 2019-09-20 16:09 Stefan Roese
  2019-09-20 16:09 ` [U-Boot] [PATCH 2/3] ARM: imx: arch/arm/mach-imx/spl_qspi.cfg Stefan Roese
  2019-09-20 16:09 ` [U-Boot] [PATCH 3/3] Kconfig: Set default BUILD_TARGET for ARCH_MX6 with SPL Stefan Roese
  0 siblings, 2 replies; 3+ messages in thread
From: Stefan Roese @ 2019-09-20 16:09 UTC (permalink / raw)
  To: u-boot

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>
---
 arch/arm/mach-imx/spl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index 1f230aca33..0ae7db585b 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;
 }
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH 2/3] ARM: imx: arch/arm/mach-imx/spl_qspi.cfg
  2019-09-20 16:09 [U-Boot] [PATCH 1/3] ARM: imx: Add QSPI boot mode for i.MX6UL/ULL Stefan Roese
@ 2019-09-20 16:09 ` Stefan Roese
  2019-09-20 16:09 ` [U-Boot] [PATCH 3/3] Kconfig: Set default BUILD_TARGET for ARCH_MX6 with SPL Stefan Roese
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2019-09-20 16:09 UTC (permalink / raw)
  To: u-boot

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.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 arch/arm/mach-imx/spl_qspi.cfg | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 arch/arm/mach-imx/spl_qspi.cfg

diff --git a/arch/arm/mach-imx/spl_qspi.cfg b/arch/arm/mach-imx/spl_qspi.cfg
new file mode 100644
index 0000000000..88956e626f
--- /dev/null
+++ b/arch/arm/mach-imx/spl_qspi.cfg
@@ -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
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH 3/3] Kconfig: Set default BUILD_TARGET for ARCH_MX6 with SPL
  2019-09-20 16:09 [U-Boot] [PATCH 1/3] ARM: imx: Add QSPI boot mode for i.MX6UL/ULL Stefan Roese
  2019-09-20 16:09 ` [U-Boot] [PATCH 2/3] ARM: imx: arch/arm/mach-imx/spl_qspi.cfg Stefan Roese
@ 2019-09-20 16:09 ` Stefan Roese
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Roese @ 2019-09-20 16:09 UTC (permalink / raw)
  To: u-boot

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

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Kconfig b/Kconfig
index 1f0904f704..66b059f749 100644
--- a/Kconfig
+++ b/Kconfig
@@ -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
-- 
2.23.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-09-20 16:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-20 16:09 [U-Boot] [PATCH 1/3] ARM: imx: Add QSPI boot mode for i.MX6UL/ULL Stefan Roese
2019-09-20 16:09 ` [U-Boot] [PATCH 2/3] ARM: imx: arch/arm/mach-imx/spl_qspi.cfg Stefan Roese
2019-09-20 16:09 ` [U-Boot] [PATCH 3/3] Kconfig: Set default BUILD_TARGET for ARCH_MX6 with SPL Stefan Roese

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox