diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-19 00:38:23 +0200 |
| commit | a694610d3361465d4c8d27dde72ab8b63d31115e (patch) | |
| tree | 063d03bcf75538fe45f940eda5b1e6f1859a96fb /fs | |
| parent | 5669ed4557edf2714203aa8625c9fcd5a753b338 (diff) | |
| parent | 2419169f5749d7af501b3b77a5336d1d535320de (diff) | |
| download | u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.zip u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.gz u-boot-imx-a694610d3361465d4c8d27dde72ab8b63d31115e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 20 | ||||
| -rw-r--r-- | fs/jffs2/jffs2_nand_1pass.c | 4 |
2 files changed, 0 insertions, 24 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 11b66ab..8c9e2eb 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -146,11 +146,7 @@ static struct part_info *current_part; #if (defined(CONFIG_JFFS2_NAND) && \ defined(CONFIG_CMD_NAND) ) -#if defined(CONFIG_NAND_LEGACY) -#include <linux/mtd/nand_legacy.h> -#else #include <nand.h> -#endif /* * Support for jffs2 on top of NAND-flash * @@ -161,12 +157,6 @@ static struct part_info *current_part; * */ -#if defined(CONFIG_NAND_LEGACY) -/* this one defined in nand_legacy.c */ -int read_jffs2_nand(size_t start, size_t len, - size_t * retlen, u_char * buf, int nanddev); -#endif - #define NAND_PAGE_SIZE 512 #define NAND_PAGE_SHIFT 9 #define NAND_PAGE_MASK (~(NAND_PAGE_SIZE-1)) @@ -201,15 +191,6 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf) } } -#if defined(CONFIG_NAND_LEGACY) - if (read_jffs2_nand(nand_cache_off, NAND_CACHE_SIZE, - &retlen, nand_cache, id->num) < 0 || - retlen != NAND_CACHE_SIZE) { - printf("read_nand_cached: error reading nand off %#x size %d bytes\n", - nand_cache_off, NAND_CACHE_SIZE); - return -1; - } -#else retlen = NAND_CACHE_SIZE; if (nand_read(&nand_info[id->num], nand_cache_off, &retlen, nand_cache) != 0 || @@ -218,7 +199,6 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf) nand_cache_off, NAND_CACHE_SIZE); return -1; } -#endif } cpy_bytes = nand_cache_off + NAND_CACHE_SIZE - (off + bytes_read); if (cpy_bytes > size - bytes_read) diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index 6eb6745..fe8c70d 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -1,7 +1,5 @@ #include <common.h> -#if !defined(CONFIG_NAND_LEGACY) - #include <malloc.h> #include <linux/stat.h> #include <linux/time.h> @@ -1034,5 +1032,3 @@ jffs2_1pass_info(struct part_info * part) } return 1; } - -#endif |