From d5abcf94c7123167725fc22ace342f0d455093c1 Mon Sep 17 00:00:00 2001 From: Jean-Jacques Hiblot Date: Wed, 1 Feb 2017 11:39:14 +0100 Subject: ti: boot: Register the MMC controllers in SPL in the same way as in u-boot To keep a consistent MMC device mapping in SPL and in u-boot, let's register the MMC controllers the same way in u-boot and in the SPL. In terms of boot time, it doesn't hurt to register more controllers than needed because the MMC device is initialized only prior being accessed for the first time. Having the same device mapping in SPL and u-boot allows us to use the environment in SPL whatever the MMC boot device. Signed-off-by: Jean-Jacques Hiblot --- arch/arm/mach-omap2/boot-common.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'arch/arm/mach-omap2/boot-common.c') diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 7ae3d8041c4..29c8f231917 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -205,21 +205,6 @@ void spl_board_init(void) #endif } -__weak int board_mmc_init(bd_t *bis) -{ - switch (spl_boot_device()) { - case BOOT_DEVICE_MMC1: - omap_mmc_init(0, 0, 0, -1, -1); - break; - case BOOT_DEVICE_MMC2: - case BOOT_DEVICE_MMC2_2: - omap_mmc_init(0, 0, 0, -1, -1); - omap_mmc_init(1, 0, 0, -1, -1); - break; - } - return 0; -} - void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(u32 *); -- cgit v1.2.3