diff options
| author | Jon Loeliger <jdl@freescale.com> | 2007-07-09 17:56:50 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2007-07-09 17:56:50 -0500 |
| commit | dd60d1223b99a88a7216f3e041fe40634ad4c2bb (patch) | |
| tree | ad989ddda87bf9ee7d514aeaa53a412e92d1d4d6 /fs/jffs2/jffs2_1pass.c | |
| parent | c91898bbc505aff3e12a807af88e76da18efb7ee (diff) | |
| download | u-boot-imx-dd60d1223b99a88a7216f3e041fe40634ad4c2bb.zip u-boot-imx-dd60d1223b99a88a7216f3e041fe40634ad4c2bb.tar.gz u-boot-imx-dd60d1223b99a88a7216f3e041fe40634ad4c2bb.tar.bz2 | |
fs/: Remove obsolete references to CONFIG_COMMANDS
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'fs/jffs2/jffs2_1pass.c')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index af2a8e2..0d6d673 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -117,7 +117,7 @@ #include <linux/stat.h> #include <linux/time.h> -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2) +#if defined(CONFIG_CMD_JFFS2) #include <jffs2/jffs2.h> #include <jffs2/jffs2_1pass.h> @@ -144,7 +144,7 @@ static struct part_info *current_part; #if (defined(CONFIG_JFFS2_NAND) && \ - ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) ) + defined(CONFIG_CMD_NAND) ) #if defined(CFG_NAND_LEGACY) #include <linux/mtd/nand_legacy.h> #else @@ -275,10 +275,10 @@ static void put_fl_mem_nand(void *buf) { free(buf); } -#endif /* #if defined(CONFIG_JFFS2_NAND) && (CONFIG_COMMANDS & CFG_CMD_NAND) */ +#endif -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH) +#if defined(CONFIG_CMD_FLASH) /* * Support for jffs2 on top of NOR-flash * @@ -301,7 +301,7 @@ static inline void *get_node_mem_nor(u32 off) { return (void*)get_fl_mem_nor(off); } -#endif /* #if (CONFIG_COMMANDS & CFG_CMD_FLASH) */ +#endif /* @@ -312,12 +312,12 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) { struct mtdids *id = current_part->dev->id; -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH) +#if defined(CONFIG_CMD_FLASH) if (id->type == MTD_DEV_TYPE_NOR) return get_fl_mem_nor(off); #endif -#if defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) +#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND) if (id->type == MTD_DEV_TYPE_NAND) return get_fl_mem_nand(off, size, ext_buf); #endif @@ -330,13 +330,13 @@ static inline void *get_node_mem(u32 off) { struct mtdids *id = current_part->dev->id; -#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH) +#if defined(CONFIG_CMD_FLASH) if (id->type == MTD_DEV_TYPE_NOR) return get_node_mem_nor(off); #endif #if defined(CONFIG_JFFS2_NAND) && \ - (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) + defined(CONFIG_CMD_NAND) if (id->type == MTD_DEV_TYPE_NAND) return get_node_mem_nand(off); #endif @@ -348,7 +348,7 @@ static inline void *get_node_mem(u32 off) static inline void put_fl_mem(void *buf) { #if defined(CONFIG_JFFS2_NAND) && \ - (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) + defined(CONFIG_CMD_NAND) struct mtdids *id = current_part->dev->id; if (id->type == MTD_DEV_TYPE_NAND) |