Changed PPC4xx EMAC driver to require CONFIG_PPC4xx_EMAC

All in-tree IBM/AMCC PPC4xx boards using the EMAC get this new CONFIG

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Stefan Roese <sr@denx.de>

diff --git a/cpu/ppc4xx/4xx_enet.c b/cpu/ppc4xx/4xx_enet.c
index d7b16daf394344761617cfae4d2526ca0fbebb19..19782695998d4bea6036212dd26084d7cf4b92b2 100644 (file)
--- a/cpu/ppc4xx/4xx_enet.c
+++ b/cpu/ppc4xx/4xx_enet.c
@@ -91,13 +91,6 @@
 #include <miiphy.h>
 #include <malloc.h>
 
-/*
- * Only compile for platform with AMCC EMAC ethernet controller and
- * network support enabled.
- * Remark: CONFIG_405 describes Xilinx PPC405 FPGA without EMAC controller!
- */
-#if defined(CONFIG_CMD_NET) && !defined(CONFIG_405) && !defined(CONFIG_IOP480)
-
 #if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
 #error "CONFIG_MII has to be defined!"
 #endif
@@ -2131,5 +2124,3 @@ int emac4xx_miiphy_initialize (bd_t * bis)
        return 0;
 }
 #endif /* !defined(CONFIG_NET_MULTI) */
-
-#endif

diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile
index 463b57566a791a31e661e4fcc49322cd0df7ec19..adfe13ce720132b6a591cda0df07a6d0ab9bee45 100644 (file)
--- a/cpu/ppc4xx/Makefile
+++ b/cpu/ppc4xx/Makefile
@@ -38,6 +38,7 @@ COBJS += 44x_spd_ddr2.o
 ifdef CONFIG_PPC4xx_DDR_AUTOCALIBRATION
 COBJS  += 4xx_ibm_ddr2_autocalib.o
 endif
+COBJS-$(CONFIG_PPC4xx_EMAC) += 4xx_enet.o
 COBJS  += 4xx_pci.o
 COBJS  += 4xx_pcie.o
 COBJS  += bedbug_405.o

diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 864774c229a6e686adc16e009486305d019c4d55..9f19269574e811106fc4c6dc991dd403ba8eb573 100644 (file)
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -67,6 +67,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index bcc85ee0b05ef0306f2e3eb00f3daee134076d0e..a694083d5fb948d0e768b5cdb291673d17d2e8b5 100644 (file)
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -56,6 +56,7 @@
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index d58f50848464cee465a7ff82906aec3cff79bb5f..d0e246409d1779ba67bcfc3852e705cac0d28403 100644 (file)
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -52,6 +52,7 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index 3493d75bd4fdfde5c2296ff8b449d10a869a7b4b..1a2bc1c2e72d40c1895fa9a3ea83fd7bb5b10bcb 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -52,6 +52,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 734ab95e43e522c757bc56272bb1c6ab48fcfcad..e231fa7058819c16701fa1b6d6a532c3eacd13ef 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -54,6 +54,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index 47ad89dfebc509ce3e26b75dacad37472e44737f..2319c58725c483fb97b3b078d6e3ac92cbb934b8 100644 (file)
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -54,6 +54,7 @@
 #undef CONFIG_LOADS_ECHO               /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 4e94dfc3280a6a2fd28590d16b09cdbdf9a71782..be8c238a0d86a08ef992a65723aa02ac085bece7 100644 (file)
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -53,6 +53,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h
index 2d60ebf2e484836f5303e888d8d096c3cfc53e9c..326371253430cd7f37dfae169434fdbedd5af256 100644 (file)
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -50,6 +50,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 1122d02d61cf5613b14c361cf6d157f3d1a32746..f1608e145f5576d5fceced18abcef6dcda7d72f9 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -39,6 +39,8 @@
 #define CONFIG_SYS_CLK_FREQ 25000000
 #define CONFIG_BAUDRATE                9600
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
+
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                 1   /* MII PHY management */
 #define        CONFIG_PHY_ADDR         1       /* PHY address; handling of ENET */
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* early setup for 405gp */

diff --git a/include/configs/DP405.h b/include/configs/DP405.h
index 0ff4f7dfe6c549c64ce9336be66285dfd94d0fd1..884f3fe885b3607e4dc0d03527d38517d296504f 100644 (file)
--- a/include/configs/DP405.h
+++ b/include/configs/DP405.h
@@ -52,6 +52,7 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 

diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index 939e216051cb59c1e564dab48fbd06f438e46bd2..1d20efea00d4b80b19fa13dd6bddf1c64f40887b 100644 (file)
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -54,6 +54,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index 508a0cae3d830c2fda8e5fa7f8fb447a328a9563..729153c2efbf5c762ecf80c01172f9300096cb5c 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -253,6 +253,7 @@
 int du440_phy_addr(int devnum);
 #endif
 
+#define CONFIG_PPC4xx_EMAC
 #define        CONFIG_IBM_EMAC4_V4     1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                du440_phy_addr(0) /* PHY address        */

diff --git a/include/configs/ERIC.h b/include/configs/ERIC.h
index c05945a7267b0f5eddcd6f53961b14ae061a4c18..1b766a7dcbaeb29b01ee53723237012c12f088b5 100644 (file)
--- a/include/configs/ERIC.h
+++ b/include/configs/ERIC.h
@@ -93,6 +93,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index 9f5d3caa5fb24a245f1b58c5700b8b087b356f1c..1dd6e573d2f7a929815f85542f96f3de1307f71b 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -88,6 +88,7 @@
  */
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 

diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 4341f02e6056d51a3d9d8c4c1a281a4a764a4159..d299044cb244719734129680316f006a22a6b4e7 100644 (file)
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -80,6 +80,7 @@
 
 #define CONFIG_NET_MULTI       1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_PHY1_ADDR       1       /* PHY address                  */

diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index 1e7cc124d37a117f0b6917c3b5503f814f0758a3..80e59bb2667a7b32b6dd6540ba85c2af75000bc6 100644 (file)
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -64,6 +64,7 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 

diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index 3e5842444d4b1fcaed10471d9dd34545636e5ca0..b3c7046fc39002a04641cfdb92dfd3c95e829f8b 100644 (file)
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -54,6 +54,7 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index 508b5c8dbe0ea1a6294946c8f2e5c0b74331e49b..8aca1f941db11f105e06ce4e446ee34d0a4390b3 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -132,6 +132,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index 403081d0d2b981b4e62fa2e69099775f3fc61920..4b67c9454b9e9a619b5920be70541de4511b175e 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -157,6 +157,7 @@
 /*-----------------------------------------------------------------------
  * Networking
  *----------------------------------------------------------------------*/
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII           1              /* MII PHY management      */
 #define CONFIG_NET_MULTI      1
 #define CONFIG_PHY_ADDR              0xff           /* no phy on EMAC0         */

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index c0ddd45c0e44ebbe2f48e0abb2e58a63037c18f3..518173aa5d916f9bd2a16c0d9f43d1cec516525b 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -221,6 +221,7 @@
 /*-----------------------------------------------------------------------
  * Networking
  *----------------------------------------------------------------------*/
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII           1              /* MII PHY management      */
 #define CONFIG_NET_MULTI      1
 #define CONFIG_PHY_ADDR              0xff           /* no phy on EMAC0         */

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 7dcf1855a2ca9b9cc6e3eb18e314c21d6e7e0ec0..c58ce053fd1453ccb1e1c03c6ea470794baa1a95 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -336,6 +336,7 @@
 /************************************************************
  * Ethernet Stuff
  ***********************************************************/
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 #define CONFIG_PHY_RESET_DELAY 300     /* Intel LXT971A needs this */

diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index ff11df92edfc436d264f013b8bd2a5ce8b76f1b9..32814d49f54d2e47039b087d5e12081cbf4129e2 100644 (file)
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -50,6 +50,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index a635fca192ab63d7d9b25627060c5b0e3cfcc20a..58e9328e4f514d2142011495cbec1283427f0ad2 100644 (file)
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -50,6 +50,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h
index b55e383b2b1010e9d68f1e1aec6b2a523efd4841..0393366b5c07a7432aa22420b30048b7a5580fe9 100644 (file)
--- a/include/configs/PCI405.h
+++ b/include/configs/PCI405.h
@@ -63,6 +63,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 2966979cb8550d6d297f924a147d3daeadfb5788..5c4d69b207b447065e1c4525dbbab22e4244d15e 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -278,6 +278,7 @@
 /************************************************************
  * Ethernet Stuff
  ***********************************************************/
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 /************************************************************

diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h
index 675dbe66769eb4add7ef7e51494268fdc6c7cdbc..11ce0080f93087850b789228da74d08c07a12dfb 100644 (file)
--- a/include/configs/PLU405.h
+++ b/include/configs/PLU405.h
@@ -54,6 +54,7 @@
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index 12e63b717eb20369cc1b661616f450628fd03441..8d07d7705d26fa9fad978f3bff03b66df730d81a 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -56,6 +56,7 @@
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 7071ccbfe7090a6e72d0021257b35d315c8f8841..7219bb8ae1897257de9e3075a507fbbcc7c47c56 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -315,6 +315,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_IBM_EMAC4_V4    1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address, See schematics  */

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index e66f8efead30fae8a2e7a230dd75e5b3dadc505e..09a96417f5165a8351461c530b64fa9486799e71 100644 (file)
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -104,6 +104,7 @@
 #undef CONFIG_EXT_PHY
 #define CONFIG_NET_MULTI       1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #ifndef         CONFIG_EXT_PHY
 #define CONFIG_PHY_ADDR                1       /* EMAC0 PHY address            */

diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index fb1febc5c9540c8b8342ff0d9bf11973814fcaaf..10ef620d8220d7549dc650bd07cf9d1413e6f43d 100644 (file)
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -55,6 +55,7 @@
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h
index b6e35888110486cc4a86630e696a91975a695876..90efc6d811de283d25c74b2a8ce3827d16f4ca39 100644 (file)
--- a/include/configs/VOM405.h
+++ b/include/configs/VOM405.h
@@ -53,6 +53,7 @@
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index e546369c994777c3f4330f814669014fceca14fe..51d0a0a6ace23091440a7f660f09814272a00d71 100644 (file)
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -65,6 +65,7 @@
 #define CONFIG_LOADS_ECHO      1               /* echo on for serial download  */
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE                    /* disallow baudrate change     */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1               /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0               /* PHY address                  */
 

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 226033831bde744746a2e0e29ce3cfb629350cb9..ca1a9d4a77bb79e0a630ecd3ea56a0efaf4d9aa1 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -65,6 +65,7 @@
 #define CONFIG_LOADS_ECHO      1               /* echo on for serial download  */
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE                    /* disallow baudrate change     */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1               /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0               /* PHY address                  */
 

diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index ec8156406885e4bb6c4421f91c6f4bc1756dd31d..01cdf3a6f3b7bc146c3131b1e9dd7a34a45dbcc4 100644 (file)
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -54,6 +54,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */

diff --git a/include/configs/XPEDITE1K.h b/include/configs/XPEDITE1K.h
index 569bb9052e6d685ab0eb8e90b0b8a52f3192af49..8d44ec6d7208f60b0512035553c7bde333e71356 100644 (file)
--- a/include/configs/XPEDITE1K.h
+++ b/include/configs/XPEDITE1K.h
@@ -167,6 +167,7 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                     1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address phy0 not populated */
 #define CONFIG_PHY1_ADDR       1       /* PHY address phy1 not populated */

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index 315841257dc6d1e708d9bada82992c006c1e9a3c..6e9f5e5a530e5c906cd335ec54e5b7643f5c32ce 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -198,6 +198,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_NET_MULTI       1
 #define CONFIG_PHY_ADDR                0x02    /* dummy setting, no EMAC0 used */

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 85165710b07069a7ce817b1245bbe15fbd542bf3..d3dc3e533670e3afa943cd4c65f3eeff746658f3 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -45,6 +45,7 @@
 /*
  * Ethernet/EMAC/PHY
  */
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                     /* MII PHY management           */
 #define CONFIG_NET_MULTI
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 393e9929a143d83a0904a5115fb9e9aa96aa3dc8..874f2c0b390263ccdf1046849c457fbe526607c3 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -180,6 +180,7 @@
  * MII PHY configuration
  *
  */
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_PHY_CMD_DELAY   40      /* PHY COMMAND delay            */

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index af382526fa2ae5ce7f5a2010548912f0a0fcc9b3..2e30e696406b967daf82787d6d12714295b8843f 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -179,6 +179,7 @@
  * MII PHY configuration
  *
  */
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_PHY_CMD_DELAY   40      /* PHY COMMAND delay            */

