Big white-space cleanup.

[karo-tx-uboot.git] / cpu / mpc5xxx / fec.c

diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c
index 813636655b2d10c607bdbaf1fdeadc4001c9cd54..82640ab77183ea00413f203f9813bf642c254835 100644 (file)
--- a/cpu/mpc5xxx/fec.c
+++ b/cpu/mpc5xxx/fec.c
@@ -18,10 +18,10 @@ DECLARE_GLOBAL_DATA_PTR;
 
 /* #define DEBUG       0x28 */
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
        defined(CONFIG_MPC5xxx_FEC)
 
-#if !(defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII))
+#if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
 #error "CONFIG_MII has to be defined!"
 #endif
 
@@ -288,13 +288,13 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis)
                 * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock
                 * and do not drop the Preamble.
                 */
-               fec->eth->mii_speed = (((gd->ipb_clk >> 20) / 5) << 1); /* No MII for 7-wire mode */
+               fec->eth->mii_speed = (((gd->ipb_clk >> 20) / 5) << 1); /* No MII for 7-wire mode */
        }
 
        /*
         * Set Opcode/Pause Duration Register
         */
-       fec->eth->op_pause = 0x00010020;        /*FIXME0xffff0020; */
+       fec->eth->op_pause = 0x00010020;        /*FIXME 0xffff0020; */
 
        /*
         * Set Rx FIFO alarm and granularity value
@@ -884,18 +884,26 @@ int mpc5xxx_fec_initialize(bd_t * bis)
 
        fec = (mpc5xxx_fec_priv *)malloc(sizeof(*fec));
        dev = (struct eth_device *)malloc(sizeof(*dev));
-       memset(dev, 0, sizeof *dev);
+       memset(dev, 0, sizeof *dev);
 
        fec->eth = (ethernet_regs *)MPC5XXX_FEC;
        fec->tbdBase = (FEC_TBD *)FEC_BD_BASE;
        fec->rbdBase = (FEC_RBD *)(FEC_BD_BASE + FEC_TBD_NUM * sizeof(FEC_TBD));
-#if defined(CONFIG_CANMB)    || defined(CONFIG_HMI1001)        || \
-    defined(CONFIG_ICECUBE)  || defined(CONFIG_INKA4X0)        || \
-    defined(CONFIG_JUPITER)  || defined(CONFIG_MCC200) || \
-    defined(CONFIG_MOTIONPRO)|| defined(CONFIG_O2DNT)  || \
-    defined(CONFIG_PM520)    || defined(CONFIG_TOP5200)        || \
-    defined(CONFIG_TQM5200)  || defined(CONFIG_UC101)  || \
-    defined(CONFIG_V38B)
+#if defined(CONFIG_CANMB)              || \
+       defined(CONFIG_CM5200)          || \
+       defined(CONFIG_HMI1001)         || \
+       defined(CONFIG_ICECUBE)         || \
+       defined(CONFIG_INKA4X0)         || \
+       defined(CONFIG_JUPITER)         || \
+       defined(CONFIG_MCC200)          || \
+       defined(CONFIG_MOTIONPRO)       || \
+       defined(CONFIG_O2DNT)           || \
+       defined(CONFIG_PM520)           || \
+       defined(CONFIG_TOP5200)         || \
+       defined(CONFIG_TQM5200)         || \
+       defined(CONFIG_UC101)           || \
+       defined(CONFIG_V38B)            || \
+       defined(CONFIG_MUNICES)
 # ifndef CONFIG_FEC_10MBIT
        fec->xcv_type = MII100;
 # else
@@ -917,7 +925,7 @@ int mpc5xxx_fec_initialize(bd_t * bis)
        sprintf(dev->name, "FEC ETHERNET");
        eth_register(dev);
 
-#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
        miiphy_register (dev->name,
                        fec5xxx_miiphy_read, fec5xxx_miiphy_write);
 #endif