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 5648ab21785dee96053a6b85f3620924d4d8f610..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;
@@
-241,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",
@@
-401,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);
@@
-423,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;
}
@@
-501,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)
@@
-1591,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)