diff --git a/include/configs/korat.h b/include/configs/korat.h
index ca3e8a9fc4fb289c927622f60707975869ef107c..d56da144879b9fdf8999924c66dc285df5b45143 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -215,6 +215,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_IBM_EMAC4_V4    1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                2       /* PHY address, See schematics  */

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index e0dbd6113c749fa9fe9a4bd435acc86c16e4a0db..05055c89afa223b594f84a35579d3da9f819edd4 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -326,6 +326,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define        CONFIG_IBM_EMAC4_V4     1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                3       /* PHY address, See schematics  */

diff --git a/include/configs/netstal-common.h b/include/configs/netstal-common.h
index 1fa4b00eb5b88d86b301da703e4b2ba4b1b0f19b..0a757943e8b8d2d4bc0f84c189fcf1f7a0153973 100644 (file)
--- a/include/configs/netstal-common.h
+++ b/include/configs/netstal-common.h
@@ -58,6 +58,7 @@
 /*
  * Ethernet/EMAC/PHY
  */
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                     /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 #if defined(CONFIG_440)

diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 1dc8656bfb93f7a484be9081fc363b51a24632cc..729ca6ac7dfe182e7e19ff64c548c81bb91d7a28 100644 (file)
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -158,6 +158,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0x1c    /* PHY address                  */
 #define CONFIG_HAS_ETH1

diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index 6e2d9067c8d6243af4b615debde609f793b72859..000ae5cd7d48257af80111f7ca04db801a290f51 100644 (file)
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -218,6 +218,7 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_NET_MULTI        1      /* required for netconsole      */
 #define CONFIG_HAS_ETH1                1       /* add support for "eth1addr"   */

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 1a76301956e372ae41f6fdd205ddb7ea53c2ddf1..0f7fca38d512a1179e1981b2a607a3f402b91800 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -45,6 +45,7 @@
 #define CONFIG_ENV_IS_IN_EEPROM
 #undef CONFIG_ENV_IS_IN_FLASH
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1
 #define CONFIG_MII             1       /* MII PHY management           */

diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index d93ca2d98f2adaece7c8d70831ef7f8eb3e01893..c156820acf1e9ca8a348a0eb308a9bcfc833fe63 100644 (file)
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -58,6 +58,7 @@
 #define CONFIG_BOOTCOMMAND      "version;echo;tftpboot ${loadaddr} ${loadfile};bootvx"      /* autoboot command     */
 
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_PHY_RESET_DELAY 300     /* Intel LXT971A needs this     */

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 44135dfac5405678969c4bd5751f223cb11c8e1c..d152a9670d0f9cc2dbecf567ded2bde42d5298bd 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -166,6 +166,8 @@
 /* #define CONFIG_EEPRO100_SROM_WRITE */
 /* #define CONFIG_SHOW_MAC */
 #define CONFIG_EEPRO100
+
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII 1                   /* add 405GP MII PHY management         */
 #define CONFIG_PHY_ADDR 1      /* the connected Phy defaults to address 1 */
 

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index b75e8a118a7042084600f8c24a4bd97a1807d29f..1a77c719686e04eff0b53fb11a139829fda28404 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -46,6 +46,7 @@
 
 #define CONFIG_OVERWRITE_ETHADDR_ONCE  1
 
+#define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0x01    /* PHY address                  */
 #define CONFIG_HAS_ETH1                1

diff --git a/net/eth.c b/net/eth.c
index 0b954edb78c020c70e7b369c4135083499166b56..eab51045a4ea46468cbb2fa174eec0b0d8d2691e 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -153,7 +153,7 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
        mv6446x_eth_initialize(bis);
 #endif
-#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000)
+#if defined(CONFIG_PPC4xx_EMAC)
        ppc_4xx_eth_initialize(bis);
 #endif
        if (!eth_devices) {
@@ -485,8 +485,7 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_AT91RM9200)
        at91rm9200_miiphy_initialize(bis);
 #endif
-#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) \
-       && !defined(CONFIG_AP1000) && !defined(CONFIG_405)
+#if defined(CONFIG_PPC4xx_EMAC)
        emac4xx_miiphy_initialize(bis);
 #endif
 #if defined(CONFIG_MCF52x2)