From 4e109ae98294a5ca7ff848b7652c7bfd4023a94a Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@jdl.com>
Date: Mon, 11 Jun 2007 19:02:20 -0500
Subject: 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>
---
 fs/ext2/dev.c    | 2 +-
 fs/ext2/ext2fs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'fs/ext2')

diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c
index 1469e98..3904e81 100644
--- a/fs/ext2/dev.c
+++ b/fs/ext2/dev.c
@@ -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>
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index 9cf2fb7..6caae35 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -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>
-- 
cgit v1.1


From dd60d1223b99a88a7216f3e041fe40634ad4c2bb Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Mon, 9 Jul 2007 17:56:50 -0500
Subject: fs/: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
 fs/ext2/dev.c    | 2 +-
 fs/ext2/ext2fs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'fs/ext2')

diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c
index 3904e81..49a55b9 100644
--- a/fs/ext2/dev.c
+++ b/fs/ext2/dev.c
@@ -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>
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index 6caae35..e65e39b 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -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>
-- 
cgit v1.1


From f40a7f3e3888b42a43674b099e5470022c8c544c Mon Sep 17 00:00:00 2001
From: Jon Loeliger <jdl@freescale.com>
Date: Tue, 10 Jul 2007 11:07:56 -0500
Subject: fs/: Remove lingering references to CFG_CMD_* symbols.

Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
---
 fs/ext2/dev.c    | 2 +-
 fs/ext2/ext2fs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'fs/ext2')

diff --git a/fs/ext2/dev.c b/fs/ext2/dev.c
index 49a55b9..643a1a8 100644
--- a/fs/ext2/dev.c
+++ b/fs/ext2/dev.c
@@ -123,4 +123,4 @@ int ext2fs_devread (int sector, int byte_offset, int byte_len, char *buf) {
 	}
 	return (1);
 }
-#endif /* CFG_CMD_EXT2FS */
+#endif
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index e65e39b..513a2f9 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -875,4 +875,4 @@ fail:
 	return (0);
 }
 
-#endif /* CFG_CMD_EXT2FS */
+#endif
-- 
cgit v1.1