Merge branch 'at91' of git://git.denx.de/u-boot-atmel

[karo-tx-uboot.git] / common / cmd_mmc.c

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 71f4971f49152b7d4dc6002c9653fa0f2913127d..4323f76b30549cb0a83b19c8c95b755259d2af14 100644 (file)
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -26,21 +26,67 @@
 #include <mmc.h>
 
 #ifndef CONFIG_GENERIC_MMC
-int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int curr_device = -1;
+
+int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       if (mmc_legacy_init (1) != 0) {
-               printf ("No MMC card found\n");
-               return 1;
+       int dev;
+
+       if (argc < 2)
+               return cmd_usage(cmdtp);
+
+       if (strcmp(argv[1], "init") == 0) {
+               if (argc == 2) {
+                       if (curr_device < 0)
+                               dev = 1;
+                       else
+                               dev = curr_device;
+               } else if (argc == 3) {
+                       dev = (int)simple_strtoul(argv[2], NULL, 10);
+               } else {
+                       return cmd_usage(cmdtp);
+               }
+
+               if (mmc_legacy_init(dev) != 0) {
+                       puts("No MMC card found\n");
+                       return 1;
+               }
+
+               curr_device = dev;
+               printf("mmc%d is available\n", curr_device);
+       } else if (strcmp(argv[1], "device") == 0) {
+               if (argc == 2) {
+                       if (curr_device < 0) {
+                               puts("No MMC device available\n");
+                               return 1;
+                       }
+               } else if (argc == 3) {
+                       dev = (int)simple_strtoul(argv[2], NULL, 10);
+
+#ifdef CONFIG_SYS_MMC_SET_DEV
+                       if (mmc_set_dev(dev) != 0)
+                               return 1;
+#endif
+                       curr_device = dev;
+               } else {
+                       return cmd_usage(cmdtp);
+               }
+
+               printf("mmc%d is current device\n", curr_device);
+       } else {
+               return cmd_usage(cmdtp);
        }
+
        return 0;
 }
 
 U_BOOT_CMD(
-       mmcinit,        1,      0,      do_mmc,
-       "init mmc card",
-       NULL
+       mmc, 3, 1, do_mmc,
+       "MMC sub-system",
+       "init [dev] - init MMC sub system\n"
+       "mmc device [dev] - show or set current device"
 );
-#endif /* !CONFIG_GENERIC_MMC */
+#else /* !CONFIG_GENERIC_MMC */
 
 static void print_mmcinfo(struct mmc *mmc)
 {
@@ -63,7 +109,7 @@ static void print_mmcinfo(struct mmc *mmc)
        printf("Bus Width: %d-bit\n", mmc->bus_width);
 }
 
-int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        struct mmc *mmc;
        int dev_num;
@@ -84,10 +130,15 @@ int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-U_BOOT_CMD(mmcinfo, 2, 0, do_mmcinfo, "mmcinfo <dev num>-- display MMC info\n",
-               NULL);
+U_BOOT_CMD(
+       mmcinfo, 2, 0, do_mmcinfo,
+       "display MMC info",
+       "<dev num>\n"
+       "    - device number of the device to dislay info of\n"
+       ""
+);
 
-int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int rc = 0;
 
@@ -97,16 +148,37 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        int dev = simple_strtoul(argv[2], NULL, 10);
                        struct mmc *mmc = find_mmc_device(dev);
 
+                       if (!mmc)
+                               return 1;
+
                        mmc_init(mmc);
 
                        return 0;
+               } else if (strncmp(argv[1], "part", 4) == 0) {
+                       int dev = simple_strtoul(argv[2], NULL, 10);
+                       block_dev_desc_t *mmc_dev;
+                       struct mmc *mmc = find_mmc_device(dev);
+
+                       if (!mmc) {
+                               puts("no mmc devices available\n");
+                               return 1;
+                       }
+                       mmc_init(mmc);
+                       mmc_dev = mmc_get_dev(dev);
+                       if (mmc_dev != NULL &&
+                           mmc_dev->type != DEV_TYPE_UNKNOWN) {
+                               print_part(mmc_dev);
+                               return 0;
+                       }
+
+                       puts("get mmc type error!\n");
+                       return 1;
                }
 
        case 0:
        case 1:
        case 4:
-               printf("Usage:\n%s\n", cmdtp->usage);
-               return 1;
+               return cmd_usage(cmdtp);
 
        case 2:
                if (!strcmp(argv[1], "list")) {
@@ -123,6 +195,9 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        u32 blk = simple_strtoul(argv[4], NULL, 16);
                        struct mmc *mmc = find_mmc_device(dev);
 
+                       if (!mmc)
+                               return 1;
+
                        printf("\nMMC read: dev # %d, block # %d, count %d ... ",
                                dev, blk, cnt);
 
@@ -131,7 +206,7 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        n = mmc->block_dev.block_read(dev, blk, cnt, addr);
 
                        /* flush cache after read */
-                       flush_cache((ulong)addr, cnt * 512); //FIXME
+                       flush_cache((ulong)addr, cnt * 512); /* FIXME */
 
                        printf("%d blocks read: %s\n",
                                n, (n==cnt) ? "OK" : "ERROR");
@@ -145,6 +220,9 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                        int blk = simple_strtoul(argv[4], NULL, 16);
 
+                       if (!mmc)
+                               return 1;
+
                        printf("\nMMC write: dev # %d, block # %d, count %d ... ",
                                dev, blk, cnt);
 
@@ -155,10 +233,8 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        printf("%d blocks written: %s\n",
                                n, (n == cnt) ? "OK" : "ERROR");
                        return (n == cnt) ? 0 : 1;
-               } else {
-                       printf("Usage:\n%s\n", cmdtp->usage);
-                       rc = 1;
-               }
+               } else
+                       rc = cmd_usage(cmdtp);
 
                return rc;
        }
@@ -166,8 +242,10 @@ int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        mmc, 6, 1, do_mmcops,
-       "mmc    - MMC sub system\n",
-       "mmc read <device num> addr blk# cnt\n"
+       "MMC sub system",
+       "read <device num> addr blk# cnt\n"
        "mmc write <device num> addr blk# cnt\n"
        "mmc rescan <device num>\n"
-       "mmc list - lists available devices\n");
+       "mmc part <device num> - lists available partition on mmc\n"
+       "mmc list - lists available devices");
+#endif