From: Minkyu Kang <mk7.kang@samsung.com>
Date: Fri, 5 Feb 2010 11:45:22 +0000 (+0900)
Subject: s5pc110: wmg160: No MMC support
X-Git-Tag: JB04_20100205~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e3afb4add4a46bccc18c09a679d2db98787d5a62;p=kernel%2Fu-boot.git

s5pc110: wmg160: No MMC support

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

diff --git a/board/samsung/universal/universal.c b/board/samsung/universal/universal.c
index 9512ded..5725613 100644
--- a/board/samsung/universal/universal.c
+++ b/board/samsung/universal/universal.c
@@ -2094,6 +2094,13 @@ int usb_board_init(void)
 #endif
 
 #ifdef CONFIG_GENERIC_MMC
+int s5p_no_mmc_support(void)
+{
+	if (machine_is_wmg160())
+		return 1;
+	return 0;
+}
+
 int board_mmc_init(bd_t *bis)
 {
 	unsigned int reg;
diff --git a/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c b/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
index b68f2c5..010e3a9 100644
--- a/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
+++ b/cpu/arm_cortexa8/s5pc1xx/usb_downloader.c
@@ -139,11 +139,15 @@ static void recv_setup(char *addr, int len)
 
 #ifdef CONFIG_GENERIC_MMC
 #include <mmc.h>
+extern int s5p_no_mmc_support(void);
 
 static void usbd_set_mmc_dev(struct usbd_ops *usbd)
 {
 	struct mmc *mmc;
 
+	if (s5p_no_mmc_support)
+		return;
+
 	usbd->mmc_dev = 0;
 	/* FIXME */
 	usbd->mmc_max = 0x8000;