ddd
全部博文（22）
分类： 嵌入式
2010-06-03 18:43:29
移植U-Boot-2010.03到友善之臂mini2440（七）
修改4个文件使Nand Flash 支持烧写YAFFS格式的文件系统
（1）common/cmd_nand.c
391行添加
s = strchr(cmd, '.');
if (!s || !strcmp(s, ".jffs2") ||
!strcmp(s, ".e") || !strcmp(s, ".i")) {
if (read)
ret = nand_read_skip_bad(nand, off, &size,
(u_char *)addr);
else
ret = nand_write_skip_bad(nand, off, &size,
(u_char *)addr);
#if defined(ENABLE_CMD_NAND_YAFFS)
}else if ( s != NULL &&
(!strcmp(s, ".yaffs") || !strcmp(s, ".yaffs1"))){
if(read) {
printf("nand read.yaffs[1] is not provide temporarily!");
} else {
nand->rw_oob = 1;
#if defined(ENABLE_CMD_NAND_YAFFS_SKIPFB)
nand->skipfirstblk = 1;
#else
nand->skipfirstblk = 0;
#endif
ret = nand_write_skip_bad(nand,off,&size,(u_char *)addr);
#if defined(ENABLE_CMD_NAND_YAFFS_SKIPFB)
nand->skipfirstblk = 0;
#endif
nand->rw_oob = 0;
}
#endif
} else if (!strcmp(s, ".oob")) {
/* out-of-band data */
518行插入
" to/from memory address 'addr', skipping bad blocks.\n"
"nand erase [clean] [off size] - erase 'size' bytes from\n"
" offset 'off' (entire device if not specified)\n"
#if defined(ENABLE_CMD_NAND_YAFFS)
"nand read[.yaffs[1]] is not provide temporarily!\n"
"nand write[.yaffs[1]] addr off size - write the `size' byte yaffs image starting\n"
" at offset `off' from memory address `addr' (.yaffs1 for 512+16 NAND)\n"
#endif
"nand bad - show bad blocks\n"
"nand dump[.oob] off - dump page\n"
"nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n"
（2）drivers/mtd/nand/nand_base.c
2011行插入代码
static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const uint8_t *buf)
{
struct nand_chip *chip = mtd->priv;
int ret;
#if defined(ENABLE_CMD_NAND_YAFFS)
/*Thanks for hugerat's code!*/
int oldopsmode = 0;
if(mtd->rw_oob==1) {
size_t oobsize = mtd->oobsize;
size_t datasize = mtd->writesize;
int i = 0;
uint8_t oobtemp[oobsize];
int datapages = 0;
datapages = len/(datasize);
for(i=0;i<(datapages);i++) {
memcpy((void *)oobtemp,
(void *)(buf+datasize*(i+1)),
oobsize);
memmove((void *)(buf+datasize*(i+1)),
(void *)(buf+datasize*(i+1)+oobsize),
(datapages-(i+1))*(datasize)+(datapages-1)*oobsize);
memcpy((void *)(buf+(datapages)*(datasize+oobsize)-oobsize),
(void *)(oobtemp),
oobsize);
}
}
#endif
/* Do not allow reads past end of device */
if ((to + len) > mtd->size)
return -EINVAL;
if (!len)
return 0;
nand_get_device(chip, mtd, FL_WRITING);
行 2044
chip->ops.len = len;
chip->ops.datbuf = (uint8_t *)buf;
//chip->ops.oobbuf = NULL;
#if defined(ENABLE_CMD_NAND_YAFFS)
/*Thanks for hugerat's code!*/
if(mtd->rw_oob!=1) {
chip->ops.oobbuf = NULL;
} else {
chip->ops.oobbuf = (uint8_t *)(buf+len);
chip->ops.ooblen = mtd->oobsize;
oldopsmode = chip->ops.mode;
chip->ops.mode = MTD_OOB_RAW;
}
#else
chip->ops.oobbuf = NULL;
#endif
ret = nand_do_write_ops(mtd, to, &chip->ops);
*retlen = chip->ops.retlen;
nand_release_device(mtd);
#if defined(ENABLE_CMD_NAND_YAFFS)
/*Thanks for hugerat's code!*/
chip->ops.mode = oldopsmode;
#endif
return ret;
(3) drivers/mtd/nand/nand_util.c
483行插入代码
size_t left_to_write = *length;
size_t len_incl_bad;
u_char *p_buffer = buffer;
#if defined(ENABLE_CMD_NAND_YAFFS)
/*Thanks for hugerat's code*/
if(nand->rw_oob==1) {
size_t oobsize = nand->oobsize;
size_t datasize = nand->writesize;
int datapages = 0;
if (((*length)%(nand->oobsize+nand->writesize)) != 0) {
printf ("Attempt to write error length data!\n");
return -EINVAL;
}
datapages = *length/(datasize+oobsize);
*length = datapages*datasize;
left_to_write = *length;
}
#endif
/* Reject writes, which are not page aligned */
if ((offset & (nand->writesize - 1)) != 0 ||
515行插入代码：
len_incl_bad = get_len_incl_bad (nand, offset, *length);
if ((offset + len_incl_bad) > nand->size) {
printf ("Attempt to write outside the flash area\n");
return -EINVAL;
}
#if !defined(ENABLE_CMD_NAND_YAFFS)
if (len_incl_bad == *length) {
rval = nand_write (nand, offset, length, buffer);
if (rval != 0)
printf ("NAND write to offset %llx failed %d\n",
offset, rval);
return rval;
}
#endif
while (left_to_write > 0) {
size_t block_offset = offset & (nand->erasesize - 1);
size_t write_size;
WATCHDOG_RESET ();
行537插入代码：
if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) {
printf ("Skip bad block 0x%08llx\n",
offset & ~(nand->erasesize - 1));
offset += nand->erasesize - block_offset;
continue;
}
#if defined(ENABLE_CMD_NAND_YAFFS)
/*Thanks for hugerat's code*/
if(nand->skipfirstblk==1) {
nand->skipfirstblk=0;
printf ("Skip the first good block %llx\n",
offset & ~(nand->erasesize - 1));
offset += nand->erasesize - block_offset;
continue;
}
#endif
if (left_to_write < (nand->erasesize - block_offset))
write_size = left_to_write;
else
write_size = nand->erasesize - block_offset;
printf("\rWriting at 0x%llx -- ",offset); /*551行*/
rval = nand_write (nand, offset, &write_size, p_buffer);
if (rval != 0) {
printf ("NAND write to offset %llx failed %d\n",
offset, rval);
*length -= left_to_write;
return rval;
}
left_to_write -= write_size;
printf("%d%% is complete.",100-(left_to_write/(*length/100)));/*561行*/
offset += write_size;
//p_buffer += write_size;
#if defined(ENABLE_CMD_NAND_YAFFS)
/*Thanks for hugerat's code*/
if(nand->rw_oob==1) {
p_buffer += write_size+(write_size/nand->writesize*nand->oobsize);
} else {
p_buffer += write_size;
}
#else
p_buffer += write_size;
#endif
}
return 0;
}
(4) include/linux/mtd/mtd.h
131行添加代码 ：
#if defined(ENABLE_CMD_NAND_YAFFS)
/*Thanks for hugerat's code*/
u_char rw_oob;
u_char skipfirstblk;
#endif
