V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of /home/wd/git/u-boot/custodians

This commit is contained in:
Wolfgang Denk 2009-08-21 22:56:01 +02:00
parent b644006e1a 269610f6ba
commit f81c3d7232
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/nand/nand_util.c
View File

@ -508,6 +508,8 @@ int nand_write_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
size_t block_offset = offset & (nand->erasesize - 1); size_t block_offset = offset & (nand->erasesize - 1);
size_t write_size; size_t write_size;
WATCHDOG_RESET ();
if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) { if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) {
printf ("Skip bad block 0x%08llx\n", printf ("Skip bad block 0x%08llx\n",
offset & ~(nand->erasesize - 1)); offset & ~(nand->erasesize - 1));
@ -578,6 +580,8 @@ int nand_read_skip_bad(nand_info_t *nand, loff_t offset, size_t *length,
size_t block_offset = offset & (nand->erasesize - 1); size_t block_offset = offset & (nand->erasesize - 1);
size_t read_length; size_t read_length;
WATCHDOG_RESET ();
if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) { if (nand_block_isbad (nand, offset & ~(nand->erasesize - 1))) {
printf ("Skipping bad block 0x%08llx\n", printf ("Skipping bad block 0x%08llx\n",
offset & ~(nand->erasesize - 1)); offset & ~(nand->erasesize - 1));

2
nand_spl/nand_boot_fsl_elbc.c
View File

@ -120,7 +120,7 @@ static void nand_load(unsigned int offs, int uboot_size, uchar *dst)
pos += page_size; pos += page_size;
offs += page_size; offs += page_size;
} while (offs & (block_size - 1)); } while ((offs & (block_size - 1)) && (pos < uboot_size));
} }
} }