Fix some compile problems introduced by the latest CFG_CMD_xxx cleanup

Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/common/cmd_flash.c b/common/cmd_flash.c
index db38f94d03446ee241be46ece9c6b28530603d5c..11c8857313b42d2e0c95fb8b2b7d82ab4be6511a 100644 (file)
--- a/common/cmd_flash.c
+++ b/common/cmd_flash.c
@@ -33,7 +33,7 @@
 
 #if defined(CONFIG_CMD_FLASH)
 
-#if (defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
+#if defined(CONFIG_CMD_JFFS2) && defined(CONFIG_JFFS2_CMDLINE)
 #include <jffs2/jffs2.h>
 
 /* parition handling routines */

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index e313f2c4b6748d121a523b1a455939f729c04397..de5a5148f69bda90b173a2910a60baeae62615c8 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -538,7 +538,7 @@ int getenv_r (char *name, char *buf, unsigned len)
        return (-1);
 }
 
-#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \
+#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
 int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
@@ -550,7 +550,6 @@ int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return (saveenv() ? 1 : 0);
 }
 
-
 #endif
 
 
@@ -594,7 +593,7 @@ U_BOOT_CMD(
        "    - delete environment variable 'name'\n"
 );
 
-#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) || \
+#if defined(CFG_ENV_IS_IN_NVRAM) || defined(CFG_ENV_IS_IN_EEPROM) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
     || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND))
 U_BOOT_CMD(

diff --git a/drivers/macb.c b/drivers/macb.c
index ffb5f74cc52b66fa23623e6a01bda1f44dce5451..bf7853aadd7252236be4307fea4b371f7b3c3ce5 100644 (file)
--- a/drivers/macb.c
+++ b/drivers/macb.c
@@ -18,7 +18,7 @@
 #include <common.h>
 
 #if defined(CONFIG_MACB) \
-       && (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))
+       && (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII))
 
 /*
  * The u-boot networking stack is a little weird.  It seems like the

diff --git a/net/nfs.c b/net/nfs.c
index 30a897d0633368bf891769c86a79d723536f30da..df2caac48c83ad562767301858387c3b5acc5e3c 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -31,8 +31,7 @@
 
 /*#define NFS_DEBUG*/
 
-#if (defined(CONFIG_CMD_NET) \
-    && defined(CONFIG_CMD_NFS)
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_NFS)
 
 #define HASHES_PER_LINE 65     /* Number of "loading" hashes per line  */
 #define NFS_TIMEOUT 60

diff --git a/net/sntp.c b/net/sntp.c
index 0a7f4782cbb5557cdd1ad225c6747725c3868f1f..95e75422c107dcdbd9eb8f25f021c0d21ba77e4a 100644 (file)
--- a/net/sntp.c
+++ b/net/sntp.c
@@ -12,8 +12,7 @@
 
 #include "sntp.h"
 
-#if (defined(CONFIG_CMD_NET) \
-    && defined(CONFIG_CMD_SNTP)
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_SNTP)
 
 #define SNTP_TIMEOUT 10