Merge branch 'next'

[karo-tx-uboot.git] / board / netphone / netphone.c

diff --git a/board/netphone/netphone.c b/board/netphone/netphone.c
index 53d3172068d8dccb739374b1b56316bf2f8d253f..7fea71bd4d1d72e7742d7ed3bf62bea75e85b225 100644 (file)
--- a/board/netphone/netphone.c
+++ b/board/netphone/netphone.c
@@ -488,13 +488,13 @@ void reset_phys(void)
        mii_init();
 
        for (phyno = 0; phyno < 32; ++phyno) {
-               fec8xx_miiphy_read(NULL, phyno, PHY_PHYIDR1, &v);
+               fec8xx_miiphy_read(NULL, phyno, MII_PHYSID1, &v);
                if (v == 0xFFFF)
                        continue;
-               fec8xx_miiphy_write(NULL, phyno, PHY_BMCR, PHY_BMCR_POWD);
+               fec8xx_miiphy_write(NULL, phyno, MII_BMCR, BMCR_PDOWN);
                udelay(10000);
-               fec8xx_miiphy_write(NULL, phyno, PHY_BMCR,
-                               PHY_BMCR_RESET | PHY_BMCR_AUTON);
+               fec8xx_miiphy_write(NULL, phyno, MII_BMCR,
+                               BMCR_RESET | BMCR_ANENABLE);
                udelay(10000);
        }
 }
@@ -597,22 +597,6 @@ int board_early_init_f(void)
        return 0;
 }
 
-#if defined(CONFIG_CMD_NAND)
-
-#include <linux/mtd/nand_legacy.h>
-
-extern ulong nand_probe(ulong physadr);
-extern struct nand_chip nand_dev_desc[CONFIG_SYS_MAX_NAND_DEVICE];
-
-void nand_init(void)
-{
-       unsigned long totlen;
-
-       totlen = nand_probe(CONFIG_SYS_NAND_BASE);
-       printf ("%4lu MB\n", totlen >> 20);
-}
-#endif
-
 #ifdef CONFIG_HW_WATCHDOG
 
 void hw_watchdog_reset(void)