Fix remaining CONFIG_COMMANDS

update comments
Fix coding style

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/api/api_storage.c b/api/api_storage.c
index 7cd4efb45ba1c8db784c18c92c68f87ec38cdb95..7e6324044d60aaa044fc6d106a15f9a3b56e99c3 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -61,21 +61,21 @@ static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
 
 void dev_stor_init(void)
 {
-#if (CONFIG_COMMANDS & CFG_CMD_IDE)
+#if defined(CONFIG_CMD_IDE)
        specs[ENUM_IDE].max_dev = CFG_IDE_MAXDEVICE;
        specs[ENUM_IDE].enum_started = 0;
        specs[ENUM_IDE].enum_ended = 0;
        specs[ENUM_IDE].type = DEV_TYP_STOR | DT_STOR_IDE;
        specs[ENUM_IDE].name = "ide";
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_USB)
+#if defined(CONFIG_CMD_USB)
        specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
        specs[ENUM_USB].enum_started = 0;
        specs[ENUM_USB].enum_ended = 0;
        specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB;
        specs[ENUM_USB].name = "usb";
 #endif
-#if (CONFIG_COMMANDS & CFG_CMD_SCSI)
+#if defined(CONFIG_CMD_SCSI)
        specs[ENUM_SCSI].max_dev = CFG_SCSI_MAX_DEVICE;
        specs[ENUM_SCSI].enum_started = 0;
        specs[ENUM_SCSI].enum_ended = 0;

diff --git a/board/BuS/EB+MCF-EV123/mii.c b/board/BuS/EB+MCF-EV123/mii.c
index ebd3ed938747a5a633120c20ff8efc1bc03bba40..3ea20a6109ee18362de3359eedeacef317fb30a6 100644 (file)
--- a/board/BuS/EB+MCF-EV123/mii.c
+++ b/board/BuS/EB+MCF-EV123/mii.c
@@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd)
 
        return (mii_reply & 0xffff);    /* data read from phy */
 }
-#endif                         /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
+#endif                         /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
 
 #if defined(CFG_DISCOVER_PHY)
 int mii_discover_phy(struct eth_device *dev)

diff --git a/board/cobra5272/mii.c b/board/cobra5272/mii.c
index fadcbb3ef8d565ca373888ac5b178432e14e201b..d0a4a39f99ffe48371ad352f68a902222e7bf8b4 100644 (file)
--- a/board/cobra5272/mii.c
+++ b/board/cobra5272/mii.c
@@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
 
        return (mii_reply & 0xffff);    /* data read from phy */
 }
-#endif                         /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
+#endif                         /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
 
 #if defined(CFG_DISCOVER_PHY)
 int mii_discover_phy(struct eth_device *dev)

diff --git a/board/idmr/mii.c b/board/idmr/mii.c
index f6c63c302bc0fa02aa721c57d2f7e995a7ebb2d8..f130e6e5368c09697235041bea2052fa92d372f2 100644 (file)
--- a/board/idmr/mii.c
+++ b/board/idmr/mii.c
@@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
 
        return (mii_reply & 0xffff);    /* data read from phy */
 }
-#endif                         /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
+#endif                         /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
 
 #if defined(CFG_DISCOVER_PHY)
 int mii_discover_phy(struct eth_device *dev)

diff --git a/board/m5271evb/mii.c b/board/m5271evb/mii.c
index 3830ce7f2854594c93db8d25e14954d2e5f2a993..78a7028bcfae36cff2240b198d0312d698e8d3d8 100644 (file)
--- a/board/m5271evb/mii.c
+++ b/board/m5271evb/mii.c
@@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
 
        return (mii_reply & 0xffff);    /* data read from phy */
 }
-#endif                         /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
+#endif                         /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
 
 #if defined(CFG_DISCOVER_PHY)
 int mii_discover_phy(struct eth_device *dev)

diff --git a/board/m5272c3/mii.c b/board/m5272c3/mii.c
index 0ecc44ace26c6e4b2cfb4f82f0dec861d71c2f93..b30ba803f9215c8b02e124edf0ab72b09e2a5ab0 100644 (file)
--- a/board/m5272c3/mii.c
+++ b/board/m5272c3/mii.c
@@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd)
 
        return (mii_reply & 0xffff);    /* data read from phy */
 }
-#endif                         /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
+#endif                         /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
 
 #if defined(CFG_DISCOVER_PHY)
 int mii_discover_phy(struct eth_device *dev)

diff --git a/board/m5282evb/mii.c b/board/m5282evb/mii.c
index d7c6d1f0e396e5e4f0e42e8b0c207cfd0dd71695..8ae2ec69ce39ee178446af2c3c6b0339cfc15a07 100644 (file)
--- a/board/m5282evb/mii.c
+++ b/board/m5282evb/mii.c
@@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd)
 
        return (mii_reply & 0xffff);    /* data read from phy */
 }
-#endif                         /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */
+#endif                         /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
 
 #if defined(CFG_DISCOVER_PHY)
 int mii_discover_phy(struct eth_device *dev)

diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index 80c4ba21a6849fd1ab7ed18163eb312a7e35f919..55ef346340e1f53518c6001b1e2819ecd9e1a085 100644 (file)
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -165,7 +165,7 @@ void cs8900_get_enetaddr (uchar * addr)
                                 addr[0], addr[1],
                                 addr[2], addr[3],
                                 addr[4], addr[5]) ;
-                       debug ("### Set environment from HW MAC addr = \"%s\"\n",                               ethaddr);
+                       debug ("### Set environment from HW MAC addr = \"%s\"\n", ethaddr);
                        setenv ("ethaddr", ethaddr);
                }
 
@@ -317,6 +317,6 @@ int cs8900_e2prom_write(unsigned char addr, unsigned short value)
        return 0;
 }
 
-#endif /* COMMANDS & CFG_NET */
+#endif /* CONFIG_CMD_NET */
 
 #endif /* CONFIG_DRIVER_CS8900 */

diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index ecdcbd9b32b10c27aba0281c7cfa43d8f4cff487..51cfb7e3e2cccc95b2a1d4ef99ff42751d513d09 100644 (file)
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -36,12 +36,12 @@
  *   AUI/TP selection  ( mine has 10Base2/10BaseT select )
  *
  * Arguments:
- *     io      = for the base address
+ *     io      = for the base address
  *     irq     = for the IRQ
  *
  * author:
- *     Erik Stahlman                           ( erik@vt.edu )
- *     Daris A Nevil                           ( dnevil@snmc.com )
+ *     Erik Stahlman                           ( erik@vt.edu )
+ *     Daris A Nevil                           ( dnevil@snmc.com )
  *
  *
  * Hardware multicast code from Peter Cammaert ( pc@denkart.be )
@@ -53,7 +53,7 @@
  *    o   lan91c96.c (Intel Diagnostic Manager driver)
  *
  * History:
- *     04/30/03  Mathijs Haarman       Modified smc91111.c (u-boot version)
+ *     04/30/03  Mathijs Haarman       Modified smc91111.c (u-boot version)
  *                                     for lan91c96
  *---------------------------------------------------------------------------
  */
@@ -296,8 +296,8 @@ static int poll4int (byte mask, int timeout)
 /*
  * Function: smc_reset( void )
  * Purpose:
- *     This sets the SMC91111 chip to its normal state, hopefully from whatever
- *     mess that any other DOS driver has put it in.
+ *     This sets the SMC91111 chip to its normal state, hopefully from whatever
+ *     mess that any other DOS driver has put it in.
  *
  * Maybe I should reset more registers to defaults in here?  SOFTRST  should
  * do that for me.
@@ -397,7 +397,7 @@ static void smc_shutdown ()
  *     This sends the actual packet to the SMC9xxx chip.
  *
  * Algorithm:
- *     First, see if a saved_skb is available.
+ *     First, see if a saved_skb is available.
  *             ( this should NOT be called if there is no 'saved_skb'
  *     Now, find the packet number that the chip allocated
  *     Point the data pointers at it in memory
@@ -405,9 +405,9 @@ static void smc_shutdown ()
  *     Dump the packet to chip memory
  *     Check if a last byte is needed ( odd length packet )
  *             if so, set the control flag right
- *     Tell the card to send it
+ *     Tell the card to send it
  *     Enable the transmit interrupt, so I know if it failed
- *     Free the kernel data if I actually sent it.
+ *     Free the kernel data if I actually sent it.
  */
 static int smc_send_packet (volatile void *packet, int packet_length)
 {
@@ -865,7 +865,7 @@ static int smc_hw_init ()
 }
 #endif /* 0 */
 
