summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2018-04-16 12:31:47 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2018-04-17 09:13:06 +0200
commit39c51e059c9e29eb04c637bda2e15181e18fa1fe (patch)
treed98bf4c4498cf138619399e68372caa88d74fdd9 /arch
parentcec5e909a1b25d7d06f384fc323bcaee4ffb9e3d (diff)
downloadbarebox-39c51e059c9e29eb04c637bda2e15181e18fa1fe.tar.gz
barebox-39c51e059c9e29eb04c637bda2e15181e18fa1fe.tar.xz
ARM: i.MX7: boot: Fix SPI-NOR/QSPI boot source mixup
As per "Table 6-33. Boot device selection" from "i.MX 7Dual Applications Processor Reference Manual, Rev. 1, 01/2018" QSPI is encoded with 0b0100 and Serial ROM with 0b0110. Fix the original code to use correct values. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/boot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index c04b671a80..d608a0a357 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -432,11 +432,11 @@ void imx7_get_boot_source(enum bootsource *src, int *instance)
case 3:
*src = BOOTSOURCE_NAND;
break;
- case 4:
+ case 6:
*src = BOOTSOURCE_SPI_NOR,
*instance = (sbmr1 >> 9 & 0x7);
break;
- case 6:
+ case 4:
*src = BOOTSOURCE_SPI; /* Really: qspi */
break;
case 5: