minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

Browse Source
This commit is contained in:
Wolfgang Denk 2009-03-18 00:39:10 +01:00
commit efa0215228
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/cmd_nand.c
View File

@ -502,7 +502,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
s = strchr(cmd, '.'); s = strchr(cmd, '.');
if (s != NULL && if (s != NULL &&
(strcmp(s, ".jffs2") && !strcmp(s, ".e") && !strcmp(s, ".i"))) { (strcmp(s, ".jffs2") && strcmp(s, ".e") && strcmp(s, ".i"))) {
printf("Unknown nand load suffix '%s'\n", s); printf("Unknown nand load suffix '%s'\n", s);
show_boot_progress(-53); show_boot_progress(-53);
return 1; return 1;
@ -511,7 +511,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset); printf("\nLoading from %s, offset 0x%lx\n", nand->name, offset);
cnt = nand->writesize; cnt = nand->writesize;
r = nand_read(nand, offset, &cnt, (u_char *) addr); r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
if (r) { if (r) {
puts("** Read error\n"); puts("** Read error\n");
show_boot_progress (-56); show_boot_progress (-56);
@ -543,8 +543,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand,
} }
show_boot_progress (57); show_boot_progress (57);
/* FIXME: skip bad blocks */ r = nand_read_skip_bad(nand, offset, &cnt, (u_char *) addr);
r = nand_read(nand, offset, &cnt, (u_char *) addr);
if (r) { if (r) {
puts("** Read error\n"); puts("** Read error\n");
show_boot_progress (-58); show_boot_progress (-58);