arm: omap5: correct boot device mode7 for eMMC

In OMAP5 Boot device mode of 6 and 7 should be mapped to mmc2/eMMC

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
master
Balaji T K 13 years ago committed by Albert ARIBAUD
parent aaec44874f
commit f75231b79a
  1. 1
      arch/arm/cpu/armv7/omap-common/spl.c
  2. 1
      arch/arm/cpu/armv7/omap-common/spl_mmc.c
  3. 5
      arch/arm/include/asm/omap_common.h

@ -162,6 +162,7 @@ void board_init_r(gd_t *id, ulong dummy)
#ifdef CONFIG_SPL_MMC_SUPPORT #ifdef CONFIG_SPL_MMC_SUPPORT
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
spl_mmc_load_image(); spl_mmc_load_image();
break; break;
#endif #endif

@ -42,6 +42,7 @@ int board_mmc_init(bd_t *bis)
omap_mmc_init(0, 0, 0); omap_mmc_init(0, 0, 0);
break; break;
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
omap_mmc_init(1, 0, 0); omap_mmc_init(1, 0, 0);
break; break;
} }

@ -45,7 +45,7 @@ void preloader_console_init(void);
#define BOOT_DEVICE_ONE_NAND 4 #define BOOT_DEVICE_ONE_NAND 4
#define BOOT_DEVICE_MMC1 5 #define BOOT_DEVICE_MMC1 5
#define BOOT_DEVICE_MMC2 6 #define BOOT_DEVICE_MMC2 6
#define BOOT_DEVICE_MMC3 7 #define BOOT_DEVICE_MMC2_2 7
#elif defined(CONFIG_OMAP44XX) /* OMAP4 */ #elif defined(CONFIG_OMAP44XX) /* OMAP4 */
#define BOOT_DEVICE_NONE 0 #define BOOT_DEVICE_NONE 0
#define BOOT_DEVICE_XIP 1 #define BOOT_DEVICE_XIP 1
@ -54,6 +54,7 @@ void preloader_console_init(void);
#define BOOT_DEVICE_ONE_NAND 4 #define BOOT_DEVICE_ONE_NAND 4
#define BOOT_DEVICE_MMC1 5 #define BOOT_DEVICE_MMC1 5
#define BOOT_DEVICE_MMC2 6 #define BOOT_DEVICE_MMC2 6
#define BOOT_DEVICE_MMC2_2 0xFF
#elif defined(CONFIG_OMAP34XX) /* OMAP3 */ #elif defined(CONFIG_OMAP34XX) /* OMAP3 */
#define BOOT_DEVICE_NONE 0 #define BOOT_DEVICE_NONE 0
#define BOOT_DEVICE_XIP 1 #define BOOT_DEVICE_XIP 1
@ -62,11 +63,13 @@ void preloader_console_init(void);
#define BOOT_DEVICE_MMC2 5 /*emmc*/ #define BOOT_DEVICE_MMC2 5 /*emmc*/
#define BOOT_DEVICE_MMC1 6 #define BOOT_DEVICE_MMC1 6
#define BOOT_DEVICE_XIPWAIT 7 #define BOOT_DEVICE_XIPWAIT 7
#define BOOT_DEVICE_MMC2_2 0xFF
#elif defined(CONFIG_AM33XX) /* AM33XX */ #elif defined(CONFIG_AM33XX) /* AM33XX */
#define BOOT_DEVICE_NAND 5 #define BOOT_DEVICE_NAND 5
#define BOOT_DEVICE_MMC1 8 #define BOOT_DEVICE_MMC1 8
#define BOOT_DEVICE_MMC2 0 #define BOOT_DEVICE_MMC2 0
#define BOOT_DEVICE_UART 65 #define BOOT_DEVICE_UART 65
#define BOOT_DEVICE_MMC2_2 0xFF
#endif #endif
/* Boot type */ /* Boot type */

Loading…
Cancel
Save