diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/am33xx/board.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/boot-common.c | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/am33xx/board.c b/arch/arm/mach-omap2/am33xx/board.c index 190310f..2bfc864 100644 --- a/arch/arm/mach-omap2/am33xx/board.c +++ b/arch/arm/mach-omap2/am33xx/board.c @@ -111,7 +111,7 @@ static const struct gpio_bank gpio_bank_am33xx[] = { const struct gpio_bank *const omap_gpio_bank = gpio_bank_am33xx; #endif -#if defined(CONFIG_MMC_OMAP_HS) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_MMC_OMAP_HS) int cpu_mmc_init(bd_t *bis) { int ret; diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 7ae3d80..29c8f23 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 *); |