Merge branch 'next'

[J-u-boot.git] / cmd / mmc.c

diff --git a/cmd/mmc.c b/cmd/mmc.c
index 9a841c25d3d12f0c997e727d86d9fb54ae8c08fb..fe7899ec793c4492d3d0f6f21762dd4b5b265529 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -8,6 +8,7 @@
 #include <command.h>
 #include <console.h>
 #include <display_options.h>
+#include <mapmem.h>
 #include <memalign.h>
 #include <mmc.h>
 #include <part.h>
@@ -350,12 +351,12 @@ static int do_mmc_read(struct cmd_tbl *cmdtp, int flag,
 {
        struct mmc *mmc;
        u32 blk, cnt, n;
-       void *addr;
+       void *ptr;
 
        if (argc != 4)
                return CMD_RET_USAGE;
 
-       addr = (void *)hextoul(argv[1], NULL);
+       ptr = map_sysmem(hextoul(argv[1], NULL), 0);
        blk = hextoul(argv[2], NULL);
        cnt = hextoul(argv[3], NULL);
 
@@ -366,8 +367,9 @@ static int do_mmc_read(struct cmd_tbl *cmdtp, int flag,
        printf("MMC read: dev # %d, block # %d, count %d ... ",
               curr_device, blk, cnt);
 
-       n = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, addr);
+       n = blk_dread(mmc_get_blk_desc(mmc), blk, cnt, ptr);
        printf("%d blocks read: %s\n", n, (n == cnt) ? "OK" : "ERROR");
+       unmap_sysmem(ptr);
 
        return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 }
@@ -443,12 +445,12 @@ static int do_mmc_write(struct cmd_tbl *cmdtp, int flag,
 {
        struct mmc *mmc;
        u32 blk, cnt, n;
-       void *addr;
+       void *ptr;
 
        if (argc != 4)
                return CMD_RET_USAGE;
 
-       addr = (void *)hextoul(argv[1], NULL);
+       ptr = map_sysmem(hextoul(argv[1], NULL), 0);
        blk = hextoul(argv[2], NULL);
        cnt = hextoul(argv[3], NULL);
 
@@ -463,8 +465,9 @@ static int do_mmc_write(struct cmd_tbl *cmdtp, int flag,
                printf("Error: card is write protected!\n");
                return CMD_RET_FAILURE;
        }
-       n = blk_dwrite(mmc_get_blk_desc(mmc), blk, cnt, addr);
+       n = blk_dwrite(mmc_get_blk_desc(mmc), blk, cnt, ptr);
        printf("%d blocks written: %s\n", n, (n == cnt) ? "OK" : "ERROR");
+       unmap_sysmem(ptr);
 
        return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 }
@@ -473,18 +476,26 @@ static int do_mmc_erase(struct cmd_tbl *cmdtp, int flag,
                        int argc, char *const argv[])
 {
        struct mmc *mmc;
+       struct disk_partition info;
        u32 blk, cnt, n;
 
-       if (argc != 3)
+       if (argc < 2 || argc > 3)
                return CMD_RET_USAGE;
 
-       blk = hextoul(argv[1], NULL);
-       cnt = hextoul(argv[2], NULL);
-
        mmc = init_mmc_device(curr_device, false);
        if (!mmc)
                return CMD_RET_FAILURE;
 
+       if (argc == 3) {
+               blk = hextoul(argv[1], NULL);
+               cnt = hextoul(argv[2], NULL);
+       } else if (part_get_info_by_name(mmc_get_blk_desc(mmc), argv[1], &info) >= 0) {
+               blk = info.start;
+               cnt = info.size;
+       } else {
+               return CMD_RET_FAILURE;
+       }
+
        printf("MMC erase: dev # %d, block # %d, count %d ... ",
               curr_device, blk, cnt);
 
@@ -1290,6 +1301,7 @@ U_BOOT_CMD(
        "mmc swrite addr blk#\n"
 #endif
        "mmc erase blk# cnt\n"
+       "mmc erase partname\n"
        "mmc rescan [mode]\n"
        "mmc part - lists available partition on current mmc device\n"
        "mmc dev [dev] [part] [mode] - show or set current mmc device [partition] and set mode\n"