-#endif /* COMMANDS & CFG_NET */
+#endif /* CONFIG_CMD_NET */
 
 
 /* smc_get_ethaddr (bd_t * bd)

diff --git a/drivers/net/netarm_eth.c b/drivers/net/netarm_eth.c
index a99ee5da2e31a44efcf2bc2a58cebdc6c6997407..ecf45dc92f6ed8e0c18ddef1b3c12f6115d1a978 100644 (file)
--- a/drivers/net/netarm_eth.c
+++ b/drivers/net/netarm_eth.c
@@ -29,7 +29,6 @@
 #include "netarm_eth.h"
 #include <asm/arch/netarm_registers.h>
 
-
 #if defined(CONFIG_CMD_NET)
 
 static int na_mii_poll_busy (void);
@@ -56,7 +55,6 @@ static void na_get_mac_addr (void)
        setenv ("ethaddr", ethaddr);
 }
 
-
 static void na_mii_write (int reg, int value)
 {
        int mii_addr;
@@ -355,6 +353,6 @@ extern int eth_send (volatile void *packet, int length)
        return 1;
 }
 
-#endif /* COMMANDS & CFG_NET */
+#endif /* CONFIG_CMD_NET */
 
 #endif /* CONFIG_DRIVER_NETARMETH */

diff --git a/drivers/net/rtl8019.c b/drivers/net/rtl8019.c
index 409a69f0214e21d8088b98ed858babdda15974f1..9d62cab34670e096e18f3b7ee00075dcc7ea5588 100644 (file)
--- a/drivers/net/rtl8019.c
+++ b/drivers/net/rtl8019.c
@@ -36,16 +36,13 @@
 
 #if defined(CONFIG_CMD_NET)
 
-
 /* packet page register access functions */
 
-
 static unsigned char get_reg (unsigned int regno)
 {
        return (*(unsigned char *) regno);
 }
 
-
 static void put_reg (unsigned int regno, unsigned char val)
 {
        *(volatile unsigned char *) regno = val;
@@ -91,7 +88,6 @@ void rtl8019_get_enetaddr (uchar * addr)
        put_reg (RTL8019_COMMAND, RTL8019_PAGE0);
 }
 
-
 void eth_halt (void)
 {
        put_reg (RTL8019_COMMAND, 0x01);
@@ -134,7 +130,6 @@ int eth_init (bd_t * bd)
        return 0;
 }
 
-
 static unsigned char nic_to_pc (void)
 {
        unsigned char rec_head_status;
@@ -277,6 +272,6 @@ extern int eth_send (volatile void *packet, int length)
        return 0;
 }
 
-#endif /* COMMANDS & CFG_NET */
+#endif /* CONFIG_CMD_NET */
 
 #endif /* CONFIG_DRIVER_RTL8019 */

diff --git a/drivers/rtc/rx8025.c b/drivers/rtc/rx8025.c
index 6c94ae171d772a857d96d71fb973d95778098370..9122f12fc07a9056908d5aa39c1700651ca1b0a4 100644 (file)
--- a/drivers/rtc/rx8025.c
+++ b/drivers/rtc/rx8025.c
@@ -142,7 +142,6 @@ void rtc_get (struct rtc_time *tmp)
                tmp->tm_hour, tmp->tm_min, tmp->tm_sec);
 }
 
-
 /*
  * Set the RTC
  */
@@ -166,7 +165,6 @@ void rtc_set (struct rtc_time *tmp)
        rtc_write (RTC_CTL1_REG_ADDR, RTC_CTL1_BIT_2412);
 }
 
-
 /*
  * Reset the RTC. We setting the date back to 1970-01-01.
  */
@@ -200,7 +198,6 @@ void rtc_reset (void)
        return;
 }
 
-
 /*
  * Helper functions
  */
@@ -224,4 +221,4 @@ static unsigned char bin2bcd (unsigned int n)
        return (((n / 10) << 4) | (n % 10));
 }
 
-#endif /* CONFIG_RTC_RX8025 && (CFG_COMMANDS & CFG_CMD_DATE) */
+#endif /* CONFIG_RTC_RX8025 && CONFIG_CMD_DATE */

diff --git a/include/configs/munices.h b/include/configs/munices.h
index 2372b5763b871fea46055a4618b471e108c07066..38b27bb3a776eb24625989ab437b98553ce9ba0d 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -48,7 +48,7 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #  define CFG_CACHELINE_SHIFT  5       /* log base 2 of the above value */
 #endif
 

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 84998d4392a6cf4441036127088a0e704e7c0c05..7a15d97cb0c18422b98c34baa9af176886f67441 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -140,7 +140,7 @@
 #define CONFIG_CMDLINE_TAG      1      /* enable passing of ATAGs      */
 /* #define CONFIG_INITRD_TAG    1 */
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   230400          /* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX  2               /* which serial port to use */
 #endif