spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS
authorGuillaume GARDET <guillaume.gardet@free.fr>
Thu, 18 Feb 2016 17:17:36 +0000 (18:17 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 19 Feb 2016 14:31:37 +0000 (09:31 -0500)
Since commit fd61d39970b9901217efc7536d9f3a61b4e1752a:
        spl: mmc: add break statements in spl_mmc_load_image()
RAW and FS boot modes are now exclusive again. So, if MMCSD_MODE_RAW fails, the
board hangs. This patch allows to try MMCSD_MODE_FS then.

It has been tested on a beaglebone black to boot on an EXT partition.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Cc: Tom Rini <trini@konsulko.com>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Paul Kocialkowski <contact@paulk.fr>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Matwey V. Kornilov <matwey.kornilov@gmail.com>
Acked-by: Nikita Kiryanov <nikita@compulab.co.il>
common/spl/spl_mmc.c

index c3931c6c4d7761c598d45312e2b5ffc01a676231..c27a2502511cd9c92b093672af48a6a24c2d757e 100644 (file)
@@ -284,7 +284,7 @@ int spl_mmc_load_image(u32 boot_device)
                if (!err)
                        return err;
 #endif
-               break;
+               /* If RAW mode fails, try FS mode. */
        case MMCSD_MODE_FS:
                debug("spl: mmc boot mode: fs\n");