From mboxrd@z Thu Jan 1 00:00:00 1970 From: Guillaume Gardet Date: Tue, 02 Dec 2014 09:35:05 +0100 Subject: [U-Boot] [PATCH] spl: if MMCSD_MODE_RAW fails, try MMCSD_MODE_FS, if available In-Reply-To: <1416303886-20589-1-git-send-email-guillaume.gardet@free.fr> References: <1416303886-20589-1-git-send-email-guillaume.gardet@free.fr> Message-ID: <547D79B9.9040800@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > Cc: Tom Rini > --- > 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