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@xxxxxxxxx> --- 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 bf1f1a7..4878aec 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); -- 1.7.0.4 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
