diff options
| author | Jan Weitzel <j.weitzel@phytec.de> | 2013-06-21 15:47:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-23 21:29:45 +0200 |
| commit | d10f26a5ffc2ef636feff57a01fc89b002fc6c22 (patch) | |
| tree | a33442e25ce8c3e50acaf8b96e16a710c07b906a /arch | |
| parent | 7c3603a199873319cbff82fe07a887ccf3452b9b (diff) | |
| download | barebox-d10f26a5ffc2ef636feff57a01fc89b002fc6c22.tar.gz barebox-d10f26a5ffc2ef636feff57a01fc89b002fc6c22.tar.xz | |
OMAP4: fix omap4_bootsource regression
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap/omap4_generic.c | 4 |
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 3d6ec25c93..7d71fdc201 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); |