summaryrefslogtreecommitdiff
path: root/fs/fat
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:02:20 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:23:12 +0200
commit4e109ae98294a5ca7ff848b7652c7bfd4023a94a (patch)
tree80dcbdc72dba03e92ffa147d4e4245a65d9af5d2 /fs/fat
parentd5be43de93ff905c465e509d45a3164ef48d26e7 (diff)
downloadu-boot-imx-4e109ae98294a5ca7ff848b7652c7bfd4023a94a.zip
u-boot-imx-4e109ae98294a5ca7ff848b7652c7bfd4023a94a.tar.gz
u-boot-imx-4e109ae98294a5ca7ff848b7652c7bfd4023a94a.tar.bz2
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>
Diffstat (limited to 'fs/fat')
-rw-r--r--[-rwxr-xr-x]fs/fat/fat.c14
-rw-r--r--fs/fat/file.c2
2 files changed, 9 insertions, 7 deletions
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 3007608..fd93588 100755..100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -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;
diff --git a/fs/fat/file.c b/fs/fat/file.c
index f999ac5..34d0461 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -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[] = {