diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/arm1136/mx35/generic.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/boot-common.c | 4 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap3/board.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/zynq/spl.c | 2 | ||||
-rw-r--r-- | arch/arm/cpu/at91-common/spl.c | 2 | ||||
-rw-r--r-- | arch/arm/imx-common/spl.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c index 8d3f92c..bc98edd 100644 --- a/arch/arm/cpu/arm1136/mx35/generic.c +++ b/arch/arm/cpu/arm1136/mx35/generic.c @@ -531,7 +531,7 @@ u32 spl_boot_mode(void) switch (spl_boot_device()) { case BOOT_DEVICE_MMC1: #ifdef CONFIG_SPL_FAT_SUPPORT - return MMCSD_MODE_FAT; + return MMCSD_MODE_FS; #else return MMCSD_MODE_RAW; #endif diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 3033564..fb535eb 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -81,8 +81,8 @@ u32 spl_boot_mode(void) if (val == MMCSD_MODE_RAW) return MMCSD_MODE_RAW; - else if (val == MMCSD_MODE_FAT) - return MMCSD_MODE_FAT; + else if (val == MMCSD_MODE_FS) + return MMCSD_MODE_FS; else #ifdef CONFIG_SUPPORT_EMMC_BOOT return MMCSD_MODE_EMMCBOOT; diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c index c942fe6..53a9e5d 100644 --- a/arch/arm/cpu/armv7/omap3/board.c +++ b/arch/arm/cpu/armv7/omap3/board.c @@ -90,7 +90,7 @@ u32 spl_boot_mode(void) case BOOT_DEVICE_MMC2: return MMCSD_MODE_RAW; case BOOT_DEVICE_MMC1: - return MMCSD_MODE_FAT; + return MMCSD_MODE_FS; break; default: puts("spl: ERROR: unknown device - can't select boot mode\n"); diff --git a/arch/arm/cpu/armv7/zynq/spl.c b/arch/arm/cpu/armv7/zynq/spl.c index 9ff2ef2..31627f9 100644 --- a/arch/arm/cpu/armv7/zynq/spl.c +++ b/arch/arm/cpu/armv7/zynq/spl.c @@ -63,7 +63,7 @@ u32 spl_boot_device(void) #ifdef CONFIG_SPL_MMC_SUPPORT u32 spl_boot_mode(void) { - return MMCSD_MODE_FAT; + return MMCSD_MODE_FS; } #endif diff --git a/arch/arm/cpu/at91-common/spl.c b/arch/arm/cpu/at91-common/spl.c index cbb5a52..674a470 100644 --- a/arch/arm/cpu/at91-common/spl.c +++ b/arch/arm/cpu/at91-common/spl.c @@ -102,7 +102,7 @@ u32 spl_boot_mode(void) switch (spl_boot_device()) { #ifdef CONFIG_SYS_USE_MMC case BOOT_DEVICE_MMC1: - return MMCSD_MODE_FAT; + return MMCSD_MODE_FS; break; #endif case BOOT_DEVICE_NONE: diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index 9a02a64..9d3c31a 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -68,7 +68,7 @@ u32 spl_boot_mode(void) case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC2: #ifdef CONFIG_SPL_FAT_SUPPORT - return MMCSD_MODE_FAT; + return MMCSD_MODE_FS; #else return MMCSD_MODE_RAW; #endif |