]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/cmd_mmc.c
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
[karo-tx-uboot.git] / common / cmd_mmc.c
index 7dacd5114ce1416bf1cb5c9af5589cd62530becd..2d51927060280bfc0289f00b5514131075829dd7 100644 (file)
@@ -2,23 +2,7 @@
  * (C) Copyright 2003
  * Kyle Harris, kharris@nexus-tech.net
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -106,7 +90,7 @@ static void print_mmcinfo(struct mmc *mmc)
        printf("Rd Block Len: %d\n", mmc->read_bl_len);
 
        printf("%s version %d.%d\n", IS_SD(mmc) ? "SD" : "MMC",
-                       (mmc->version >> 4) & 0xf, mmc->version & 0xf);
+                       (mmc->version >> 8) & 0xf, mmc->version & 0xff);
 
        printf("High Capacity: %s\n", mmc->high_capacity ? "Yes" : "No");
        puts("Capacity: ");
@@ -164,8 +148,12 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
 
        if (strcmp(argv[1], "rescan") == 0) {
-               struct mmc *mmc = find_mmc_device(curr_device);
+               struct mmc *mmc;
 
+               if (argc != 2)
+                       return CMD_RET_USAGE;
+
+               mmc = find_mmc_device(curr_device);
                if (!mmc) {
                        printf("no mmc device at slot %x\n", curr_device);
                        return 1;
@@ -177,10 +165,14 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        return 1;
                else
                        return 0;
-       } else if (strncmp(argv[1], "part", 4) == 0) {
+       } else if (strcmp(argv[1], "part") == 0) {
                block_dev_desc_t *mmc_dev;
-               struct mmc *mmc = find_mmc_device(curr_device);
+               struct mmc *mmc;
+
+               if (argc != 2)
+                       return CMD_RET_USAGE;
 
+               mmc = find_mmc_device(curr_device);
                if (!mmc) {
                        printf("no mmc device at slot %x\n", curr_device);
                        return 1;
@@ -196,6 +188,8 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                puts("get mmc type error!\n");
                return 1;
        } else if (strcmp(argv[1], "list") == 0) {
+               if (argc != 2)
+                       return CMD_RET_USAGE;
                print_mmc_devices('\n');
                return 0;
        } else if (strcmp(argv[1], "dev") == 0) {
@@ -236,7 +230,7 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                if (!ret)
                                        mmc->part_num = part;
 
-                               printf("switch to partions #%d, %s\n",
+                               printf("switch to partitions #%d, %s\n",
                                                part, (!ret) ? "OK" : "ERROR");
                        }
                }
@@ -248,6 +242,116 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                                curr_device, mmc->part_num);
 
                return 0;
+#ifdef CONFIG_SUPPORT_EMMC_BOOT
+       } else if (strcmp(argv[1], "partconf") == 0) {
+               int dev;
+               struct mmc *mmc;
+               u8 ack, part_num, access;
+
+               if (argc == 6) {
+                       dev = simple_strtoul(argv[2], NULL, 10);
+                       ack = simple_strtoul(argv[3], NULL, 10);
+                       part_num = simple_strtoul(argv[4], NULL, 10);
+                       access = simple_strtoul(argv[5], NULL, 10);
+               } else {
+                       return CMD_RET_USAGE;
+               }
+
+               mmc = find_mmc_device(dev);
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", dev);
+                       return 1;
+               }
+
+               if (IS_SD(mmc)) {
+                       puts("PARTITION_CONFIG only exists on eMMC\n");
+                       return 1;
+               }
+
+               /* acknowledge to be sent during boot operation */
+               return mmc_set_part_conf(mmc, ack, part_num, access);
+       } else if (strcmp(argv[1], "bootbus") == 0) {
+               int dev;
+               struct mmc *mmc;
+               u8 width, reset, mode;
+
+               if (argc == 6) {
+                       dev = simple_strtoul(argv[2], NULL, 10);
+                       width = simple_strtoul(argv[3], NULL, 10);
+                       reset = simple_strtoul(argv[4], NULL, 10);
+                       mode = simple_strtoul(argv[5], NULL, 10);
+               } else {
+                       return CMD_RET_USAGE;
+               }
+
+               mmc = find_mmc_device(dev);
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", dev);
+                       return 1;
+               }
+
+               if (IS_SD(mmc)) {
+                       puts("BOOT_BUS_WIDTH only exists on eMMC\n");
+                       return 1;
+               }
+
+               /* acknowledge to be sent during boot operation */
+               return mmc_set_boot_bus_width(mmc, width, reset, mode);
+       } else if (strcmp(argv[1], "bootpart-resize") == 0) {
+               int dev;
+               struct mmc *mmc;
+               u32 bootsize, rpmbsize;
+
+               if (argc == 5) {
+                       dev = simple_strtoul(argv[2], NULL, 10);
+                       bootsize = simple_strtoul(argv[3], NULL, 10);
+                       rpmbsize = simple_strtoul(argv[4], NULL, 10);
+               } else {
+                       return CMD_RET_USAGE;
+               }
+
+               mmc = find_mmc_device(dev);
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", dev);
+                       return 1;
+               }
+
+               if (IS_SD(mmc)) {
+                       printf("It is not a EMMC device\n");
+                       return 1;
+               }
+
+               if (0 == mmc_boot_partition_size_change(mmc,
+                                                       bootsize, rpmbsize)) {
+                       printf("EMMC boot partition Size %d MB\n", bootsize);
+                       printf("EMMC RPMB partition Size %d MB\n", rpmbsize);
+                       return 0;
+               } else {
+                       printf("EMMC boot partition Size change Failed.\n");
+                       return 1;
+               }
+#endif /* CONFIG_SUPPORT_EMMC_BOOT */
+       }
+
+       else if (argc == 3 && strcmp(argv[1], "setdsr") == 0) {
+               struct mmc *mmc = find_mmc_device(curr_device);
+               u32 val = simple_strtoul(argv[2], NULL, 16);
+               int ret;
+
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", curr_device);
+                       return 1;
+               }
+               ret = mmc_set_dsr(mmc, val);
+               printf("set dsr %s\n", (!ret) ? "OK, force rescan" : "ERROR");
+               if (!ret) {
+                       mmc->has_init = 0;
+                       if (mmc_init(mmc))
+                               return 1;
+                       else
+                               return 0;
+               }
+               return ret;
        }
 
        state = MMC_INVALID;
@@ -282,6 +386,13 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
                mmc_init(mmc);
 
+               if ((state == MMC_WRITE || state == MMC_ERASE)) {
+                       if (mmc_getwp(mmc) == 1) {
+                               printf("Error: card is write protected!\n");
+                               return 1;
+                       }
+               }
+
                switch (state) {
                case MMC_READ:
                        n = mmc->block_dev.block_read(curr_device, blk,
@@ -317,5 +428,15 @@ U_BOOT_CMD(
        "mmc rescan\n"
        "mmc part - lists available partition on current mmc device\n"
        "mmc dev [dev] [part] - show or set current mmc device [partition]\n"
-       "mmc list - lists available devices");
+       "mmc list - lists available devices\n"
+#ifdef CONFIG_SUPPORT_EMMC_BOOT
+       "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n"
+       " - Set the BOOT_BUS_WIDTH field of the specified device\n"
+       "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n"
+       " - Change sizes of boot and RPMB partitions of specified device\n"
+       "mmc partconf dev boot_ack boot_partition partition_access\n"
+       " - Change the bits of the PARTITION_CONFIG field of the specified device\n"
 #endif
+       "mmc setdsr - set DSR register value\n"
+       );
+#endif /* !CONFIG_GENERIC_MMC */