Eliminate support for using MMC as memory

MMC cards are not memory, so we stop treating them that way.

Signed-off-by: Andy Fleming <afleming@freescale.com>

diff --git a/common/cmd_mem.c b/common/cmd_mem.c
index a203e0d..2d4fc2a 100644 (file)
--- a/common/cmd_mem.c
+++ b/common/cmd_mem.c
@@ -29,9 +29,6 @@
 
 #include <common.h>
 #include <command.h>
-#if defined(CONFIG_CMD_MMC)
-#include <mmc.h>
-#endif
 #ifdef CONFIG_HAS_DATAFLASH
 #include <dataflash.h>
 #endif
@@ -404,46 +401,6 @@ int do_mem_cp ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 #endif
 
-#if defined(CONFIG_CMD_MMC)
-       if (mmc2info(dest)) {
-               int rc;
-
-               puts ("Copy to MMC... ");
-               switch (rc = mmc_write ((uchar *)addr, dest, count*size)) {
-               case 0:
-                       putc ('\n');
-                       return 1;
-               case -1:
-                       puts ("failed\n");
-                       return 1;
-               default:
-                       printf ("%s[%d] FIXME: rc=%d\n",__FILE__,__LINE__,rc);
-                       return 1;
-               }
-               puts ("done\n");
-               return 0;
-       }
-
-       if (mmc2info(addr)) {
-               int rc;
-
-               puts ("Copy from MMC... ");
-               switch (rc = mmc_read (addr, (uchar *)dest, count*size)) {
-               case 0:
-                       putc ('\n');
-                       return 1;
-               case -1:
-                       puts ("failed\n");
-                       return 1;
-               default:
-                       printf ("%s[%d] FIXME: rc=%d\n",__FILE__,__LINE__,rc);
-                       return 1;
-               }
-               puts ("done\n");
-               return 0;
-       }
-#endif
-
 #ifdef CONFIG_HAS_DATAFLASH
        /* Check if we are copying from RAM or Flash to DataFlash */
        if (addr_dataflash(dest) && !addr_dataflash(addr)){

diff --git a/cpu/arm720t/lpc2292/mmc.c b/cpu/arm720t/lpc2292/mmc.c
index fd7f149..792a884 100644 (file)
--- a/cpu/arm720t/lpc2292/mmc.c
+++ b/cpu/arm720t/lpc2292/mmc.c
@@ -128,30 +128,4 @@ int mmc_init(int verbose)
        return ret;
 }
 
-int mmc_write(uchar * src, ulong dst, int size)
-{
-#ifdef MMC_DEBUG
-       printf("mmc_write: src=%p, dst=%lu, size=%u\n", src, dst, size);
-#endif
-       /* Since mmc2info always returns 0 this function will never be called */
-       return 0;
-}
-
-int mmc_read(ulong src, uchar * dst, int size)
-{
-#ifdef MMC_DEBUG
-       printf("mmc_read: src=%lu, dst=%p, size=%u\n", src, dst, size);
-#endif
-       /* Since mmc2info always returns 0 this function will never be called */
-       return 0;
-}
-
-int mmc2info(ulong addr)
-{
-       /* This function is used by cmd_cp to determine if source or destination
-        address resides on MMC-card or not. We do not support copy to and from
-        MMC-card so we always return 0. */
-       return 0;
-}
-
 #endif /* CONFIG_MMC */

diff --git a/cpu/pxa/mmc.c b/cpu/pxa/mmc.c
index d735c8d..1f0d488 100644 (file)
--- a/cpu/pxa/mmc.c
+++ b/cpu/pxa/mmc.c
@@ -645,18 +645,4 @@ mmc_init(int verbose)
        return rc;
 }
 
-int mmc_ident(block_dev_desc_t * dev)
-{
-       return 0;
-}
-
-int mmc2info(ulong addr)
-{
-       if (addr >= CONFIG_SYS_MMC_BASE
-           && addr < CONFIG_SYS_MMC_BASE + (mmc_dev.lba * mmc_dev.blksz)) {
-               return 1;
-       }
-       return 0;
-}
-
 #endif /* CONFIG_MMC */

diff --git a/drivers/mmc/atmel_mci.c b/drivers/mmc/atmel_mci.c
index 3aa92f2..4028256 100644 (file)
--- a/drivers/mmc/atmel_mci.c
+++ b/drivers/mmc/atmel_mci.c
@@ -531,18 +531,3 @@ int mmc_init(int verbose)
 
        return 0;
 }
-
-int mmc_read(ulong src, uchar *dst, int size)
-{
-       return -ENOSYS;
-}
-
-int mmc_write(uchar *src, ulong dst, int size)
-{
-       return -ENOSYS;
-}
-
-int mmc2info(ulong addr)
-{
-       return 0;
-}

diff --git a/include/mmc.h b/include/mmc.h
index 19c76fe..26b9553 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -52,6 +52,5 @@
 int mmc_init(int verbose);
 int mmc_read(ulong src, uchar *dst, int size);
 int mmc_write(uchar *src, ulong dst, int size);
-int mmc2info(ulong addr);
 
 #endif /* _MMC_H_ */