Commit dd60d122 authored by Jon Loeliger's avatar Jon Loeliger

fs/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
parent c91898bb
......@@ -27,7 +27,7 @@
#include <common.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#if defined(CONFIG_CMD_JFFS2)
#include <asm/byteorder.h>
#include <linux/stat.h>
......
......@@ -25,7 +25,7 @@
#include <watchdog.h>
#include <zlib.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#if defined(CONFIG_CMD_JFFS2)
static z_stream stream;
......
......@@ -25,7 +25,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
#if defined(CONFIG_CMD_EXT2)
#include <config.h>
#include <ext2fs.h>
......
......@@ -25,7 +25,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
#if defined(CONFIG_CMD_EXT2)
#include <ext2fs.h>
#include <malloc.h>
#include <asm/byteorder.h>
......
......@@ -31,7 +31,7 @@
#include <asm/byteorder.h>
#include <part.h>
#if (CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)
#if defined(CONFIG_CMD_FAT)
/*
* Convert a string to lowercase.
......@@ -90,9 +90,9 @@ fat_register_device(block_dev_desc_t *dev_desc, int part_no)
part_offset=0;
}
else {
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE) || \
(CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI) || \
(CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB) || \
#if (defined(CONFIG_CMD_IDE) || \
defined(CONFIG_CMD_SCSI) || \
defined(CONFIG_CMD_USB) || \
(defined(CONFIG_MMC) && defined(CONFIG_LPC2292)) || \
defined(CONFIG_SYSTEMACE) )
disk_partition_t info;
......@@ -975,9 +975,9 @@ file_fat_detectfs(void)
printf("No current device\n");
return 1;
}
#if (CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE) || \
(CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI) || \
(CONFIG_COMMANDS & CFG_CMD_USB) || defined(CONFIG_CMD_USB) || \
#if defined(CONFIG_CMD_IDE) || \
defined(CONFIG_CMD_SCSI) || \
defined(CONFIG_CMD_USB) || \
(CONFIG_MMC)
printf("Interface: ");
switch(cur_dev->if_type) {
......@@ -1019,4 +1019,4 @@ file_fat_read(const char *filename, void *buffer, unsigned long maxsize)
return do_fat_read(filename, buffer, maxsize, LS_NO);
}
#endif /* #if (CONFIG_COMMANDS & CFG_CMD_FAT) */
#endif
......@@ -32,7 +32,7 @@
#include <linux/stat.h>
#include <linux/time.h>
#if (CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)
#if defined(CONFIG_CMD_FAT)
/* Supported filesystems */
static const struct filesystem filesystems[] = {
......@@ -205,4 +205,4 @@ file_read(const char *filename, void *buffer, unsigned long maxsize)
return filesystems[current_filesystem].read(arg, buffer, maxsize);
}
#endif /* #if (CONFIG_COMMANDS & CFG_CMD_FAT) */
#endif
......@@ -28,7 +28,7 @@
#include "dos.h"
#include "fdos.h"
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#if defined(CONFIG_CMD_FDOS)
#define NB_HEADS 2
#define NB_TRACKS 80
......
......@@ -26,7 +26,7 @@
#include <config.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#if defined(CONFIG_CMD_FDOS)
#include "dos.h"
#include "fdos.h"
......
......@@ -25,7 +25,7 @@
#include <common.h>
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#if defined(CONFIG_CMD_FDOS)
#include <malloc.h>
#include "dos.h"
#include "fdos.h"
......
......@@ -26,7 +26,7 @@
#include <config.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#if defined(CONFIG_CMD_FDOS)
#include "dos.h"
#include "fdos.h"
......
......@@ -26,7 +26,7 @@
#include <config.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#if defined(CONFIG_CMD_FDOS)
#include "dos.h"
#include "fdos.h"
......
......@@ -25,7 +25,7 @@
#include <common.h>
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#if defined(CONFIG_CMD_FDOS)
#include <linux/ctype.h>
#include "dos.h"
......
......@@ -50,7 +50,7 @@ All rights reserved. Permission granted for non-commercial use.
#include <config.h>
#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_LZO_LZARI)
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)
#include <linux/stddef.h>
#include <jffs2/jffs2.h>
......@@ -259,4 +259,4 @@ int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out,
{
return Decode(data_in, cpage_out, srclen, destlen);
}
#endif /* ((CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)) */
#endif
......@@ -67,7 +67,7 @@
#include <config.h>
#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_LZO_LZARI)
#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)
#include <linux/stddef.h>
#include <jffs2/jffs2.h>
......@@ -402,4 +402,4 @@ int lzo_decompress(unsigned char *data_in, unsigned char *cpage_out,
return lzo1x_decompress (data_in, srclen, cpage_out, &outlen, NULL);
}
#endif /* ((CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI)) */
#endif
......@@ -46,7 +46,7 @@
*/
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h>
......
......@@ -39,7 +39,7 @@
*/
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h>
#include <jffs2/compr_rubin.h>
......
......@@ -37,7 +37,7 @@
#include <common.h>
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h>
#include <jffs2/mini_inflate.h>
......
......@@ -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)
......
#include <common.h>
#if !defined(CFG_NAND_LEGACY) && ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2))
#if !defined(CFG_NAND_LEGACY) && defined(CONFIG_CMD_JFFS2)
#include <malloc.h>
#include <linux/stat.h>
......
......@@ -25,7 +25,7 @@
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#if defined(CONFIG_CMD_JFFS2)
#include <jffs2/mini_inflate.h>
......
......@@ -19,7 +19,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
#if defined(CONFIG_CMD_REISER)
#include <config.h>
#include <reiserfs.h>
......
......@@ -26,7 +26,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
#if defined(CONFIG_CMD_REISER)
#include <linux/stat.h>
#if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \
......
......@@ -29,7 +29,7 @@
*/
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
#if defined(CONFIG_CMD_REISER)
#include <malloc.h>
#include <linux/ctype.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment