Commit 856f0544 authored by Stefan Roese's avatar Stefan Roese

[PATCH] NAND: Partition name support added to NAND subsystem

chpart, nboot and NAND subsystem related commands now accept also partition
name to specify offset.
Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarStefan Roese <sr@denx.de>
parent 07a69a18
......@@ -1300,7 +1300,7 @@ static void list_partitions(void)
* Given partition identifier in form of <dev_type><dev_num>,<part_num> find
* corresponding device and verify partition number.
*
* @param id string describing device and partition
* @param id string describing device and partition or partition name
* @param dev pointer to the requested device (output)
* @param part_num verified partition number (output)
* @param part pointer to requested partition (output)
......@@ -1309,11 +1309,23 @@ static void list_partitions(void)
int find_dev_and_part(const char *id, struct mtd_device **dev,
u8 *part_num, struct part_info **part)
{
struct list_head *dentry, *pentry;
u8 type, dnum, pnum;
const char *p;
DEBUGF("--- find_dev_and_part ---\nid = %s\n", id);
list_for_each(dentry, &devices) {
*part_num = 0;
*dev = list_entry(dentry, struct mtd_device, link);
list_for_each(pentry, &(*dev)->parts) {
*part = list_entry(pentry, struct part_info, link);
if (strcmp((*part)->name, id) == 0)
return 0;
(*part_num)++;
}
}
p = id;
*dev = NULL;
*part = NULL;
......
This diff is collapsed.
......@@ -34,14 +34,19 @@ Commands:
nand device num
Make device `num' the current device and print information about it.
nand erase off size
nand erase clean [off size]
Erase `size' bytes starting at offset `off'. Only complete erase
blocks can be erased.
nand erase off|partition size
nand erase clean [off|partition size]
Erase `size' bytes starting at offset `off'. Alternatively partition
name can be specified, in this case size will be eventually limited
to not exceed partition size (this behaviour applies also to read
and write commands). Only complete erase blocks can be erased.
If `erase' is specified without an offset or size, the entire flash
is erased. If `erase' is specified with partition but without an
size, the entire partition is erased.
If `clean' is specified, a JFFS2-style clean marker is written to
each block after it is erased. If `clean' is specified without an
offset or size, the entire flash is erased.
each block after it is erased.
This command will not erase blocks that are marked bad. There is
a debug option in cmd_nand.c to allow bad blocks to be erased.
......@@ -51,28 +56,28 @@ Commands:
nand info
Print information about all of the NAND devices found.
nand read addr ofs size
nand read addr ofs|partition size
Read `size' bytes from `ofs' in NAND flash to `addr'. If a page
cannot be read because it is marked bad or an uncorrectable data
error is found the command stops with an error.
nand read.jffs2 addr ofs size
nand read.jffs2 addr ofs|partition size
Like `read', but the data for blocks that are marked bad is read as
0xff. This gives a readable JFFS2 image that can be processed by
the JFFS2 commands such as ls and fsload.
nand read.oob addr ofs size
nand read.oob addr ofs|partition size
Read `size' bytes from the out-of-band data area corresponding to
`ofs' in NAND flash to `addr'. This is limited to the 16 bytes of
data for one 512-byte page or 2 256-byte pages. There is no check
for bad blocks or ECC errors.
nand write addr ofs size
nand write addr ofs|partition size
Write `size' bytes from `addr' to `ofs' in NAND flash. If a page
cannot be written because it is marked bad or the write fails the
command stops with an error.
nand write.jffs2 addr ofs size
nand write.jffs2 addr ofs|partition size
Like `write', but blocks that are marked bad are skipped and the
is written to the next block instead. This allows writing writing
a JFFS2 image, as long as the image is short enough to fit even
......@@ -80,7 +85,7 @@ Commands:
produced by mkfs.jffs2 should work well, but loading an image copied
from another flash is going to be trouble if there are any bad blocks.
nand write.oob addr ofs size
nand write.oob addr ofs|partition size
Write `size' bytes from `addr' to the out-of-band data area
corresponding to `ofs' in NAND flash. This is limited to the 16 bytes
of data for one 512-byte page or 2 256-byte pages. There is no check
......
......@@ -83,15 +83,8 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
erase.mtd = meminfo;
erase.len = meminfo->erasesize;
if (opts->offset == 0 && opts->length == 0) {
/* erase complete chip */
erase.addr = 0;
erase_length = meminfo->size;
} else {
/* erase specified region */
erase.addr = opts->offset;
erase_length = opts->length;
}
erase.addr = opts->offset;
erase_length = opts->length;
isNAND = meminfo->type == MTD_NANDFLASH ? 1 : 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment