| Message ID | 1418391502-2536-1-git-send-email-p.aubert@staubli.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
On 12/12/2014 14:38, Pierre Aubert wrote: > Signed-off-by: Pierre Aubert <p.aubert@staubli.com> > --- > arch/arm/imx-common/spl.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c > index 477c38c..ac6e40e 100644 > --- a/arch/arm/imx-common/spl.c > +++ b/arch/arm/imx-common/spl.c > @@ -68,8 +68,10 @@ u32 spl_boot_mode(void) > /* for MMC return either RAW or FAT mode */ > case BOOT_DEVICE_MMC1: > case BOOT_DEVICE_MMC2: > -#ifdef CONFIG_SPL_FAT_SUPPORT > +#if defined(CONFIG_SPL_FAT_SUPPORT) > return MMCSD_MODE_FS; > +#elif defined(CONFIG_SUPPORT_EMMC_BOOT) > + return MMCSD_MODE_EMMCBOOT; > #else > return MMCSD_MODE_RAW; > #endif > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index 477c38c..ac6e40e 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -68,8 +68,10 @@ u32 spl_boot_mode(void) /* for MMC return either RAW or FAT mode */ case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC2: -#ifdef CONFIG_SPL_FAT_SUPPORT +#if defined(CONFIG_SPL_FAT_SUPPORT) return MMCSD_MODE_FS; +#elif defined(CONFIG_SUPPORT_EMMC_BOOT) + return MMCSD_MODE_EMMCBOOT; #else return MMCSD_MODE_RAW; #endif
Signed-off-by: Pierre Aubert <p.aubert@staubli.com> --- arch/arm/imx-common/spl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)