Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Thu, Feb 18, 2016 at 05:42:29PM +0100, Guillaume Gardet wrote: > > > Le 18/02/2016 17:38, Nikita Kiryanov a écrit : > >On Thu, Feb 18, 2016 at 05:11:46PM +0100, Guillaume Gardet wrote: > >> > >>Le 18/02/2016 17:07, Nikita Kiryanov a écrit : > >>>On Thu, Feb 18, 2016 at 09:36:01AM -0500, Tom Rini wrote: > On Thu, Feb 18, 2016 at 04:25:29PM +0200, Nikita Kiryanov wrote: > >On Thu, Feb 18, 2016 at 02:31:08PM +0100, Guillaume Gardet wrote: > >>Le 18/02/2016 14:07, Nikita Kiryanov a écrit : > >>>On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: > Hi Tom, Nikita , > > Le 18/02/2016 10:19, Nikita Kiryanov a écrit : > >Hi Tom, Guillaume, > > > >On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: > >>On Wed, Feb 17, 2016 at 09:09:27AM +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, if > >>>available. > >>> > >>>It has been tested on a beaglebone black to boot on an EXT > >>>partition. > >>> > >>>Signed-off-by: Guillaume GARDET> >>>Cc: Tom Rini > >>>Cc: Nikita Kiryanov > >>>Cc: Igor Grinberg > >>>Cc: Paul Kocialkowski > >>>Cc: Pantelis Antoniou > >>>Cc: Simon Glass > >>>Cc: Matwey V. Kornilov > >>> > >>>--- > >>> 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..2eef0f2 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; > >>>+ /* Fall through */ > >>> case MMCSD_MODE_FS: > >>> debug("spl: mmc boot mode: fs\n"); > >>This also essentially reverts fd61d399. So Nikita, was there a > >>specific > >>use case that was broken before, or was the code just unclear in > >>intentions here? Thanks! > >There was no broken use case that I'm aware of. The change was made > >as > >part of a code improvement series and was meant to address what I > >consider to be bad and problematic design. Instead of reverting it > >though, how about implementing something similar to what I did in the > >main common/spl/spl.c:board_init_r()? You would have a weak function > >that will default to the original spl_boot_mode() if not overridden, > >and allow the user to define a sequence of boot modes otherwise. > The thing is you broke a wanted behavior currently in use. So, the > priority is to come back to the previous behavior. > >>>Could you add a comment indicating that this is wanted behavior that > >>>has a user, and who the user is? > >>Not sure what you mean. > >I mean something like: > >/* If raw mode fails, try fs mode. Some boards, such as beaglebone black, > > * depend on this funcitonality. > > */ > But it's not board specific, it's use-case specific. > >>>The comment I proposed does not suggest it's board specific, just that > >>>this specific use case is used by someone. > >>> > instead of shoving both SPL and U-Boot into the correct magic raw > location, just shove SPL there and let U-Boot itself be in the /boot > partition. This is just as applicable on say imx6 as it is on TI parts. > >>>I don't think that's clear enough that this is the purpose of the > >>>missing break statement. It's a little too implicit. What I'm suggesting > >>>is that we make it a bit more explicit, barring a rewrite. > >>So, maybe just: > >> /* If raw mode fails, try fs mode. */ > >>? > >That'll work too. > > If Tom is ok, I will send a V2. OK with me, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Le 18/02/2016 17:38, Nikita Kiryanov a écrit : On Thu, Feb 18, 2016 at 05:11:46PM +0100, Guillaume Gardet wrote: Le 18/02/2016 17:07, Nikita Kiryanov a écrit : On Thu, Feb 18, 2016 at 09:36:01AM -0500, Tom Rini wrote: On Thu, Feb 18, 2016 at 04:25:29PM +0200, Nikita Kiryanov wrote: On Thu, Feb 18, 2016 at 02:31:08PM +0100, Guillaume Gardet wrote: Le 18/02/2016 14:07, Nikita Kiryanov a écrit : On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: Hi Tom, Nikita , Le 18/02/2016 10:19, Nikita Kiryanov a écrit : Hi Tom, Guillaume, On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. It has been tested on a beaglebone black to boot on an EXT partition. Signed-off-by: Guillaume GARDETCc: Tom Rini Cc: Nikita Kiryanov Cc: Igor Grinberg Cc: Paul Kocialkowski Cc: Pantelis Antoniou Cc: Simon Glass Cc: Matwey V. Kornilov --- 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..2eef0f2 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; + /* Fall through */ case MMCSD_MODE_FS: debug("spl: mmc boot mode: fs\n"); This also essentially reverts fd61d399. So Nikita, was there a specific use case that was broken before, or was the code just unclear in intentions here? Thanks! There was no broken use case that I'm aware of. The change was made as part of a code improvement series and was meant to address what I consider to be bad and problematic design. Instead of reverting it though, how about implementing something similar to what I did in the main common/spl/spl.c:board_init_r()? You would have a weak function that will default to the original spl_boot_mode() if not overridden, and allow the user to define a sequence of boot modes otherwise. The thing is you broke a wanted behavior currently in use. So, the priority is to come back to the previous behavior. Could you add a comment indicating that this is wanted behavior that has a user, and who the user is? Not sure what you mean. I mean something like: /* If raw mode fails, try fs mode. Some boards, such as beaglebone black, * depend on this funcitonality. */ But it's not board specific, it's use-case specific. The comment I proposed does not suggest it's board specific, just that this specific use case is used by someone. instead of shoving both SPL and U-Boot into the correct magic raw location, just shove SPL there and let U-Boot itself be in the /boot partition. This is just as applicable on say imx6 as it is on TI parts. I don't think that's clear enough that this is the purpose of the missing break statement. It's a little too implicit. What I'm suggesting is that we make it a bit more explicit, barring a rewrite. So, maybe just: /* If raw mode fails, try fs mode. */ ? That'll work too. If Tom is ok, I will send a V2. Guillaume ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Thu, Feb 18, 2016 at 05:11:46PM +0100, Guillaume Gardet wrote: > > > Le 18/02/2016 17:07, Nikita Kiryanov a écrit : > >On Thu, Feb 18, 2016 at 09:36:01AM -0500, Tom Rini wrote: > >>On Thu, Feb 18, 2016 at 04:25:29PM +0200, Nikita Kiryanov wrote: > >>>On Thu, Feb 18, 2016 at 02:31:08PM +0100, Guillaume Gardet wrote: > > Le 18/02/2016 14:07, Nikita Kiryanov a écrit : > >On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: > >>Hi Tom, Nikita , > >> > >>Le 18/02/2016 10:19, Nikita Kiryanov a écrit : > >>>Hi Tom, Guillaume, > >>> > >>>On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: > On Wed, Feb 17, 2016 at 09:09:27AM +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, if > >available. > > > >It has been tested on a beaglebone black to boot on an EXT partition. > > > >Signed-off-by: Guillaume GARDET> >Cc: Tom Rini > >Cc: Nikita Kiryanov > >Cc: Igor Grinberg > >Cc: Paul Kocialkowski > >Cc: Pantelis Antoniou > >Cc: Simon Glass > >Cc: Matwey V. Kornilov > > > >--- > > 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..2eef0f2 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; > >+/* Fall through */ > > case MMCSD_MODE_FS: > > debug("spl: mmc boot mode: fs\n"); > This also essentially reverts fd61d399. So Nikita, was there a > specific > use case that was broken before, or was the code just unclear in > intentions here? Thanks! > >>>There was no broken use case that I'm aware of. The change was made as > >>>part of a code improvement series and was meant to address what I > >>>consider to be bad and problematic design. Instead of reverting it > >>>though, how about implementing something similar to what I did in the > >>>main common/spl/spl.c:board_init_r()? You would have a weak function > >>>that will default to the original spl_boot_mode() if not overridden, > >>>and allow the user to define a sequence of boot modes otherwise. > >>The thing is you broke a wanted behavior currently in use. So, the > >>priority is to come back to the previous behavior. > >Could you add a comment indicating that this is wanted behavior that > >has a user, and who the user is? > Not sure what you mean. > >>>I mean something like: > >>>/* If raw mode fails, try fs mode. Some boards, such as beaglebone black, > >>> * depend on this funcitonality. > >>> */ > >>But it's not board specific, it's use-case specific. > >The comment I proposed does not suggest it's board specific, just that > >this specific use case is used by someone. > > > >>instead of shoving both SPL and U-Boot into the correct magic raw > >>location, just shove SPL there and let U-Boot itself be in the /boot > >>partition. This is just as applicable on say imx6 as it is on TI parts. > >I don't think that's clear enough that this is the purpose of the > >missing break statement. It's a little too implicit. What I'm suggesting > >is that we make it a bit more explicit, barring a rewrite. > > So, maybe just: > /* If raw mode fails, try fs mode. */ > ? That'll work too. > > > Guillaume > > > > >>-- > >>Tom > > > > > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Le 18/02/2016 17:07, Nikita Kiryanov a écrit : On Thu, Feb 18, 2016 at 09:36:01AM -0500, Tom Rini wrote: On Thu, Feb 18, 2016 at 04:25:29PM +0200, Nikita Kiryanov wrote: On Thu, Feb 18, 2016 at 02:31:08PM +0100, Guillaume Gardet wrote: Le 18/02/2016 14:07, Nikita Kiryanov a écrit : On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: Hi Tom, Nikita , Le 18/02/2016 10:19, Nikita Kiryanov a écrit : Hi Tom, Guillaume, On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. It has been tested on a beaglebone black to boot on an EXT partition. Signed-off-by: Guillaume GARDETCc: Tom Rini Cc: Nikita Kiryanov Cc: Igor Grinberg Cc: Paul Kocialkowski Cc: Pantelis Antoniou Cc: Simon Glass Cc: Matwey V. Kornilov --- 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..2eef0f2 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; + /* Fall through */ case MMCSD_MODE_FS: debug("spl: mmc boot mode: fs\n"); This also essentially reverts fd61d399. So Nikita, was there a specific use case that was broken before, or was the code just unclear in intentions here? Thanks! There was no broken use case that I'm aware of. The change was made as part of a code improvement series and was meant to address what I consider to be bad and problematic design. Instead of reverting it though, how about implementing something similar to what I did in the main common/spl/spl.c:board_init_r()? You would have a weak function that will default to the original spl_boot_mode() if not overridden, and allow the user to define a sequence of boot modes otherwise. The thing is you broke a wanted behavior currently in use. So, the priority is to come back to the previous behavior. Could you add a comment indicating that this is wanted behavior that has a user, and who the user is? Not sure what you mean. I mean something like: /* If raw mode fails, try fs mode. Some boards, such as beaglebone black, * depend on this funcitonality. */ But it's not board specific, it's use-case specific. The comment I proposed does not suggest it's board specific, just that this specific use case is used by someone. instead of shoving both SPL and U-Boot into the correct magic raw location, just shove SPL there and let U-Boot itself be in the /boot partition. This is just as applicable on say imx6 as it is on TI parts. I don't think that's clear enough that this is the purpose of the missing break statement. It's a little too implicit. What I'm suggesting is that we make it a bit more explicit, barring a rewrite. So, maybe just: /* If raw mode fails, try fs mode. */ ? Guillaume -- Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Thu, Feb 18, 2016 at 09:36:01AM -0500, Tom Rini wrote: > On Thu, Feb 18, 2016 at 04:25:29PM +0200, Nikita Kiryanov wrote: > > On Thu, Feb 18, 2016 at 02:31:08PM +0100, Guillaume Gardet wrote: > > > > > > > > > Le 18/02/2016 14:07, Nikita Kiryanov a écrit : > > > >On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: > > > >>Hi Tom, Nikita , > > > >> > > > >>Le 18/02/2016 10:19, Nikita Kiryanov a écrit : > > > >>>Hi Tom, Guillaume, > > > >>> > > > >>>On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: > > > On Wed, Feb 17, 2016 at 09:09:27AM +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, if > > > >available. > > > > > > > >It has been tested on a beaglebone black to boot on an EXT partition. > > > > > > > >Signed-off-by: Guillaume GARDET> > > >Cc: Tom Rini > > > >Cc: Nikita Kiryanov > > > >Cc: Igor Grinberg > > > >Cc: Paul Kocialkowski > > > >Cc: Pantelis Antoniou > > > >Cc: Simon Glass > > > >Cc: Matwey V. Kornilov > > > > > > > >--- > > > > 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..2eef0f2 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; > > > >+/* Fall through */ > > > > case MMCSD_MODE_FS: > > > > debug("spl: mmc boot mode: fs\n"); > > > This also essentially reverts fd61d399. So Nikita, was there a > > > specific > > > use case that was broken before, or was the code just unclear in > > > intentions here? Thanks! > > > >>>There was no broken use case that I'm aware of. The change was made as > > > >>>part of a code improvement series and was meant to address what I > > > >>>consider to be bad and problematic design. Instead of reverting it > > > >>>though, how about implementing something similar to what I did in the > > > >>>main common/spl/spl.c:board_init_r()? You would have a weak function > > > >>>that will default to the original spl_boot_mode() if not overridden, > > > >>>and allow the user to define a sequence of boot modes otherwise. > > > >>The thing is you broke a wanted behavior currently in use. So, the > > > >>priority is to come back to the previous behavior. > > > >Could you add a comment indicating that this is wanted behavior that > > > >has a user, and who the user is? > > > > > > Not sure what you mean. > > > > I mean something like: > > /* If raw mode fails, try fs mode. Some boards, such as beaglebone black, > > * depend on this funcitonality. > > */ > > But it's not board specific, it's use-case specific. The comment I proposed does not suggest it's board specific, just that this specific use case is used by someone. > instead of shoving both SPL and U-Boot into the correct magic raw > location, just shove SPL there and let U-Boot itself be in the /boot > partition. This is just as applicable on say imx6 as it is on TI parts. I don't think that's clear enough that this is the purpose of the missing break statement. It's a little too implicit. What I'm suggesting is that we make it a bit more explicit, barring a rewrite. > > -- > Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Thu, Feb 18, 2016 at 04:25:29PM +0200, Nikita Kiryanov wrote: > On Thu, Feb 18, 2016 at 02:31:08PM +0100, Guillaume Gardet wrote: > > > > > > Le 18/02/2016 14:07, Nikita Kiryanov a écrit : > > >On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: > > >>Hi Tom, Nikita , > > >> > > >>Le 18/02/2016 10:19, Nikita Kiryanov a écrit : > > >>>Hi Tom, Guillaume, > > >>> > > >>>On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: > > On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. > > > > > >It has been tested on a beaglebone black to boot on an EXT partition. > > > > > >Signed-off-by: Guillaume GARDET> > >Cc: Tom Rini > > >Cc: Nikita Kiryanov > > >Cc: Igor Grinberg > > >Cc: Paul Kocialkowski > > >Cc: Pantelis Antoniou > > >Cc: Simon Glass > > >Cc: Matwey V. Kornilov > > > > > >--- > > > 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..2eef0f2 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; > > >+ /* Fall through */ > > > case MMCSD_MODE_FS: > > > debug("spl: mmc boot mode: fs\n"); > > This also essentially reverts fd61d399. So Nikita, was there a specific > > use case that was broken before, or was the code just unclear in > > intentions here? Thanks! > > >>>There was no broken use case that I'm aware of. The change was made as > > >>>part of a code improvement series and was meant to address what I > > >>>consider to be bad and problematic design. Instead of reverting it > > >>>though, how about implementing something similar to what I did in the > > >>>main common/spl/spl.c:board_init_r()? You would have a weak function > > >>>that will default to the original spl_boot_mode() if not overridden, > > >>>and allow the user to define a sequence of boot modes otherwise. > > >>The thing is you broke a wanted behavior currently in use. So, the > > >>priority is to come back to the previous behavior. > > >Could you add a comment indicating that this is wanted behavior that > > >has a user, and who the user is? > > > > Not sure what you mean. > > I mean something like: > /* If raw mode fails, try fs mode. Some boards, such as beaglebone black, > * depend on this funcitonality. > */ But it's not board specific, it's use-case specific. It's saying that instead of shoving both SPL and U-Boot into the correct magic raw location, just shove SPL there and let U-Boot itself be in the /boot partition. This is just as applicable on say imx6 as it is on TI parts. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Thu, Feb 18, 2016 at 02:31:08PM +0100, Guillaume Gardet wrote: > > > Le 18/02/2016 14:07, Nikita Kiryanov a écrit : > >On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: > >>Hi Tom, Nikita , > >> > >>Le 18/02/2016 10:19, Nikita Kiryanov a écrit : > >>>Hi Tom, Guillaume, > >>> > >>>On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: > On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. > > > >It has been tested on a beaglebone black to boot on an EXT partition. > > > >Signed-off-by: Guillaume GARDET> >Cc: Tom Rini > >Cc: Nikita Kiryanov > >Cc: Igor Grinberg > >Cc: Paul Kocialkowski > >Cc: Pantelis Antoniou > >Cc: Simon Glass > >Cc: Matwey V. Kornilov > > > >--- > > 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..2eef0f2 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; > >+/* Fall through */ > > case MMCSD_MODE_FS: > > debug("spl: mmc boot mode: fs\n"); > This also essentially reverts fd61d399. So Nikita, was there a specific > use case that was broken before, or was the code just unclear in > intentions here? Thanks! > >>>There was no broken use case that I'm aware of. The change was made as > >>>part of a code improvement series and was meant to address what I > >>>consider to be bad and problematic design. Instead of reverting it > >>>though, how about implementing something similar to what I did in the > >>>main common/spl/spl.c:board_init_r()? You would have a weak function > >>>that will default to the original spl_boot_mode() if not overridden, > >>>and allow the user to define a sequence of boot modes otherwise. > >>The thing is you broke a wanted behavior currently in use. So, the priority > >>is to come back to the previous behavior. > >Could you add a comment indicating that this is wanted behavior that > >has a user, and who the user is? > > Not sure what you mean. I mean something like: /* If raw mode fails, try fs mode. Some boards, such as beaglebone black, * depend on this funcitonality. */ > I think, "Fall through" code comment explains it (as you done with > MMCSD_MODE_EMMCBOOT). That was meant to communicate a very different type of coupling between the two cases though.. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Le 18/02/2016 14:07, Nikita Kiryanov a écrit : On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: Hi Tom, Nikita , Le 18/02/2016 10:19, Nikita Kiryanov a écrit : Hi Tom, Guillaume, On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. It has been tested on a beaglebone black to boot on an EXT partition. Signed-off-by: Guillaume GARDETCc: Tom Rini Cc: Nikita Kiryanov Cc: Igor Grinberg Cc: Paul Kocialkowski Cc: Pantelis Antoniou Cc: Simon Glass Cc: Matwey V. Kornilov --- 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..2eef0f2 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; + /* Fall through */ case MMCSD_MODE_FS: debug("spl: mmc boot mode: fs\n"); This also essentially reverts fd61d399. So Nikita, was there a specific use case that was broken before, or was the code just unclear in intentions here? Thanks! There was no broken use case that I'm aware of. The change was made as part of a code improvement series and was meant to address what I consider to be bad and problematic design. Instead of reverting it though, how about implementing something similar to what I did in the main common/spl/spl.c:board_init_r()? You would have a weak function that will default to the original spl_boot_mode() if not overridden, and allow the user to define a sequence of boot modes otherwise. The thing is you broke a wanted behavior currently in use. So, the priority is to come back to the previous behavior. Could you add a comment indicating that this is wanted behavior that has a user, and who the user is? Not sure what you mean. I think, "Fall through" code comment explains it (as you done with MMCSD_MODE_EMMCBOOT). I (and openSUSE ARM) do not pretend to be the only user(s) of this feature, so I won't add my name there. If you mean commit message, I think the current one is enough. Guillaume Then, if someone (you, me or someone else) wants to improve this code, the way you suggested, it would be very nice. But it will need a lot more work, tests and reviews. Guillaume -- Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Thu, Feb 18, 2016 at 11:06:32AM +0100, Guillaume Gardet wrote: > Hi Tom, Nikita , > > Le 18/02/2016 10:19, Nikita Kiryanov a écrit : > >Hi Tom, Guillaume, > > > >On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: > >>On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. > >>> > >>>It has been tested on a beaglebone black to boot on an EXT partition. > >>> > >>>Signed-off-by: Guillaume GARDET> >>>Cc: Tom Rini > >>>Cc: Nikita Kiryanov > >>>Cc: Igor Grinberg > >>>Cc: Paul Kocialkowski > >>>Cc: Pantelis Antoniou > >>>Cc: Simon Glass > >>>Cc: Matwey V. Kornilov > >>> > >>>--- > >>> 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..2eef0f2 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; > >>>+ /* Fall through */ > >>> case MMCSD_MODE_FS: > >>> debug("spl: mmc boot mode: fs\n"); > >>This also essentially reverts fd61d399. So Nikita, was there a specific > >>use case that was broken before, or was the code just unclear in > >>intentions here? Thanks! > >There was no broken use case that I'm aware of. The change was made as > >part of a code improvement series and was meant to address what I > >consider to be bad and problematic design. Instead of reverting it > >though, how about implementing something similar to what I did in the > >main common/spl/spl.c:board_init_r()? You would have a weak function > >that will default to the original spl_boot_mode() if not overridden, > >and allow the user to define a sequence of boot modes otherwise. > > The thing is you broke a wanted behavior currently in use. So, the priority > is to come back to the previous behavior. Could you add a comment indicating that this is wanted behavior that has a user, and who the user is? > Then, if someone (you, me or someone else) wants to improve this code, the > way you suggested, it would be very nice. > But it will need a lot more work, tests and reviews. > > > Guillaume > > > > >>-- > >>Tom > > > > > ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Hi Tom, Nikita , Le 18/02/2016 10:19, Nikita Kiryanov a écrit : Hi Tom, Guillaume, On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. It has been tested on a beaglebone black to boot on an EXT partition. Signed-off-by: Guillaume GARDETCc: Tom Rini Cc: Nikita Kiryanov Cc: Igor Grinberg Cc: Paul Kocialkowski Cc: Pantelis Antoniou Cc: Simon Glass Cc: Matwey V. Kornilov --- 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..2eef0f2 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; + /* Fall through */ case MMCSD_MODE_FS: debug("spl: mmc boot mode: fs\n"); This also essentially reverts fd61d399. So Nikita, was there a specific use case that was broken before, or was the code just unclear in intentions here? Thanks! There was no broken use case that I'm aware of. The change was made as part of a code improvement series and was meant to address what I consider to be bad and problematic design. Instead of reverting it though, how about implementing something similar to what I did in the main common/spl/spl.c:board_init_r()? You would have a weak function that will default to the original spl_boot_mode() if not overridden, and allow the user to define a sequence of boot modes otherwise. The thing is you broke a wanted behavior currently in use. So, the priority is to come back to the previous behavior. Then, if someone (you, me or someone else) wants to improve this code, the way you suggested, it would be very nice. But it will need a lot more work, tests and reviews. Guillaume -- Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Hi Tom, Guillaume, On Wed, Feb 17, 2016 at 03:27:22PM -0500, Tom Rini wrote: > On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. > > > > It has been tested on a beaglebone black to boot on an EXT partition. > > > > Signed-off-by: Guillaume GARDET> > Cc: Tom Rini > > Cc: Nikita Kiryanov > > Cc: Igor Grinberg > > Cc: Paul Kocialkowski > > Cc: Pantelis Antoniou > > Cc: Simon Glass > > Cc: Matwey V. Kornilov > > > > --- > > 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..2eef0f2 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; > > + /* Fall through */ > > case MMCSD_MODE_FS: > > debug("spl: mmc boot mode: fs\n"); > > This also essentially reverts fd61d399. So Nikita, was there a specific > use case that was broken before, or was the code just unclear in > intentions here? Thanks! There was no broken use case that I'm aware of. The change was made as part of a code improvement series and was meant to address what I consider to be bad and problematic design. Instead of reverting it though, how about implementing something similar to what I did in the main common/spl/spl.c:board_init_r()? You would have a weak function that will default to the original spl_boot_mode() if not overridden, and allow the user to define a sequence of boot modes otherwise. > > -- > Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Wed, Feb 17, 2016 at 09:09:27AM +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, if available. > > It has been tested on a beaglebone black to boot on an EXT partition. > > Signed-off-by: Guillaume GARDET> Cc: Tom Rini > Cc: Nikita Kiryanov > Cc: Igor Grinberg > Cc: Paul Kocialkowski > Cc: Pantelis Antoniou > Cc: Simon Glass > Cc: Matwey V. Kornilov > > --- > 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..2eef0f2 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; > + /* Fall through */ > case MMCSD_MODE_FS: > debug("spl: mmc boot mode: fs\n"); This also essentially reverts fd61d399. So Nikita, was there a specific use case that was broken before, or was the code just unclear in intentions here? Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
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, if available. It has been tested on a beaglebone black to boot on an EXT partition. Signed-off-by: Guillaume GARDETCc: Tom Rini Cc: Nikita Kiryanov Cc: Igor Grinberg Cc: Paul Kocialkowski Cc: Pantelis Antoniou Cc: Simon Glass Cc: Matwey V. Kornilov --- 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..2eef0f2 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; + /* Fall through */ case MMCSD_MODE_FS: debug("spl: mmc boot mode: fs\n"); -- 1.8.4.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Le 15/12/2014 10:01, Guillaume Gardet a écrit : Le 15/12/2014 09:43, Guillaume Gardet a écrit : Hi Robert, Le 12/12/2014 22:49, Robert Nelson a écrit : On Tue, Nov 18, 2014 at 3:44 AM, Guillaume GARDET guillaume.gar...@free.fr wrote: In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). HI Guillaume, What mode did you test this is? (RAW or FS) I did test for FS for sure, but not sure about raw mode. In Raw Mode with the omap5_uevm beaglebone black, i've had to revert this. (I'm using RAW mode by default) U-Boot SPL 2015.01-rc3-dirty (Dec 08 2014 - 20:04:01) OMAP5432 ES2.0 SPL: Please implement spl_start_uboot() for your board SPL: Direct Linux boot not active! spl: wrong MMC boot mode ### ERROR ### Please RESET the board ### Ok, I think I found the problem. Could you test the following patch, please? http://guillaume.gardet.free.fr/u-boot/0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch If this patch fix your boot problem, I will send it ASAP. Just updated the patch with a better fix: http://guillaume.gardet.free.fr/u-boot/0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch As I was able to test this patch, I just sent it: https://patchwork.ozlabs.org/patch/421858/ Guillaume ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Hi Robert, Le 12/12/2014 22:49, Robert Nelson a écrit : On Tue, Nov 18, 2014 at 3:44 AM, Guillaume GARDET guillaume.gar...@free.fr wrote: In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). HI Guillaume, What mode did you test this is? (RAW or FS) I did test for FS for sure, but not sure about raw mode. In Raw Mode with the omap5_uevm beaglebone black, i've had to revert this. (I'm using RAW mode by default) U-Boot SPL 2015.01-rc3-dirty (Dec 08 2014 - 20:04:01) OMAP5432 ES2.0 SPL: Please implement spl_start_uboot() for your board SPL: Direct Linux boot not active! spl: wrong MMC boot mode ### ERROR ### Please RESET the board ### Ok, I think I found the problem. Could you test the following patch, please? http://guillaume.gardet.free.fr/u-boot/0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch If this patch fix your boot problem, I will send it ASAP. Guillaume ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Le 15/12/2014 09:43, Guillaume Gardet a écrit : Hi Robert, Le 12/12/2014 22:49, Robert Nelson a écrit : On Tue, Nov 18, 2014 at 3:44 AM, Guillaume GARDET guillaume.gar...@free.fr wrote: In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). HI Guillaume, What mode did you test this is? (RAW or FS) I did test for FS for sure, but not sure about raw mode. In Raw Mode with the omap5_uevm beaglebone black, i've had to revert this. (I'm using RAW mode by default) U-Boot SPL 2015.01-rc3-dirty (Dec 08 2014 - 20:04:01) OMAP5432 ES2.0 SPL: Please implement spl_start_uboot() for your board SPL: Direct Linux boot not active! spl: wrong MMC boot mode ### ERROR ### Please RESET the board ### Ok, I think I found the problem. Could you test the following patch, please? http://guillaume.gardet.free.fr/u-boot/0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch If this patch fix your boot problem, I will send it ASAP. Just updated the patch with a better fix: http://guillaume.gardet.free.fr/u-boot/0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch Guillaume ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
On Tue, Nov 18, 2014 at 3:44 AM, Guillaume GARDET guillaume.gar...@free.fr wrote: In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). HI Guillaume, What mode did you test this is? (RAW or FS) In Raw Mode with the omap5_uevm beaglebone black, i've had to revert this. (I'm using RAW mode by default) U-Boot SPL 2015.01-rc3-dirty (Dec 08 2014 - 20:04:01) OMAP5432 ES2.0 SPL: Please implement spl_start_uboot() for your board SPL: Direct Linux boot not active! spl: wrong MMC boot mode ### ERROR ### Please RESET the board ### Disk setup, I'm using sudo dd if=/dev/zero of=${DISK} bs=1M count=10 sudo dd if=./u-boot/MLO of=${DISK} count=1 seek=1 conv=notrunc bs=128k sudo dd if=./u-boot/u-boot.img of=${DISK} count=2 seek=1 conv=notrunc bs=384k sudo sfdisk --in-order --Linux --unit M ${DISK} -__EOF__ 1,,0x83,* __EOF__ Regards, -- Robert Nelson http://www.rcn-ee.com/ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
Ping. Just a friendly reminder. Guillaume Le 18/11/2014 10:44, Guillaume GARDET a écrit : In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). Signed-off-by: Guillaume GARDET guillaume.gar...@free.fr Cc: Tom Rini tr...@ti.com --- common/spl/spl_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ee71f79..2c34b75 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -101,7 +101,8 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) - } else if (boot_mode == MMCSD_MODE_FS) { + } + if (err || boot_mode == MMCSD_MODE_FS) { debug(boot mode - FS\n); #ifdef CONFIG_SPL_FAT_SUPPORT #ifdef CONFIG_SPL_OS_BOOT ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available
In SPL MMC, boot modes are exclusive. So, if MMCSD_MODE_RAW fails, the board hangs. This patch allows to try MMCSD_MODE_FS then, if available. It has been tested on a pandaboard (rev. A3). Signed-off-by: Guillaume GARDET guillaume.gar...@free.fr Cc: Tom Rini tr...@ti.com --- common/spl/spl_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ee71f79..2c34b75 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -101,7 +101,8 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) - } else if (boot_mode == MMCSD_MODE_FS) { + } + if (err || boot_mode == MMCSD_MODE_FS) { debug(boot mode - FS\n); #ifdef CONFIG_SPL_FAT_SUPPORT #ifdef CONFIG_SPL_OS_BOOT -- 1.8.4.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot