summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Weitzel <j.weitzel@phytec.de>2011-04-15 11:28:16 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-04-18 09:27:36 +0200
commit61a2ccfbaecbdf9add16f132c5eeaee11d41ea70 (patch)
tree6dee3f6824ceb81853ba40bc659a8a57bc8a7d48
parent342c8de8f58ba666c5539ad5b004b51ce8592deb (diff)
downloadbarebox-61a2ccfbaecbdf9add16f132c5eeaee11d41ea70.tar.gz
barebox-61a2ccfbaecbdf9add16f132c5eeaee11d41ea70.tar.xz
OMAP4: change boot order
If OMAP4 fall back to MMC1 boot in bootmode 0x39 (NAND,USB,UART,MMC1) NAND and MMC bit in TRACING_VECTOR3 are set. With changed order it will detect boot from MMC. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-omap/omap4_generic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap/omap4_generic.c b/arch/arm/mach-omap/omap4_generic.c
index e4838e96..313e5e99 100644
--- a/arch/arm/mach-omap/omap4_generic.c
+++ b/arch/arm/mach-omap/omap4_generic.c
@@ -412,9 +412,9 @@ enum omap_boot_src omap4_bootsrc(void)
{
u32 bootsrc = readl(OMAP4_TRACING_VECTOR3);
- if (bootsrc & (1 << 3))
- return OMAP_BOOTSRC_NAND;
if (bootsrc & (1 << 5))
return OMAP_BOOTSRC_MMC1;
+ if (bootsrc & (1 << 3))
+ return OMAP_BOOTSRC_NAND;
return OMAP_BOOTSRC_UNKNOWN;
}