diff options
| author | Steve Sakoman <steve@sakoman.com> | 2010-09-19 21:19:48 -0700 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-17 20:14:18 +0200 |
| commit | 0cd31144240221a4f6b35615f1af9159fb20b266 (patch) | |
| tree | 5a16974e05ccb5360bdd8bc350d5be100baa276f | |
| parent | 084c4c1bc10ef7abd64eebaf4c0a559409c82ddb (diff) | |
| download | u-boot-imx-0cd31144240221a4f6b35615f1af9159fb20b266.zip u-boot-imx-0cd31144240221a4f6b35615f1af9159fb20b266.tar.gz u-boot-imx-0cd31144240221a4f6b35615f1af9159fb20b266.tar.bz2 | |
ARMV7: OMAP4: Use generic mmc driver on Beagle
This patch switches from the legacy mmc driver to the new generic mmc driver
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | board/ti/beagle/beagle.c | 9 | ||||
| -rw-r--r-- | include/configs/omap3_beagle.h | 10 |
2 files changed, 15 insertions, 4 deletions
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 4647908..c5d6679 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -32,6 +32,7 @@ #include <common.h> #include <twl4030.h> #include <asm/io.h> +#include <asm/arch/mmc_host_def.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <asm/arch/gpio.h> @@ -169,3 +170,11 @@ void set_muxconf_regs(void) { MUX_BEAGLE(); } + +#ifdef CONFIG_GENERIC_MMC +int board_mmc_init(bd_t *bis) +{ + omap_mmc_init(0); + return 0; +} +#endif diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 6f4ee28..bbb1073 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -95,8 +95,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 */ @@ -184,6 +185,7 @@ "vram=12M\0" \ "dvimode=1024x768MR-16@60\0" \ "defaultdisplay=dvi\0" \ + "mmcdev=0\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcrootfstype=ext3 rootwait\0" \ "nandroot=/dev/mtdblock4 rw\0" \ @@ -204,10 +206,10 @@ "omapdss.def_disp=${defaultdisplay} " \ "root=${nandroot} " \ "rootfstype=${nandrootfstype}\0" \ - "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \ + "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ "bootscript=echo Running bootscript from mmc ...; " \ "source ${loadaddr}\0" \ - "loaduimage=fatload mmc 0 ${loadaddr} uImage\0" \ + "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "bootm ${loadaddr}\0" \ @@ -217,7 +219,7 @@ "bootm ${loadaddr}\0" \ #define CONFIG_BOOTCOMMAND \ - "if mmc init; then " \ + "if mmc rescan ${mmcdev}; then " \ "if run loadbootscript; then " \ "run bootscript; " \ "else " \ |