diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-04-16 12:31:51 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-17 09:13:06 +0200 |
| commit | 6ca8e60430ba635492e7f856f1da3b1c6747e51d (patch) | |
| tree | 90b85d5b047c2172913ec8a927b31eae572a27b0 | |
| parent | c6aaff8b752801945286153cc3e539705a7062c3 (diff) | |
| download | barebox-6ca8e60430ba635492e7f856f1da3b1c6747e51d.tar.gz barebox-6ca8e60430ba635492e7f856f1da3b1c6747e51d.tar.xz | |
ARM: i.MX: boot: Check for NAND boot only if necessary on i.MX53, 6
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.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-imx/boot.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c index b5b901dce7..55e9a36fef 100644 --- a/arch/arm/mach-imx/boot.c +++ b/arch/arm/mach-imx/boot.c @@ -281,13 +281,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: @@ -376,11 +374,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; } void imx6_boot_save_loc(void) |