projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /home/sr/git/u-boot
[oweals/u-boot.git]
/
common
/
cmd_nand.c
diff --git
a/common/cmd_nand.c
b/common/cmd_nand.c
index 6057dd1a2a317d5989e25aae0e8573917519c1bd..b0c01d1205aa50e45ea0e78964a5a3a0f3fd9b1f 100644
(file)
--- a/
common/cmd_nand.c
+++ b/
common/cmd_nand.c
@@
-200,12
+200,12
@@
int do_nand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
/* read out-of-band data */
if (cmd & NANDRW_READ) {
ret = nand_read_oob(nand_dev_desc + curr_device,
/* read out-of-band data */
if (cmd & NANDRW_READ) {
ret = nand_read_oob(nand_dev_desc + curr_device,
- off, size, &total,
+ off, size,
(size_t *)
&total,
(u_char*)addr);
}
else {
ret = nand_write_oob(nand_dev_desc + curr_device,
(u_char*)addr);
}
else {
ret = nand_write_oob(nand_dev_desc + curr_device,
- off, size, &total,
+ off, size,
(size_t *)
&total,
(u_char*)addr);
}
return ret;
(u_char*)addr);
}
return ret;
@@
-225,10
+225,11
@@
int do_nand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
#ifdef CFG_NAND_SKIP_BAD_DOT_I
/* need ".i" same as ".jffs2s" for compatibility with older units (esd) */
/* ".i" for image -> read skips bad block (no 0xff) */
#ifdef CFG_NAND_SKIP_BAD_DOT_I
/* need ".i" same as ".jffs2s" for compatibility with older units (esd) */
/* ".i" for image -> read skips bad block (no 0xff) */
- else if (cmdtail && !strcmp(cmdtail, ".i"))
+ else if (cmdtail && !strcmp(cmdtail, ".i"))
{
cmd |= NANDRW_JFFS2; /* skip bad blocks (on read too) */
if (cmd & NANDRW_READ)
cmd |= NANDRW_JFFS2_SKIP; /* skip bad blocks (on read too) */
cmd |= NANDRW_JFFS2; /* skip bad blocks (on read too) */
if (cmd & NANDRW_READ)
cmd |= NANDRW_JFFS2_SKIP; /* skip bad blocks (on read too) */
+ }
#endif /* CFG_NAND_SKIP_BAD_DOT_I */
else if (cmdtail) {
printf ("Usage:\n%s\n", cmdtp->usage);
#endif /* CFG_NAND_SKIP_BAD_DOT_I */
else if (cmdtail) {
printf ("Usage:\n%s\n", cmdtp->usage);
@@
-240,7
+241,7
@@
int do_nand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
curr_device, off, size);
ret = nand_rw(nand_dev_desc + curr_device, cmd, off, size,
curr_device, off, size);
ret = nand_rw(nand_dev_desc + curr_device, cmd, off, size,
- &total, (u_char*)addr);
+
(size_t *)
&total, (u_char*)addr);
printf (" %d bytes %s: %s\n", total,
(cmd & NANDRW_READ) ? "read" : "written",
printf (" %d bytes %s: %s\n", total,
(cmd & NANDRW_READ) ? "read" : "written",
@@
-400,7
+401,7
@@
U_BOOT_CMD(
*/
int check_block (struct nand_chip *nand, unsigned long pos)
{
*/
int check_block (struct nand_chip *nand, unsigned long pos)
{
-
in
t retlen;
+
size_
t retlen;
uint8_t oob_data;
uint16_t oob_data16[6];
int page0 = pos & (-nand->erasesize);
uint8_t oob_data;
uint16_t oob_data16[6];
int page0 = pos & (-nand->erasesize);
@@
-422,9
+423,9
@@
int check_block (struct nand_chip *nand, unsigned long pos)
return 1;
} else {
/* Note - bad block marker can be on first or second page */
return 1;
} else {
/* Note - bad block marker can be on first or second page */
- if (nand_read_oob(nand, page0 + badpos, 1, &retlen, &oob_data)
+ if (nand_read_oob(nand, page0 + badpos, 1, &retlen,
(unsigned char *)
&oob_data)
|| oob_data != 0xff
|| oob_data != 0xff
- || nand_read_oob (nand, page1 + badpos, 1, &retlen, &oob_data)
+ || nand_read_oob (nand, page1 + badpos, 1, &retlen,
(unsigned char *)
&oob_data)
|| oob_data != 0xff)
return 1;
}
|| oob_data != 0xff)
return 1;
}
@@
-500,11
+501,11
@@
int nand_rw (struct nand_chip* nand, int cmd,
if (cmd & NANDRW_READ) {
ret = nand_read_ecc(nand, start,
min(len, eblk + erasesize - start),
if (cmd & NANDRW_READ) {
ret = nand_read_ecc(nand, start,
min(len, eblk + erasesize - start),
-
&n, (u_char*)buf,
eccbuf);
+
(size_t *)&n, (u_char*)buf, (u_char *)
eccbuf);
} else {
ret = nand_write_ecc(nand, start,
min(len, eblk + erasesize - start),
} else {
ret = nand_write_ecc(nand, start,
min(len, eblk + erasesize - start),
-
&n, (u_char*)buf,
eccbuf);
+
(size_t *)&n, (u_char*)buf, (u_char *)
eccbuf);
}
if (ret)
}
if (ret)
@@
-670,11
+671,12
@@
static int NanD_IdentChip(struct nand_chip *nand, int floor, int chip)
id = READ_NAND(nand->IO_ADDR);
NAND_DISABLE_CE(nand); /* set pin high */
id = READ_NAND(nand->IO_ADDR);
NAND_DISABLE_CE(nand); /* set pin high */
- /* No response - return failure */
- if (mfr == 0xff || mfr == 0) {
+
#ifdef NAND_DEBUG
#ifdef NAND_DEBUG
-
printf("NanD_Command (ReadID) got %d %d
\n", mfr, id);
+
printf("NanD_Command (ReadID) got %x %x
\n", mfr, id);
#endif
#endif
+ if (mfr == 0xff || mfr == 0) {
+ /* No response - return failure */
return 0;
}
return 0;
}
@@
-1218,6
+1220,8
@@
static int nand_write_page (struct nand_chip *nand,
}
if (nand->bus16) {
for (i = 0; i < nand->oobsize; i += 2) {
}
if (nand->bus16) {
for (i = 0; i < nand->oobsize; i += 2) {
+ u16 val;
+
val = READ_NAND (nand->IO_ADDR);
nand->data_buf[i] = val & 0xff;
nand->data_buf[i + 1] = val >> 8;
val = READ_NAND (nand->IO_ADDR);
nand->data_buf[i] = val & 0xff;
nand->data_buf[i + 1] = val >> 8;
@@
-1587,7
+1591,7
@@
int nand_erase(struct nand_chip* nand, size_t ofs, size_t len, int clean)
l = NAND_JFFS2_OOB16_FSDALEN;
}
l = NAND_JFFS2_OOB16_FSDALEN;
}
- ret = nand_write_oob(nand, ofs + p, l, &n,
+ ret = nand_write_oob(nand, ofs + p, l,
(size_t *)
&n,
(u_char *)&clean_marker);
/* quit here if write failed */
if (ret)
(u_char *)&clean_marker);
/* quit here if write failed */
if (ret)