Browse Source

fs/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

This is a compatibility step that allows both the older form
and the new form to co-exist for a while until the older can
be removed entirely.

All transformations are of the form:
Before:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

Signed-off-by: Jon Loeliger <jdl@freescale.com>
imx_v2009.08_10.04.01
Jon Loeliger 14 years ago
committed by Wolfgang Denk
parent
commit
4e109ae982
23 changed files with 37 additions and 35 deletions
  1. +1
    -1
      fs/cramfs/cramfs.c
  2. +1
    -1
      fs/cramfs/uncompress.c
  3. +1
    -1
      fs/ext2/dev.c
  4. +1
    -1
      fs/ext2/ext2fs.c
  5. +8
    -6
      fs/fat/fat.c
  6. +1
    -1
      fs/fat/file.c
  7. +1
    -1
      fs/fdos/dev.c
  8. +1
    -1
      fs/fdos/fat.c
  9. +1
    -1
      fs/fdos/fdos.c
  10. +1
    -1
      fs/fdos/fs.c
  11. +1
    -1
      fs/fdos/subdir.c
  12. +1
    -1
      fs/fdos/vfat.c
  13. +1
    -1
      fs/jffs2/compr_lzari.c
  14. +1
    -1
      fs/jffs2/compr_lzo.c
  15. +1
    -1
      fs/jffs2/compr_rtime.c
  16. +1
    -1
      fs/jffs2/compr_rubin.c
  17. +1
    -1
      fs/jffs2/compr_zlib.c
  18. +8
    -8
      fs/jffs2/jffs2_1pass.c
  19. +1
    -1
      fs/jffs2/jffs2_nand_1pass.c
  20. +1
    -1
      fs/jffs2/mini_inflate.c
  21. +1
    -1
      fs/reiserfs/dev.c
  22. +1
    -1
      fs/reiserfs/mode_string.c
  23. +1
    -1
      fs/reiserfs/reiserfs.c

+ 1
- 1
fs/cramfs/cramfs.c View File

@ -27,7 +27,7 @@
#include <common.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#include <asm/byteorder.h>
#include <linux/stat.h>


+ 1
- 1
fs/cramfs/uncompress.c View File

@ -25,7 +25,7 @@
#include <watchdog.h>
#include <zlib.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
static z_stream stream;


+ 1
- 1
fs/ext2/dev.c View File

@ -25,7 +25,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_EXT2)
#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
#include <config.h>
#include <ext2fs.h>


+ 1
- 1
fs/ext2/ext2fs.c View File

@ -25,7 +25,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_EXT2)
#if (CONFIG_COMMANDS & CFG_CMD_EXT2) || defined(CONFIG_CMD_EXT2)
#include <ext2fs.h>
#include <malloc.h>
#include <asm/byteorder.h>


+ 8
- 6
fs/fat/fat.c View File

