summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorAhmad Fatoum <ahmad@a3f.at>2020-04-27 09:13:51 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2020-05-12 07:34:10 +0200
commitb507a305683f7b4c7a9a0ba9aab0b114e298e2de (patch)
tree091b7a031b28cc1f362ab64396bd3aa0883e1bcb /arch/arm/mach-imx
parent7a01db612ff1d8a285fe144a11c1f6a4fa4d7fe4 (diff)
downloadbarebox-b507a305683f7b4c7a9a0ba9aab0b114e298e2de.tar.gz
barebox-b507a305683f7b4c7a9a0ba9aab0b114e298e2de.tar.xz
ARM: i.MX6: boot: handle i.MX6UL differences
The i.MX6UL differs from the i.MX6Q in the interpretation of the first two values for BOOT_CFG(7, 4): +--------------+----------+----------+ |BOOT_CFG1(7,4)| 0x01 | 0x02 | |==============+==========+==========| | MX6Q | reserved | SATA | |--------------+----------+----------| | MX6UL | QSPI | reserved | +--------------+----------+----------+ The reserved (forced serial) values are handled in the previous commit. Add QSPI boot source detection now. Signed-off-by: Ahmad Fatoum <ahmad@a3f.at> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r--arch/arm/mach-imx/boot.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index dc52266eb7..ef868301cd 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -427,6 +427,9 @@ void imx6_get_boot_source(enum bootsource *src, int *instance)
}
switch (bootsrc) {
+ case 1: /* only reachable for i.MX6UL(L) */
+ *src = BOOTSOURCE_SPI; /* Really: qspi */
+ return;
case 2: /* unreachable for i.MX6UL(L) */
*src = BOOTSOURCE_HD;
break;