summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Weitzel <j.weitzel@phytec.de>2013-06-21 15:47:42 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-06-23 21:29:55 +0200
commitd17f5850642d874207a51080ca1f6eb9f4ecf1f3 (patch)
tree1bf6ab0a89e80c59241d38bc5417811a27222690
parent00285fecd47ace5a3511235b4a3c4e7607a676b7 (diff)
downloadbarebox-stable/v2013.06.tar.gz
OMAP4: fix omap4_bootsource regressionstable/v2013.06
commit d7a913469c34553e96c887f8a9934bacd794e81c breaks boot source detection for pcm049. The tracing vectors shows all tested boot sources, so order is important. By not returning but overwriting src we effectively reversed the order if more than one flag is set. 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 3d6ec25..7d71fdc 100644
--- a/arch/arm/mach-omap/omap4_generic.c
+++ b/arch/arm/mach-omap/omap4_generic.c
@@ -508,9 +508,9 @@ static int omap4_bootsource(void)
if (bootsrc & (1 << 5))
src = BOOTSOURCE_MMC;
- if (bootsrc & (1 << 3))
+ else if (bootsrc & (1 << 3))
src = BOOTSOURCE_NAND;
- if (bootsrc & (1<<20))
+ else if (bootsrc & (1<<20))
src = BOOTSOURCE_USB;
bootsource_set(src);
bootsource_set_instance(0);