summaryrefslogtreecommitdiff
path: root/common/spl
diff options
context:
space:
mode:
authorGuillaume GARDET <guillaume.gardet@free.fr>2016-02-18 18:17:36 +0100
committerTom Rini <trini@konsulko.com>2016-02-19 09:31:37 -0500
commit86a0df732853d1a11eb3eaa3cda688d9ef7b34e5 (patch)
treedde72e7be424338f953c092aec05172ca5d33ba3 /common/spl
parentcf432dd5953e9ddf06759565c80fed470882da6d (diff)
spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS
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>
Diffstat (limited to 'common/spl')
-rw-r--r--common/spl/spl_mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index c3931c6c4d..c27a250251 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -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");