diff options
| author | Tom Rini <trini@ti.com> | 2014-02-17 14:16:08 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-17 14:16:08 -0500 |
| commit | 18c83588bc830dbad5a96ca19a85184da58f4d09 (patch) | |
| tree | 6c6828f97876aa9974f29d2c8f5f248b8188a172 /arch | |
| parent | 22a240c32c1340183fce12867ae5f8736b92a638 (diff) | |
| parent | b818d9ab8d96471c40ccbd4541a46dfa415eda73 (diff) | |
| download | u-boot-imx-18c83588bc830dbad5a96ca19a85184da58f4d09.zip u-boot-imx-18c83588bc830dbad5a96ca19a85184da58f4d09.tar.gz u-boot-imx-18c83588bc830dbad5a96ca19a85184da58f4d09.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mmc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/boot-common.c | 13 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-exynos/dwmmc.h | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 69fff32..52e0f4a 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -66,7 +66,18 @@ u32 spl_boot_device(void) u32 spl_boot_mode(void) { - return gd->arch.omap_boot_params.omap_bootmode; + u32 val = gd->arch.omap_boot_params.omap_bootmode; + + if (val == MMCSD_MODE_RAW) + return MMCSD_MODE_RAW; + else if (val == MMCSD_MODE_FAT) + return MMCSD_MODE_FAT; + else +#ifdef CONFIG_SUPPORT_EMMC_BOOT + return MMCSD_MODE_EMMCBOOT; +#else + return MMCSD_MODE_UNDEFINED; +#endif } void spl_board_init(void) diff --git a/arch/arm/include/asm/arch-exynos/dwmmc.h b/arch/arm/include/asm/arch-exynos/dwmmc.h index 09d739d..a7ca12c 100644 --- a/arch/arm/include/asm/arch-exynos/dwmmc.h +++ b/arch/arm/include/asm/arch-exynos/dwmmc.h @@ -23,6 +23,10 @@ #define MPSCTRL_ENCRYPTION (0x1<<1) #define MPSCTRL_VALID (0x1<<0) +/* CLKSEL Register */ +#define DWMCI_DIVRATIO_BIT 24 +#define DWMCI_DIVRATIO_MASK 0x7 + #ifdef CONFIG_OF_CONTROL int exynos_dwmmc_init(const void *blob); #endif |