cmd: mtdparts: accept spi-nand devices

[oweals/u-boot.git] / cmd / mtdparts.c

diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c
index 9bc977450cf8910aae84c2b6c225c27f2e651402..2e547894c608bf05530c1417bcc933fc31c10eb3 100644 (file)
--- a/cmd/mtdparts.c
+++ b/cmd/mtdparts.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -20,8 +21,6 @@
  *
  *   $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
  *   Copyright 2002 SYSGO Real-Time Solutions GmbH
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -38,7 +37,7 @@
  * mtdids=<idmap>[,<idmap>,...]
  *
  * <idmap>    := <dev-id>=<mtd-id>
- * <dev-id>   := 'nand'|'nor'|'onenand'<dev-num>
+ * <dev-id>   := 'nand'|'nor'|'onenand'|'spi-nand'<dev-num>
  * <dev-num>  := mtd device number, 0...
  * <mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)
  *
@@ -178,13 +177,16 @@ static u64 memsize_parse (const char *const ptr, const char **retptr)
                case 'G':
                case 'g':
                        ret <<= 10;
+                       /* Fallthrough */
                case 'M':
                case 'm':
                        ret <<= 10;
+                       /* Fallthrough */
                case 'K':
                case 'k':
                        ret <<= 10;
                        (*retptr)++;
+                       /* Fallthrough */
                default:
                        break;
        }
@@ -337,7 +339,7 @@ static int part_validate_eraseblock(struct mtdids *id, struct part_info *part)
 
        if (!mtd->numeraseregions) {
                /*
-                * Only one eraseregion (NAND, OneNAND or uniform NOR),
+                * Only one eraseregion (NAND, SPI-NAND, OneNAND or uniform NOR),
                 * checking for alignment is easy here
                 */
                offset = part->offset;
@@ -691,7 +693,7 @@ static int part_parse(const char *const partdef, const char **ret, struct part_i
                part->auto_name = 0;
        } else {
                /* auto generated name in form of size@offset */
-               sprintf(part->name, "0x%08llx@0x%08llx", size, offset);
+               snprintf(part->name, name_len, "0x%08llx@0x%08llx", size, offset);
                part->auto_name = 1;
        }
 
@@ -1028,7 +1030,7 @@ static struct mtdids* id_find_by_mtd_id(const char *mtd_id, unsigned int mtd_id_
 }
 
 /**
- * Parse device id string <dev-id> := 'nand'|'nor'|'onenand'<dev-num>,
+ * Parse device id string <dev-id> := 'nand'|'nor'|'onenand'|'spi-nand'<dev-num>,
  * return device type and number.
  *
  * @param id string describing device id
@@ -1052,6 +1054,9 @@ int mtd_id_parse(const char *id, const char **ret_id, u8 *dev_type,
        } else if (strncmp(p, "onenand", 7) == 0) {
                *dev_type = MTD_DEV_TYPE_ONENAND;
                p += 7;
+       } else if (strncmp(p, "spi-nand", 8) == 0) {
+               *dev_type = MTD_DEV_TYPE_SPINAND;
+               p += 8;
        } else {
                printf("incorrect device type in %s\n", id);
                return 1;
@@ -1634,7 +1639,7 @@ static int parse_mtdids(const char *const ids)
        while(p && (*p != '\0')) {
 
                ret = 1;
-               /* parse 'nor'|'nand'|'onenand'<dev-num> */
+               /* parse 'nor'|'nand'|'onenand'|'spi-nand'<dev-num> */
                if (mtd_id_parse(p, &p, &type, &num) != 0)
                        break;
 
@@ -2110,7 +2115,7 @@ static char mtdparts_help_text[] =
        "'mtdids' - linux kernel mtd device id <-> u-boot device id mapping\n\n"
        "mtdids=<idmap>[,<idmap>,...]\n\n"
        "<idmap>    := <dev-id>=<mtd-id>\n"
-       "<dev-id>   := 'nand'|'nor'|'onenand'<dev-num>\n"
+       "<dev-id>   := 'nand'|'nor'|'onenand'|'spi-nand'<dev-num>\n"
        "<dev-num>  := mtd device number, 0...\n"
        "<mtd-id>   := unique device tag used by linux kernel to find mtd device (mtd->name)\n\n"
        "'mtdparts' - partition list\n\n"