All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 6/9] AM3517 CraneBoard: Use generic MMC driver
Date: Mon, 22 Aug 2011 17:13:53 -0500	[thread overview]
Message-ID: <1314051236-21740-7-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/ti/am3517crane/am3517crane.c |    9 +++++++++
 include/configs/am3517_crane.h     |   10 ++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/board/ti/am3517crane/am3517crane.c b/board/ti/am3517crane/am3517crane.c
index d007044..cd5683d 100644
--- a/board/ti/am3517crane/am3517crane.c
+++ b/board/ti/am3517crane/am3517crane.c
@@ -24,6 +24,7 @@
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
@@ -73,3 +74,11 @@ void set_muxconf_regs(void)
 {
 	MUX_AM3517CRANE();
 }
+
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	omap_mmc_init(0);
+	return 0;
+}
+#endif
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 743768e..e23ca45 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -93,8 +93,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
 
 /*
@@ -191,16 +192,17 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
 	"console=ttyS2,115200n8\0" \
+	"mmcdev=0\0" \
 	"mmcargs=setenv bootargs console=${console} " \
 		"root=/dev/mmcblk0p2 rw " \
 		"rootfstype=ext3 rootwait\0" \
 	"nandargs=setenv bootargs console=${console} " \
 		"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" \
@@ -210,7 +212,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

  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 ` [U-Boot] [PATCH 3/9] OMAP3: Zoom1: " Tom Rini
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 ` Tom Rini [this message]
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-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.