ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK

- Convert the non-relocation part of board_init_f to spl_board_init, turn on CONFIG_SPL_BOARD_INIT in the configs.
- Remove duplicated code.
- Add spl_boot_device() that returns the statically chosen boot device.

Signed-off-by: Tom Rini <trini@ti.com>

2 files changed, 0 insertions, 65 deletions

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 941a909..565ba6a 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -26,11 +26,8 @@ include $(TOPDIR)/config.mk
 LIB	:= $(obj)libmmc.o
 
 ifdef CONFIG_SPL_BUILD
-COBJS-$(CONFIG_SPL_MMC_LOAD)	+= spl_mmc_load.o
-ifdef CONFIG_SPL_FRAMEWORK
 COBJS-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o
 endif
-endif
 
 COBJS-$(CONFIG_BFIN_SDH) += bfin_sdh.o
 COBJS-$(CONFIG_DAVINCI_MMC) += davinci_mmc.o
diff --git a/drivers/mmc/spl_mmc_load.c b/drivers/mmc/spl_mmc_load.c
deleted file mode 100644
index 79a68fb..0000000
--- a/drivers/mmc/spl_mmc_load.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <common.h>
-#include <mmc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static void mmc_load_image(struct mmc *mmc)
-{
-	s32 err;
-	void (*uboot)(void) __noreturn;
-
-	err = mmc->block_dev.block_read(0, CONFIG_SYS_MMC_U_BOOT_OFFS,
-			CONFIG_SYS_MMC_U_BOOT_SIZE/512,
-			(u32 *)CONFIG_SYS_TEXT_BASE);
-
-	if (err <= 0) {
-		printf("spl: error reading image %s, err - %d\n",
-			"u-boot.img", err);
-		hang();
-	}
-	uboot = (void *) CONFIG_SYS_TEXT_BASE;
-	(*uboot)();
-}
-
-void spl_mmc_load(void)
-{
-	struct mmc *mmc;
-	int err;
-	void (mmc_load_image)(struct mmc *mmc) __noreturn;
-
-	mmc_initialize(gd->bd);
-	mmc = find_mmc_device(0);
-	if (!mmc) {
-		puts("spl: mmc device not found!!\n");
-		hang();
-	} else {
-		puts("spl: mmc device found\n");
-	}
-	err = mmc_init(mmc);
-	if (err) {
-		printf("spl: mmc init failed: err - %d\n", err);
-		hang();
-	}
-	mmc_load_image(mmc);
-}