summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-08-08 10:31:08 -0700
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-09-01 14:58:18 +0200
commit0689a2ef19e991ee812bb09ca8058fad414b25f0 (patch)
treeb712978b5c2c07f6b7dabee55593bd728f1f5b3d /arch/arm/cpu
parent036fd65a8c71f0dcc7edcbd12ba33b7d645b5677 (diff)
downloadu-boot-imx-0689a2ef19e991ee812bb09ca8058fad414b25f0.zip
u-boot-imx-0689a2ef19e991ee812bb09ca8058fad414b25f0.tar.gz
u-boot-imx-0689a2ef19e991ee812bb09ca8058fad414b25f0.tar.bz2
am33xx: Correct MMC1, remove MMC2 support
- Correct the MMC1 base offset - Remove MMC2 (that area is reserved and not MMC2). - Add the real BOOT_DEVICE_MMC2 value Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/am33xx/board.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
index 2ca4ca7..b387ac2 100644
--- a/arch/arm/cpu/armv7/am33xx/board.c
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -211,7 +211,13 @@ void s_init(void)
#if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
- return omap_mmc_init(0, 0, 0);
+ int ret;
+
+ ret = omap_mmc_init(0, 0, 0);
+ if (ret)
+ return ret;
+
+ return omap_mmc_init(1, 0, 0);
}
#endif