diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2007-09-17 17:12:45 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-09-17 17:12:45 +0200 |
| commit | f930922f061ea7bf585296859d1c14194c24b840 (patch) | |
| tree | c46b9f120f7c55f5baf8b6ac3048ba759e10a512 /board/esd/common/auto_update.c | |
| parent | 97213f32416ead885deafea86774e912ffd60ad0 (diff) | |
| parent | 67c31036acaaaa992fc346cc89db0909a7e733c4 (diff) | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'board/esd/common/auto_update.c')
| -rw-r--r-- | board/esd/common/auto_update.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/esd/common/auto_update.c b/board/esd/common/auto_update.c index 62f6c20434..a76b00fe49 100644 --- a/board/esd/common/auto_update.c +++ b/board/esd/common/auto_update.c @@ -24,14 +24,12 @@ #include <common.h> -#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY) -#warning CFG_NAND_LEGACY not defined in a file using the legacy NAND support! -#endif - #include <command.h> #include <image.h> #include <asm/byteorder.h> +#if defined(CFG_NAND_LEGACY) #include <linux/mtd/nand_legacy.h> +#endif #include <fat.h> #include <part.h> @@ -294,6 +292,8 @@ int au_do_update(int i, long sz) rc = nand_legacy_rw(nand_dev_desc, NANDRW_WRITE | NANDRW_JFFS2, start, nbytes, (size_t *)&total, (uchar *)addr); debug ("nand_legacy_rw: ret=%x total=%d nbytes=%d\n", rc, total, nbytes); +#else + rc = -1; #endif } if (rc != 0) { |