X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cpu%2Fmips%2Fau1x00_eth.c;h=6272a3aac119dd34be822b0391fd680e844fb596;hb=9863d6aca11405e1e0d8aba2045d78aeec4d4ee7;hp=23f2f94ea1ca20fd27575d83fd5087144f5a564b;hpb=f01320459736f156707425cf8112f98606301aa4;p=oweals%2Fu-boot.git

diff --git a/cpu/mips/au1x00_eth.c b/cpu/mips/au1x00_eth.c
index 23f2f94ea1..6272a3aac1 100644
--- a/cpu/mips/au1x00_eth.c
+++ b/cpu/mips/au1x00_eth.c
@@ -23,9 +23,7 @@
  */
 #include <config.h>
 
-#ifdef CONFIG_AU1X00
-
-#if defined(CFG_DISCOVER_PHY)
+#if defined(CONFIG_SYS_DISCOVER_PHY)
 #error "PHY not supported yet"
 /* We just assume that we are running 100FD for now */
 /* We all use switches, right? ;-) */
@@ -33,20 +31,20 @@
 
 /* I assume ethernet behaves like au1000 */
 
-#ifdef CONFIG_AU1000
+#ifdef CONFIG_SOC_AU1000
 /* Base address differ between cpu:s */
 #define ETH0_BASE AU1000_ETH0_BASE
 #define MAC0_ENABLE AU1000_MAC0_ENABLE
 #else
-#ifdef CONFIG_AU1100
+#ifdef CONFIG_SOC_AU1100
 #define ETH0_BASE AU1100_ETH0_BASE
 #define MAC0_ENABLE AU1100_MAC0_ENABLE
 #else
-#ifdef CONFIG_AU1500
+#ifdef CONFIG_SOC_AU1500
 #define ETH0_BASE AU1500_ETH0_BASE
 #define MAC0_ENABLE AU1500_MAC0_ENABLE
 #else
-#ifdef CONFIG_AU1550
+#ifdef CONFIG_SOC_AU1550
 #define ETH0_BASE AU1550_ETH0_BASE
 #define MAC0_ENABLE AU1550_MAC0_ENABLE
 #else
@@ -136,7 +134,7 @@ int  au1x00_miiphy_write(char *devname, unsigned char addr,
 		udelay(1000);
 		if (--timedout == 0) {
 			printf("au1x00_eth: miiphy_write busy timeout!!\n");
-			return;
+			return -1;
 		}
 	}
 
@@ -285,7 +283,7 @@ int au1x00_enet_initialize(bd_t *bis){
 
 	if ((dev = (struct eth_device*)malloc(sizeof *dev)) == NULL) {
 		puts ("malloc failed\n");
-		return 0;
+		return -1;
 	}
 
 	memset(dev, 0, sizeof *dev);
@@ -307,5 +305,3 @@ int au1x00_enet_initialize(bd_t *bis){
 
 	return 1;
 }
-
-#endif /* CONFIG_AU1X00 */