@ -31,7 +31,7 @@
#include <asm/byteorder.h>
#include <part.h>
#if (CONFIG_COMMANDS & CFG_CMD_FAT)
#if (CONFIG_COMMANDS & CFG_CMD_FAT) || 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) || \
(CONFIG_COMMANDS & CFG_CMD_SCSI) || \
(CONFIG_COMMANDS & CFG_CMD_USB) || \
#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) || \
(defined(CONFIG_MMC) && defined(CONFIG_LPC2292)) || \
defined(CONFIG_SYSTEMACE) )
disk_partition_t info;
@ -975,8 +975,10 @@ file_fat_detectfs(void)
printf("No current device\n");
return 1;
}
#if (CONFIG_COMMANDS & CFG_CMD_IDE) || (CONFIG_COMMANDS & CFG_CMD_SCSI) || \
(CONFIG_COMMANDS & CFG_CMD_USB) || (CONFIG_MMC)
#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) || \
(CONFIG_MMC)
printf("Interface: ");
switch(cur_dev->if_type) {
case IF_TYPE_IDE : printf("IDE"); break;


+ 1
- 1
fs/fat/file.c View File

@ -32,7 +32,7 @@
#include <linux/stat.h>
#include <linux/time.h>
#if (CONFIG_COMMANDS & CFG_CMD_FAT)
#if (CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT)
/* Supported filesystems */
static const struct filesystem filesystems[] = {


+ 1
- 1
fs/fdos/dev.c View File

@ -28,7 +28,7 @@
#include "dos.h"
#include "fdos.h"
#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#define NB_HEADS 2
#define NB_TRACKS 80


+ 1
- 1
fs/fdos/fat.c View File

@ -26,7 +26,7 @@
#include <config.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#include "dos.h"
#include "fdos.h"


+ 1
- 1
fs/fdos/fdos.c View File

@ -25,7 +25,7 @@
#include <common.h>
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#include <malloc.h>
#include "dos.h"
#include "fdos.h"


+ 1
- 1
fs/fdos/fs.c View File

@ -26,7 +26,7 @@
#include <config.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#include "dos.h"
#include "fdos.h"


+ 1
- 1
fs/fdos/subdir.c View File

@ -26,7 +26,7 @@
#include <config.h>
#include <malloc.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#include "dos.h"
#include "fdos.h"


+ 1
- 1
fs/fdos/vfat.c View File

@ -25,7 +25,7 @@
#include <common.h>
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_FDOS)
#if (CONFIG_COMMANDS & CFG_CMD_FDOS) || defined(CONFIG_CMD_FDOS)
#include <linux/ctype.h>
#include "dos.h"


+ 1
- 1
fs/jffs2/compr_lzari.c View File

@ -50,7 +50,7 @@ All rights reserved. Permission granted for non-commercial use.
#include <config.h>
#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI))
#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_LZO_LZARI)
#include <linux/stddef.h>
#include <jffs2/jffs2.h>


+ 1
- 1
fs/jffs2/compr_lzo.c View File

@ -67,7 +67,7 @@
#include <config.h>
#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) && defined(CONFIG_JFFS2_LZO_LZARI))
#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)) && defined(CONFIG_JFFS2_LZO_LZARI)
#include <linux/stddef.h>
#include <jffs2/jffs2.h>


+ 1
- 1
fs/jffs2/compr_rtime.c View File

@ -46,7 +46,7 @@
*/
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h>


+ 1
- 1
fs/jffs2/compr_rubin.c View File

@ -39,7 +39,7 @@
*/
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h>
#include <jffs2/compr_rubin.h>


+ 1
- 1
fs/jffs2/compr_zlib.c View File

@ -37,7 +37,7 @@
#include <common.h>
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h>
#include <jffs2/mini_inflate.h>


+ 8
- 8
fs/jffs2/jffs2_1pass.c View File

@ -117,7 +117,7 @@
#include <linux/stat.h>
#include <linux/time.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#include <jffs2/jffs2.h>
#include <jffs2/jffs2_1pass.h>
@ -143,7 +143,7 @@
/* keeps pointer to currentlu processed partition */
static struct part_info *current_part;
#if defined(CONFIG_JFFS2_NAND) && (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND))
#if defined(CFG_NAND_LEGACY)
#include <linux/mtd/nand_legacy.h>
#else
@ -277,7 +277,7 @@ static void put_fl_mem_nand(void *buf)
#endif /* #if defined(CONFIG_JFFS2_NAND) && (CONFIG_COMMANDS & CFG_CMD_NAND) */
#if (CONFIG_COMMANDS & CFG_CMD_FLASH)
#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || defined(CONFIG_CMD_FLASH)
/*
* Support for jffs2 on top of NOR-flash
*
@ -311,12 +311,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)
#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || 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)
#if defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND))
if (id->type == MTD_DEV_TYPE_NAND)
return get_fl_mem_nand(off, size, ext_buf);
#endif
@ -329,12 +329,12 @@ static inline void *get_node_mem(u32 off)
{
struct mtdids *id = current_part->dev->id;
#if (CONFIG_COMMANDS & CFG_CMD_FLASH)
#if (CONFIG_COMMANDS & CFG_CMD_FLASH) || 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)
#if defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
if (id->type == MTD_DEV_TYPE_NAND)
return get_node_mem_nand(off);
#endif
@ -345,7 +345,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)
#if defined(CONFIG_JFFS2_NAND) && ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
struct mtdids *id = current_part->dev->id;
if (id->type == MTD_DEV_TYPE_NAND)


+ 1
- 1
fs/jffs2/jffs2_nand_1pass.c View File

@ -1,6 +1,6 @@
#include <common.h>
#if !defined(CFG_NAND_LEGACY) && (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if !defined(CFG_NAND_LEGACY) && ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2))
#include <malloc.h>
#include <linux/stat.h>


+ 1
- 1
fs/jffs2/mini_inflate.c View File

@ -25,7 +25,7 @@
#include <config.h>
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#include <jffs2/mini_inflate.h>


+ 1
- 1
fs/reiserfs/dev.c View File

@ -19,7 +19,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_REISER)
#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
#include <config.h>
#include <reiserfs.h>


+ 1
- 1
fs/reiserfs/mode_string.c View File

@ -26,7 +26,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_REISER)
#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
#include <linux/stat.h>
#if ( S_ISUID != 04000 ) || ( S_ISGID != 02000 ) || ( S_ISVTX != 01000 ) \


+ 1
- 1
fs/reiserfs/reiserfs.c View File

@ -29,7 +29,7 @@
*/
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_REISER)
#if (CONFIG_COMMANDS & CFG_CMD_REISER) || defined(CONFIG_CMD_REISER)
#include <malloc.h>
#include <linux/ctype.h>


Loading…
Cancel
Save