| Message ID | 1455815856-5654-1-git-send-email-guillaume.gardet@free.fr |
|---|---|
| State | Accepted |
| Commit | 86a0df732853d1a11eb3eaa3cda688d9ef7b34e5 |
| Delegated to: | Tom Rini |
| Headers | show |
On Thu, Feb 18, 2016 at 06:17:36PM +0100, Guillaume GARDET wrote: > 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. Acked-by: Nikita Kiryanov <nikita@compulab.co.il> > > 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> > > --- > Changes in V2: > - Replace "/* Fall through */" comment by: > "/* If RAW mode fails, try FS mode. */" > > common/spl/spl_mmc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c > index c3931c6..c27a250 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"); > > -- > 1.8.4.5 >
On Thu, Feb 18, 2016 at 06:17:36PM +0100, Guillaume GARDET wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index c3931c6..c27a250 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");
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> --- Changes in V2: - Replace "/* Fall through */" comment by: "/* If RAW mode fails, try FS mode. */" common/spl/spl_mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)