We don't need to check if the boot source is NAND in cases when we
already know for a fact that we booted from something else. To avoid
that, move the NAND check to be done inside of default branch of
the preceeding switch statement.

Signed-off-by: Andrey Smirnov <andrew.smir...@gmail.com>
---
 arch/arm/mach-imx/boot.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c
index a5dff77df..f84be5c68 100644
--- a/arch/arm/mach-imx/boot.c
+++ b/arch/arm/mach-imx/boot.c
@@ -237,13 +237,11 @@ void imx53_get_boot_source(enum bootsource *src, int 
*instance)
                *src = BOOTSOURCE_MMC;
                break;
        default:
+               if (imx53_bootsource_nand(cfg1))
+                       *src = BOOTSOURCE_NAND;
                break;
        }
 
-       if (imx53_bootsource_nand(cfg1))
-               *src = BOOTSOURCE_NAND;
-
-
        switch (*src) {
        case BOOTSOURCE_MMC:
        case BOOTSOURCE_SPI:
@@ -321,11 +319,10 @@ void imx6_get_boot_source(enum bootsource *src, int 
*instance)
                *instance = (sbmr1 >> 11) & 0x3;
                break;
        default:
+               if (imx53_bootsource_nand(sbmr1))
+                       *src = BOOTSOURCE_NAND;
                break;
        }
-
-       if (imx53_bootsource_nand(sbmr1))
-               *src = BOOTSOURCE_NAND;
 }
 
 #define IMX7_SRC_SBMR1 0x58
-- 
2.14.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to