diff options
| author | Scott Wood <scottwood@freescale.com> | 2009-04-01 15:02:13 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2009-07-16 19:07:47 -0500 |
| commit | be33b046b549ad88c204c209508cd7657232ffbd (patch) | |
| tree | 5e7c1c74c77a0dbaf7e4f17d3ed047d85beae414 /fs/jffs2 | |
| parent | fbdaafaee71e2c7f2c31b3582ab6d8679efee8d3 (diff) | |
| download | u-boot-be33b046b549ad88c204c209508cd7657232ffbd.tar.gz u-boot-be33b046b549ad88c204c209508cd7657232ffbd.tar.xz u-boot-be33b046b549ad88c204c209508cd7657232ffbd.zip | |
Remove legacy NAND and disk on chip code.
Legacy NAND had been scheduled for removal. Any boards that use this
were already not building in the previous release due to an #error.
The disk on chip code in common/cmd_doc.c relies on legacy NAND,
and it has also been removed. There is newer disk on chip code
in drivers/mtd/nand; someone with access to hardware and sufficient
time and motivation can try to get that working, but for now disk
on chip is not supported.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'fs/jffs2')
| -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 11b66ab4b3..8c9e2eb426 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 6eb674550a..fe8c70d91d 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 |