summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Shijie <b32955@freescale.com>2013-08-20 13:58:37 +0800
committerBrian Norris <computersforpeace@gmail.com>2013-10-22 16:19:23 -0700
commit263e138719f6358c3cf2ce47d6254cebef31dd4b (patch)
treefc8b86307b33dff1fb53cc125640da3b500c1e84
parent8e4c8259a59a62cec829edcbd2559006f57fc2aa (diff)
check the MLC nand type
In the current code, the MTD_NANDFLASH stands for both the SLC and MLC. In the kernel, the MTD_NANDFLASH only stands for the SLC now, so in order to keep the logic unchanged, we should also check the MLC NAND by MTD_MLCNANDFLASH. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-rw-r--r--lib/libmtd.c3
-rw-r--r--ubi-utils/mtdinfo.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/libmtd.c b/lib/libmtd.c
index 3e8109a..2089373 100644
--- a/lib/libmtd.c
+++ b/lib/libmtd.c
@@ -776,7 +776,8 @@ int mtd_get_dev_info1(libmtd_t desc, int mtd_num, struct mtd_dev_info *mtd)
mtd->eb_cnt = mtd->size / mtd->eb_size;
mtd->type = type_str2int(mtd->type_str);
- mtd->bb_allowed = !!(mtd->type == MTD_NANDFLASH);
+ mtd->bb_allowed = !!(mtd->type == MTD_NANDFLASH ||
+ mtd->type == MTD_MLCNANDFLASH);
return 0;
}
diff --git a/ubi-utils/mtdinfo.c b/ubi-utils/mtdinfo.c
index a9dc675..5ac95aa 100644
--- a/ubi-utils/mtdinfo.c
+++ b/ubi-utils/mtdinfo.c
@@ -315,7 +315,7 @@ static int print_dev_info(libmtd_t libmtd, const struct mtd_info *mtd_info, int
printf("Sub-page size: %d %s\n",
mtd.subpage_size,
mtd.subpage_size > 1 ? "bytes" : "byte");
- else if (mtd.type == MTD_NANDFLASH)
+ else if (mtd.type == MTD_NANDFLASH || mtd.type == MTD_MLCNANDFLASH)
printf("Sub-page size: unknown\n");
if (mtd.oob_size > 0)