[U-Boot] [PATCH] spl: mmc: Fix raw boot mode (related to commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f)
As reported by Robert Nelson, commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f may break MMC RAW boot mode. This patch fixes the check path to fix MMC Raw boot mode. Tested raw boot mode and FS boot mode on a pandaboard (rev. A3). Reported-by: Robert Nelson Signed-off-by: Guillaume GARDET Cc: Tom Rini Cc: Robert Nelson --- common/spl/spl_mmc.c | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 7bae16b..c2e596b 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -172,11 +172,24 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw_sector(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #endif - } else { + } + + switch(boot_mode){ + case MMCSD_MODE_RAW: +#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) + case MMCSD_MODE_FS: +#endif +#ifdef CONFIG_SUPPORT_EMMC_BOOT + case MMCSD_MODE_EMMCBOOT: +#endif + /* Boot mode is ok. Nothing to do. */ + break; + case MMCSD_MODE_UNDEFINED: + default: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - puts("spl: wrong MMC boot mode\n"); + puts("spl: wrong MMC boot mode\n"); #endif - hang(); + hang(); } if (err) -- 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: mmc: Fix raw boot mode (related to commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f)
Hi Guillaume, > On Dec 16, 2014, at 13:00 , Guillaume GARDET wrote: > > As reported by Robert Nelson, commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f > may break MMC RAW boot mode. > This patch fixes the check path to fix MMC Raw boot mode. > > Tested raw boot mode and FS boot mode on a pandaboard (rev. A3). > > Reported-by: Robert Nelson > Signed-off-by: Guillaume GARDET > > Cc: Tom Rini > Cc: Robert Nelson > > --- > common/spl/spl_mmc.c | 19 --- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c > index 7bae16b..c2e596b 100644 > --- a/common/spl/spl_mmc.c > +++ b/common/spl/spl_mmc.c > @@ -172,11 +172,24 @@ void spl_mmc_load_image(void) > err = mmc_load_image_raw_sector(mmc, > CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); > #endif > - } else { > + } > + > + switch(boot_mode){ > + case MMCSD_MODE_RAW: > +#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) > + case MMCSD_MODE_FS: > +#endif > +#ifdef CONFIG_SUPPORT_EMMC_BOOT > + case MMCSD_MODE_EMMCBOOT: > +#endif > + /* Boot mode is ok. Nothing to do. */ > + break; > + case MMCSD_MODE_UNDEFINED: > + default: > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT > - puts("spl: wrong MMC boot mode\n"); > + puts("spl: wrong MMC boot mode\n"); > #endif > - hang(); > + hang(); > } > > if (err) > -- > 1.8.4.5 Applied, thanks — Pantelis ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: mmc: Fix raw boot mode (related to commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f)
On Tue, Dec 16, 2014 at 5:00 AM, Guillaume GARDET wrote: > As reported by Robert Nelson, commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f > may break MMC RAW boot mode. > This patch fixes the check path to fix MMC Raw boot mode. > > Tested raw boot mode and FS boot mode on a pandaboard (rev. A3). > > Reported-by: Robert Nelson > Signed-off-by: Guillaume GARDET > > Cc: Tom Rini > Cc: Robert Nelson Thanks Guillaume! Tested in raw & fs mode on a beaglebone black (microSD & eMMC) 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: mmc: Fix raw boot mode (related to commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f)
Le 16/12/2014 18:16, Robert Nelson a écrit : On Tue, Dec 16, 2014 at 5:00 AM, Guillaume GARDET wrote: As reported by Robert Nelson, commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f may break MMC RAW boot mode. This patch fixes the check path to fix MMC Raw boot mode. Tested raw boot mode and FS boot mode on a pandaboard (rev. A3). Reported-by: Robert Nelson Signed-off-by: Guillaume GARDET Cc: Tom Rini Cc: Robert Nelson Thanks Guillaume! Tested in raw & fs mode on a beaglebone black (microSD & eMMC) Thanks for testing it. :) You could add your "tested by" tag. Guillaume ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] spl: mmc: Fix raw boot mode (related to commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f)
On Tue, Dec 16, 2014 at 11:43 AM, Guillaume Gardet wrote: > > Le 16/12/2014 18:16, Robert Nelson a écrit : > >> On Tue, Dec 16, 2014 at 5:00 AM, Guillaume GARDET >> wrote: >>> >>> As reported by Robert Nelson, commit >>> 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f >>> may break MMC RAW boot mode. >>> This patch fixes the check path to fix MMC Raw boot mode. >>> >>> Tested raw boot mode and FS boot mode on a pandaboard (rev. A3). >>> >>> Reported-by: Robert Nelson >>> Signed-off-by: Guillaume GARDET Tested-by: Robert Nelson >>> >>> Cc: Tom Rini >>> Cc: Robert Nelson >> >> Thanks Guillaume! >> >> Tested in raw & fs mode on a beaglebone black (microSD & eMMC) > > > Thanks for testing it. :) You could add your "tested by" tag. > I always forget. ;) 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: mmc: Fix raw boot mode (related to commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f)
Ping. This patch is needed for the release. Otherwise, raw boot mode is broken if FAT/SPL support is also enabled. Guillaume Le 16/12/2014 12:00, Guillaume GARDET a écrit : As reported by Robert Nelson, commit 4c5bbc2328a24f5e1ee990c9a9527e48e5fb3b5f may break MMC RAW boot mode. This patch fixes the check path to fix MMC Raw boot mode. Tested raw boot mode and FS boot mode on a pandaboard (rev. A3). Reported-by: Robert Nelson Signed-off-by: Guillaume GARDET Cc: Tom Rini Cc: Robert Nelson --- common/spl/spl_mmc.c | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 7bae16b..c2e596b 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -172,11 +172,24 @@ void spl_mmc_load_image(void) err = mmc_load_image_raw_sector(mmc, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR); #endif - } else { + } + + switch(boot_mode){ + case MMCSD_MODE_RAW: +#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) + case MMCSD_MODE_FS: +#endif +#ifdef CONFIG_SUPPORT_EMMC_BOOT + case MMCSD_MODE_EMMCBOOT: +#endif + /* Boot mode is ok. Nothing to do. */ + break; + case MMCSD_MODE_UNDEFINED: + default: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - puts("spl: wrong MMC boot mode\n"); + puts("spl: wrong MMC boot mode\n"); #endif - hang(); + hang(); } if (err) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot