浏览代码

Fix problem in cmd_nand.c (only when defined CFG_NAND_SKIP_BAD_DOT_I)
Patch by Matthias Fuchs, 4 May 2005

Stefan Roese 19 年之前
父节点
当前提交
9bcf2ab41f
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 3 0
      CHANGELOG
  2. 2 1
      common/cmd_nand.c

+ 3 - 0
CHANGELOG

@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.3:
 Changes for U-Boot 1.1.3:
 ======================================================================
 ======================================================================
 
 
+* Fix problem in cmd_nand.c (only when defined CFG_NAND_SKIP_BAD_DOT_I)
+  Patch by Matthias Fuchs, 4 May 2005
+
 * Update AMCC Yosemite to get a consistent setup for all AMCC eval
 * Update AMCC Yosemite to get a consistent setup for all AMCC eval
   boards (baudrate, environment...). Flash driver fixed.
   boards (baudrate, environment...). Flash driver fixed.
   Patch by Stefan Roese, 11 Aug 2005
   Patch by Stefan Roese, 11 Aug 2005

+ 2 - 1
common/cmd_nand.c

@@ -225,10 +225,11 @@ int do_nand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #ifdef CFG_NAND_SKIP_BAD_DOT_I
 #ifdef CFG_NAND_SKIP_BAD_DOT_I
 		/* need ".i" same as ".jffs2s" for compatibility with older units (esd) */
 		/* need ".i" same as ".jffs2s" for compatibility with older units (esd) */
 		/* ".i" for image -> read skips bad block (no 0xff) */
 		/* ".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) */
 			cmd |= NANDRW_JFFS2;	/* skip bad blocks (on read too) */
 			if (cmd & NANDRW_READ)
 			if (cmd & NANDRW_READ)
 				cmd |= NANDRW_JFFS2_SKIP;	/* skip bad blocks (on read too) */
 				cmd |= NANDRW_JFFS2_SKIP;	/* skip bad blocks (on read too) */
+		}
 #endif /* CFG_NAND_SKIP_BAD_DOT_I */
 #endif /* CFG_NAND_SKIP_BAD_DOT_I */
 		else if (cmdtail) {
 		else if (cmdtail) {
 			printf ("Usage:\n%s\n", cmdtp->usage);
 			printf ("Usage:\n%s\n", cmdtp->usage);