From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/9] OMAP3: Zoom1: Use generic MMC driver
Date: Mon, 22 Aug 2011 17:13:50 -0500 [thread overview]
Message-ID: <1314051236-21740-4-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1314051236-21740-1-git-send-email-trini@ti.com>
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 <trini@ti.com>
---
board/logicpd/zoom1/zoom1.c | 9 +++++++++
include/configs/omap3_zoom1.h | 10 ++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/board/logicpd/zoom1/zoom1.c b/board/logicpd/zoom1/zoom1.c
index 7ef13cc..dec0b26 100644
--- a/board/logicpd/zoom1/zoom1.c
+++ b/board/logicpd/zoom1/zoom1.c
@@ -34,6 +34,7 @@
#include <netdev.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/mach-types.h>
@@ -88,6 +89,14 @@ void set_muxconf_regs(void)
MUX_ZOOM1_MDK();
}
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+ omap_mmc_init(0);
+ return 0;
+}
+#endif
+
#ifdef CONFIG_CMD_NET
int board_eth_init(bd_t *bis)
{
diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index aeac7c7..4b095a1 100644
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.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 */
@@ -178,6 +179,7 @@
"loadaddr=0x82000000\0" \
"usbtty=cdc_acm\0" \
"console=ttyS2,115200n8\0" \
+ "mmcdev=0\0" \
"videomode=1024x768 at 60,vxres=1024,vyres=768\0" \
"videospec=omapfb:vram:2M,vram:4M\0" \
"mmcargs=setenv bootargs console=${console} " \
@@ -188,10 +190,10 @@
"video=${videospec},mode:${videomode} " \
"root=/dev/mtdblock4 rw " \
"rootfstype=jffs2\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" \
@@ -201,7 +203,7 @@
"bootm ${loadaddr}\0" \
#define CONFIG_BOOTCOMMAND \
- "if mmc init; then " \
+ "if mmc rescan ${mmcdev}; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
--
1.7.0.4
next prev parent reply other threads:[~2011-08-22 22:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 22:13 [U-Boot] [PATCH 0/9] Use generic MMC driver on remaining OMAP platforms Tom Rini
2011-08-22 22:13 ` [U-Boot] [PATCH 1/9] OMAP3: CM-T35: Use generic MMC driver Tom Rini
2011-08-24 12:31 ` Igor Grinberg
2011-08-24 15:53 ` Tom Rini
2011-08-22 22:13 ` [U-Boot] [PATCH 2/9] OMAP3: DIG297: " Tom Rini
2011-08-24 13:43 ` Luca Ceresoli
2011-08-24 15:44 ` Tom Rini
2011-08-25 15:06 ` [U-Boot] [PATCH] " Tom Rini
2011-08-22 22:13 ` Tom Rini [this message]
2011-08-22 22:13 ` [U-Boot] [PATCH 4/9] OMAP3: Zoom2: " Tom Rini
2011-08-22 22:13 ` [U-Boot] [PATCH 5/9] OMAP3: pandora: " Tom Rini
2011-08-22 22:13 ` [U-Boot] [PATCH 6/9] AM3517 CraneBoard: " Tom Rini
2011-08-22 22:13 ` [U-Boot] [PATCH 7/9] TI OMAP3 SDP3430: " Tom Rini
2011-08-22 22:13 ` [U-Boot] [PATCH 8/9] devkit8000: " Tom Rini
2011-08-22 22:13 ` [U-Boot] [PATCH 9/9] OMAP3: Remove legacy mmc driver Tom Rini
2011-08-30 4:59 ` Premi, Sanjeev
2011-08-30 7:19 ` Marek Vasut
2011-09-03 20:32 ` Andy Fleming
2011-09-07 1:39 ` Rini, Tom
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314051236-21740-4-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox