From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Mon, 22 Aug 2011 17:13:52 -0500 Subject: [U-Boot] [PATCH 5/9] OMAP3: pandora: Use generic MMC driver In-Reply-To: <1314051236-21740-1-git-send-email-trini@ti.com> References: <1314051236-21740-1-git-send-email-trini@ti.com> Message-ID: <1314051236-21740-6-git-send-email-trini@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Switch from the legacy omap3 mmc driver to the new generic omap hsmmc driver. This patch is based on the work done for Beagle, etc. Signed-off-by: Tom Rini --- board/pandora/pandora.c | 9 +++++++++ include/configs/omap3_pandora.h | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c index 0df4570..58a676d 100644 --- a/board/pandora/pandora.c +++ b/board/pandora/pandora.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -103,3 +104,11 @@ void set_muxconf_regs(void) { MUX_PANDORA(); } + +#ifdef CONFIG_GENERIC_MMC +int board_mmc_init(bd_t *bis) +{ + omap_mmc_init(0); + return 0; +} +#endif diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index bd55abc..320cf64 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -100,8 +100,9 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200} +#define CONFIG_GENERIC_MMC 1 #define CONFIG_MMC 1 -#define CONFIG_OMAP3_MMC 1 +#define CONFIG_OMAP_HSMMC 1 #define CONFIG_DOS_PARTITION 1 /* DDR - I use Micron DDR */ @@ -182,7 +183,7 @@ "mtdparts=" MTDPARTS_DEFAULT "\0" \ #define CONFIG_BOOTCOMMAND \ - "if mmc init && fatload mmc1 0 ${loadaddr} autoboot.scr || " \ + "if mmc rescan && fatload mmc1 0 ${loadaddr} autoboot.scr || " \ "ext2load mmc1 0 ${loadaddr} autoboot.scr; then " \ "source ${loadaddr}; " \ "fi; " \ -- 1.7.0.4