board configs: drop NET_MULTI references

Now that none of the core checks CONFIG_NET_MULTI, there's not much point
in boards defining it.  So scrub all references to it.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
index b7dae1e2dcd02f28d6011c2a74c1d84daee251ff..b393b1adfe9da2b8e33d5b752d613648d79409aa 100644 (file)
--- a/arch/arm/include/asm/arch-kirkwood/config.h
+++ b/arch/arm/include/asm/arch-kirkwood/config.h
@@ -91,7 +91,6 @@
 #ifdef CONFIG_CMD_NET
 #define CONFIG_CMD_MII
 #define CONFIG_NETCONSOLE      /* include NetConsole support   */
-#define CONFIG_NET_MULTI       /* specify more that one ports available */
 #define CONFIG_MII             /* expose smi ove miiphy interface */
 #define CONFIG_MVGBE           /* Enable Marvell Gbe Controller Driver */
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */

diff --git a/include/configs/A3000.h b/include/configs/A3000.h
index 3d6014176c0597bfede7a9c917eb048be85356cd..0c21bd8ecb12ea26af72998eb830b8b1e7e5e687 100644 (file)
--- a/include/configs/A3000.h
+++ b/include/configs/A3000.h
@@ -100,7 +100,6 @@
 #undef CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW           /* print pci devices @ startup  */
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support */
 
 /* #define CONFIG_TULIP */
 /* #define CONFIG_EEPRO100 */

diff --git a/include/configs/ADCIOP.h b/include/configs/ADCIOP.h
index 6f12c8ddc01363a1593630f99ee2aa8a4505ab09..5cd8eef31001121b9d9de687b652ba604edbb738 100644 (file)
--- a/include/configs/ADCIOP.h
+++ b/include/configs/ADCIOP.h
@@ -185,7 +185,6 @@
 #define CONFIG_PCI                     /* include pci support                  */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_TULIP
 

diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index 37dd7577320d6489efd4ed7c06c38b18a0f198b2..fd074fb5cee15f9454fc013a72bd3eb5b9aa1352 100644 (file)
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -239,7 +239,6 @@
 #define CONFIG_SYS_JFFS2_NUM_BANKS     1
 #define CONFIG_SYS_JFFS2_FIRST_SECTOR  1
 
-#define CONFIG_NET_MULTI
 #define CONFIG_E1000
 
 #define CONFIG_SYS_ETH_DEV_FN          0x0800

diff --git a/include/configs/APC405.h b/include/configs/APC405.h
index 0adf3ed2a0237a31939411f498afa2ffdfd4060d..9a65cbced094cf9cd8a9da7af0767caef90668d1 100644 (file)
--- a/include/configs/APC405.h
+++ b/include/configs/APC405.h
@@ -103,7 +103,6 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_PPC4xx_EMAC

diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 4963e9f688ec915563b77f421f1746b6ef799a1c..99944766ddedc0f19accd4916c7b8f370ea43820 100644 (file)
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -73,7 +73,6 @@
 #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 */
-#define CONFIG_NET_MULTI
 
 
 /*

diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h
index ee80d9d8f23c06146f6869ad081253ad662d339b..7f4849921ec6257c676648f19a6ca005775888d8 100644 (file)
--- a/include/configs/ASH405.h
+++ b/include/configs/ASH405.h
@@ -55,7 +55,6 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_PPC4xx_EMAC

diff --git a/include/configs/Alaska8220.h b/include/configs/Alaska8220.h
index e05099281728fb24b792ce8a5099de65f4edb122..39c29ecc222bddf633e1817bf22b017e9b99aaea 100644 (file)
--- a/include/configs/Alaska8220.h
+++ b/include/configs/Alaska8220.h
@@ -97,7 +97,6 @@
 #define CONFIG_CMD_SNTP
 
 
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 
 /*

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 1497cae095422ecb11cea4ef4c35e9626becbc4e..a3e8820013f29bd16736bf1e69f3de3ace953adf 100644 (file)
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -467,7 +467,6 @@ extern  unsigned long           bab7xx_get_gclk_freq (void);
 
 #define CONFIG_SYS_L2_BAB7xx
 
-#define CONFIG_NET_MULTI                /* Multi ethernet cards support */
 #define CONFIG_TULIP
 #define CONFIG_TULIP_SELECT_MEDIA
 

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index a833893728180b9622ebaea6c0107d79d6fbc877..8a73a9a4c08f39ccdd7eaefd7d2a0f7d6b3ce898 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -106,7 +106,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 /*#define CONFIG_EEPRO100      XXX - FIXME: conflicts when CONFIG_MII is enabled */
 #define CONFIG_SYS_RX_ETH_BUFFER       8       /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index 0b75a4ed2f1fae2066ca60020dde16f9d4676325..84e4e78f662a8728f29811c8bdbf7b36f89deaf8 100644 (file)
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -114,7 +114,6 @@
 
 #define CONFIG_PPC4xx_EMAC
 #undef CONFIG_EXT_PHY
-#define CONFIG_NET_MULTI       1
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #ifndef         CONFIG_EXT_PHY

diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h
index daaf62440c5b1a43f51a2e151835937594db6a54..63d838fe6be38ce353faf5c59e3f4a6e4bc39c0b 100644 (file)
--- a/include/configs/CMS700.h
+++ b/include/configs/CMS700.h
@@ -55,7 +55,6 @@
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
 #define CONFIG_PPC4xx_EMAC
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_MII             1       /* MII PHY management           */

diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h
index 17282aad613d1bad9a247753109ca6554f9af6e1..ed3f9e1cbe373fa2377422c032d65dae7ad720fe 100644 (file)
--- a/include/configs/CPC45.h
+++ b/include/configs/CPC45.h
@@ -458,7 +458,6 @@
 #undef CONFIG_PCI_PNP
 #undef CONFIG_PCI_SCAN_SHOW
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8       /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index 426fc57a650017101da5df6f4f887e86afaa7e7a..cf1d1b39b4c59cf07f5a3dbde53788391a6c6961 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -61,7 +61,6 @@
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 #define CONFIG_RESET_PHY_R      1       /* use reset_phy() to disable phy sleep mode */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 /*

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index 8f48ded2385e32c0c72e88cd316736f5e37ef74e..d17458eaa35f301a1f8fc714c974744df634f635 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -63,7 +63,6 @@
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 #define CONFIG_RESET_PHY_R      1       /* use reset_phy() to disable phy sleep mode */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_RTC_M48T35A     1               /* ST Electronics M48 timekeeper */

diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index a042abf1574da90a6914d6814dd4bcec968f2166..a0d16d24aca60de11c7228275ac08c886b688557 100644 (file)
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -63,7 +63,6 @@
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 #define CONFIG_RESET_PHY_R      1       /* use reset_phy() to disable phy sleep mode */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_RTC_M48T35A     1               /* ST Electronics M48 timekeeper */

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 9b99ba8664f3ed241e900b30b46dcdb179fe731b..98b8ef5a7628c48d525240efddf3b5acb1f97098 100644 (file)
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -62,7 +62,6 @@
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 #define CONFIG_RESET_PHY_R      1       /* use reset_phy() to disable phy sleep mode */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_RTC_M48T35A     1               /* ST Electronics M48 timekeeper */

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 92ffaaaf19e6a19b3d860c1382ccd8863f556ee1..d735e613d8ac429dc986e44a7bf7fda0c76b97b4 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -100,7 +100,6 @@
 #define CONFIG_MPSC_PORT       0
 
 /* to change the default ethernet port, use this define (options: 0, 1, 2) */
-#define CONFIG_NET_MULTI
 #define MV_ETH_DEVS            1
 #define CONFIG_ETHER_PORT      0
 

diff --git a/include/configs/CPCIISER4.h b/include/configs/CPCIISER4.h
index b2ee87329544083a6fb3519cf6820012febd81a5..35daed05efa502117e289a8d30c10cb3692de149 100644 (file)
--- a/include/configs/CPCIISER4.h
+++ b/include/configs/CPCIISER4.h
@@ -56,7 +56,6 @@
 #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 */
-#define CONFIG_NET_MULTI
 
 
 /*

diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h
index 885d42b337ef2c0c50e114de6636cd90c232985a..4aaceb77cb9d2c388ae8b324c316181d718d23b6 100644 (file)
--- a/include/configs/CRAYL1.h
+++ b/include/configs/CRAYL1.h
@@ -52,7 +52,6 @@
 #define        CONFIG_PHY_ADDR         1       /* PHY address; handling of ENET */
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* early setup for 405gp */
 #define CONFIG_MISC_INIT_R     1       /* so that a misc_init_r() is called */
-#define CONFIG_NET_MULTI
 
 #define CONFIG_CONS_INDEX      1       /* Use UART0                    */
 #define CONFIG_SYS_NS16550

diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index e2229b0384702a91896531499855de955cc7a573..77414abdac68c2bd211e7e3c19dafc8c8ff4dac5 100644 (file)
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -294,7 +294,6 @@
 #define CONFIG_PCI                     /* include pci support                  */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_TULIP
 #define CONFIG_TULIP_USE_IO

diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index 53229d94b5b34dd48f52b2f5a16159789ff3519a..6fe7fd33c0eee8f1b157a7774ce3ed8c915f11d6 100644 (file)
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -175,7 +175,6 @@
 #define CONFIG_PCI                     /* include pci support                  */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_TULIP
 

diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h
index dbd224cc2c6354f843912a79a9c7bd46dde2801d..1f825fd0dccca4d035dee18c8c71c637ab374b8a 100644 (file)
--- a/include/configs/DB64360.h
+++ b/include/configs/DB64360.h
@@ -158,7 +158,6 @@ if we use PCI it has its own MAC addr */
 #define CONFIG_MPSC_PORT       0
 
 /* to change the default ethernet port, use this define (options: 0, 1, 2) */
-#define CONFIG_NET_MULTI
 #define MV_ETH_DEVS 2
 
 /* #undef CONFIG_ETHER_PORT_MII         */

diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h
index 321692bc5095a76928bc9ac86606481fdb13ddcf..4218774de340da8b4a2979105d6bea5ca6e9aa9f 100644 (file)
--- a/include/configs/DB64460.h
+++ b/include/configs/DB64460.h
@@ -96,7 +96,6 @@
 #define CONFIG_MPSC_PORT       0
 
 /* to change the default ethernet port, use this define (options: 0, 1, 2) */
-#define CONFIG_NET_MULTI
 #define MV_ETH_DEVS 3
 
 /* #undef CONFIG_ETHER_PORT_MII         */

diff --git a/include/configs/DU405.h b/include/configs/DU405.h
index 1493f750db579ccaa06a02c4b5aa92038d43d5e9..24df85a88543c2a0271092ff4c96f7877c688147 100644 (file)
--- a/include/configs/DU405.h
+++ b/include/configs/DU405.h
@@ -57,7 +57,6 @@
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 #define CONFIG_RESET_PHY_R      1       /* use reset_phy() to disable phy sleep mode */
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 /*

diff --git a/include/configs/DU440.h b/include/configs/DU440.h
index ceab60485885af1d1f6df7a4b3097710da533085..8bd7940ba80dffdee1f0ad761ca47dcdc6f2e5b1 100644 (file)
--- a/include/configs/DU440.h
+++ b/include/configs/DU440.h
@@ -269,7 +269,6 @@ int du440_phy_addr(int devnum);
 #define CONFIG_HAS_ETH0
 #define CONFIG_SYS_RX_ETH_BUFFER       128
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1       /* add support for "eth1addr"   */
 #define CONFIG_PHY1_ADDR       du440_phy_addr(1)
 

diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h
index 0333925792a6836bc40bc6dc3c130a151208f064..1f774a93202d9a811e6d4dc3dd3f159c82ddd0f6 100644 (file)
--- a/include/configs/EB+MCF-EV123.h
+++ b/include/configs/EB+MCF-EV123.h
@@ -126,7 +126,6 @@
  *----------------------------------------------------------------------*/
 
 #define CONFIG_MCFFEC
-#define CONFIG_NET_MULTI               1
 #define CONFIG_MII                     1
 #define CONFIG_MII_INIT                        1
 #define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/ELPPC.h b/include/configs/ELPPC.h
index 8cce70c11b86ec903e25d33f573d1e6d35665087..220372ccd8ff4ee72a0d31d5f8b2d54b99bc0e83 100644 (file)
--- a/include/configs/ELPPC.h
+++ b/include/configs/ELPPC.h
@@ -348,7 +348,6 @@
 #endif
 #define L2_ENABLE   (L2_INIT | L2CR_L2E)
 
-#define CONFIG_NET_MULTI        /* Multi ethernet cards support */
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */
 #define CONFIG_EEPRO100_SROM_WRITE

diff --git a/include/configs/EVB64260.h b/include/configs/EVB64260.h
index 9a68b1ca46f7996a46eeccdafb80de33eaa4e9a9..b90540295b23b21417a35365b4bb5b471b89ac82 100644 (file)
--- a/include/configs/EVB64260.h
+++ b/include/configs/EVB64260.h
@@ -78,7 +78,6 @@
 #define        CONFIG_MPSC
 #define CONFIG_MPSC_PORT       0
 
-#define CONFIG_NET_MULTI        /* attempt all available adapters */
 
 /* define this if you want to enable GT MAC filtering */
 #define CONFIG_GT_USE_MAC_HASH_TABLE

diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h
index f7b5bc9605af29496295191d75d08fce116df811..43c88428e099574084e67c77a5829b763309e7ff 100644 (file)
--- a/include/configs/EXBITGEN.h
+++ b/include/configs/EXBITGEN.h
@@ -81,7 +81,6 @@
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
-#define CONFIG_NET_MULTI
 
 
 /*

diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index af602ffeaab5983e3b73e2db09a1afc2ec99caaf..d64dd8de11f891e30c57dae7cb3a3898ca00e581 100644 (file)
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -80,7 +80,6 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
-#define CONFIG_NET_MULTI       1
 
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */

diff --git a/include/configs/HH405.h b/include/configs/HH405.h
index a15e686d28fafa324d66cb3cc791ce97b8b48aa2..4a41b5c6d70f2262a64657432464fd57c992cecb 100644 (file)
--- a/include/configs/HH405.h
+++ b/include/configs/HH405.h
@@ -67,7 +67,6 @@
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
 #define CONFIG_PPC4xx_EMAC
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_MII             1       /* MII PHY management           */

diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h
index 44ae48d60befe5be0d3d26131c6413419c6f8b36..8f4e544c64ceddee6afdbbf4ec3f1c5ee2b7226e 100644 (file)
--- a/include/configs/HIDDEN_DRAGON.h
+++ b/include/configs/HIDDEN_DRAGON.h
@@ -95,7 +95,6 @@
 #define CONFIG_PCI                             /* include pci support          */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */
 

diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h
index 827ecf26e447944d18322777f89fa1654e975700..afb827324af96857a41d032a767510a63687ed9a 100644 (file)
--- a/include/configs/HUB405.h
+++ b/include/configs/HUB405.h
@@ -62,7 +62,6 @@
 #define CONFIG_LXT971_NO_SLEEP  1       /* disable sleep mode in LXT971 */
 
 #define CONFIG_PHY_CLK_FREQ    EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
-#define CONFIG_NET_MULTI
 
 
 /*

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index bc5d761f8abc4468ef1acafdad851812009ca0a7..135ef5540113d26df0b566e65f769be3556cb231 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -79,7 +79,6 @@
 
 #define CONFIG_SYS_XLB_PIPELINING      1
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/JSE.h b/include/configs/JSE.h
index c38e0d26dcd24722d8375fc4c42069415fe8ddb8..ef652b2dc846bc5fa0da26989260d1d88e40abeb 100644 (file)
--- a/include/configs/JSE.h
+++ b/include/configs/JSE.h
@@ -134,7 +134,6 @@
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
-#define CONFIG_NET_MULTI
 
 
 /*

diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h
index fcf66b7bc7a13acad742279cc3aa7e9bd2c9ec7f..06fa676fd991252c82f425f87e67221de5482e88 100644 (file)
--- a/include/configs/KAREF.h
+++ b/include/configs/KAREF.h
@@ -164,7 +164,6 @@
  *----------------------------------------------------------------------*/
 #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         */
 #define CONFIG_PHY1_ADDR      0xff          /* no phy on EMAC1         */
 #define CONFIG_PHY2_ADDR      0x08          /* PHY addr, MGMT, EMAC2   */

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index a45cdc1bb96eb513fdfbedc3902afe4d835d1983..6f462be1a6ead3d049dba9aa9e972a54f642b8e7 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -57,7 +57,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index cd12d2b7a4f3c1755e5158b6a79dfd21ffd55e60..7bb6dfefc08bffc499ce26f4311112056e59754e 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -75,7 +75,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index 7a44cf7de607493f1c23414e49b12f379c8f5571..b843e07708a2a57872499004a8995a34211aaa45 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -88,7 +88,6 @@
 #      define CONFIG_SYS_ATA_STRIDE            4       /* Interval between registers */
 #endif
 
-#define CONFIG_NET_MULTI               1
 #define CONFIG_DRIVER_DM9000
 #ifdef CONFIG_DRIVER_DM9000
 #      define CONFIG_DM9000_BASE       (CONFIG_SYS_CS1_BASE | 0x300)

diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h
index 992d738cbd4dd672c414e1125d178a741feb89d6..1d3b5c354f7c02b26c2ca52005bbd213c362a843 100644 (file)
--- a/include/configs/M5271EVB.h
+++ b/include/configs/M5271EVB.h
@@ -90,7 +90,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index b3c774f9c74757bdd0ad0b5195de1bb3ca3203cd..de151632441e2cf2d90d80f12d350306abb9a961 100644 (file)
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -89,7 +89,6 @@
 #define CONFIG_BOOTDELAY       5
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 56a760fc8f0701fac0717574bb0ebbb26cf7673c..e34dc4049aff349ecd42e1749a2142bb45ea4653 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -87,7 +87,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
 #define CONFIG_MII_INIT                1
 #define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index 0c104805d749764e763439373c21615c47faf335..928b044153c53e05775fe3de493db259a5d3d78b 100644 (file)
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -74,7 +74,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index d205e7c1749ee868bb3255619ddd7ca0c03ed583..216244c9d2f1911750b6d60a95d76bf1129b72f9 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -64,7 +64,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 3adcf4dfa641b5669e5cb27d554cdffa5ce38bfe..67cdff11a2cc7408c51ff9725927842479885f6d 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -68,7 +68,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 71b5af6e34ba47b68980c9d50f4d4f94fe115777..d0044b142d297b09affe517d1c4b8929c004597f 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -68,7 +68,6 @@
 
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index de88383e3ead012f085f3bede270de84fa3a466f..e2e2445219d5d3f43caad041cd7ed50cef7b4c3f 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -82,7 +82,6 @@
 /* Network configuration */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 2662b3511e9a3ae57a7d9373e808f6a28cbcb7ac..d934d8edf425082bd61f4855da25e7243e09315e 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -85,7 +85,6 @@
 /* Network configuration */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 6e0bef55e58bd13170f8952f91997c2d4f042d5c..f31972c7b6fe7d42380625dd5df09a16eacdef3c 100644 (file)
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -67,7 +67,6 @@
 
 #define CONFIG_FSLDMAFEC
 #ifdef CONFIG_FSLDMAFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_HAS_ETH1

diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index f3a295cb496cb92c5156e182d1fef6692c25d3f7..813f0cb4733d7de3809f986231afed1b637f2ddf 100644 (file)
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -67,7 +67,6 @@
 
 #define CONFIG_FSLDMAFEC
 #ifdef CONFIG_FSLDMAFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_HAS_ETH1

diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h
index f9681cd1ab95a913e842f20350315b616451fea3..da924c83714d453ec0c83c4a8c496972fd484a56 100644 (file)
--- a/include/configs/MERGERBOX.h
+++ b/include/configs/MERGERBOX.h
@@ -273,7 +273,6 @@
 /*
  * TSEC
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_GMII                    /* MII PHY management */
 #define CONFIG_SYS_VSC8601_SKEWFIX
 #define        CONFIG_SYS_VSC8601_SKEW_TX      3

diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h
index 9b83e21a1f70e5956154aadeed740cbb91d4d4c9..c75a256a50b8d340b8cf87a8d068d2a7603c5b0d 100644 (file)
--- a/include/configs/METROBOX.h
+++ b/include/configs/METROBOX.h
@@ -228,7 +228,6 @@
  *----------------------------------------------------------------------*/
 #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         */
 #define CONFIG_PHY1_ADDR      0xff          /* no phy on EMAC1         */
 #define CONFIG_PHY2_ADDR      0x08          /* PHY addr, MGMT, EMAC2   */

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index ce9273b6f7d06cb3299759dcc7a71f39739d2814..247cd2ff6e206d13eedb9efded637239ce4a35e0 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -334,7 +334,6 @@
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
 #define CONFIG_PHY_RESET_DELAY 300     /* Intel LXT971A needs this */
 #define CONFIG_PHY_CMD_DELAY   40      /* Intel LXT971A needs this */
-#define CONFIG_NET_MULTI
 /************************************************************
  * RTC
  ***********************************************************/

diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index c809a6b363f4718a45d428ed7278da27818fddd9..f7fba0ca486c6cc6fce51aadfca4d6d1db192639 100644 (file)
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -334,7 +334,6 @@
 #define CONFIG_PCI                     /* include pci support                  */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support         */
 
 #define CONFIG_TULIP
 

diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h
index 3ff175c6ded81cd372025096afd54e3cd3ed5b2d..210b60235777f42f4e514463870969926a2d9b6f 100644 (file)
--- a/include/configs/MPC8308RDB.h
+++ b/include/configs/MPC8308RDB.h
@@ -367,7 +367,6 @@
 /*
  * TSEC
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_TSEC_ENET       /* TSEC ethernet support */
 #define CONFIG_SYS_TSEC1_OFFSET        0x24000
 #define CONFIG_SYS_TSEC1       (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET)

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index 92c54d0ec1e0400924b121026a70a57d54187524..7f52bb196d4fe2bda6fba5119ab314900482aaac 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -372,7 +372,6 @@
  */
 #define CONFIG_TSEC_ENET               /* TSEC ethernet support */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_GMII                    /* MII PHY management */
 
 #ifdef CONFIG_TSEC1

diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h
index a0cfd000f23727f649f8f7b405bae28f4d34ff36..ec869495088197c4e689fd84dccb26c9c679d3ed 100644 (file)
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -402,17 +402,12 @@
 #define CONFIG_PCI
 #define CONFIG_PCIE
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 
 #define CONFIG_EEPRO100
 #undef CONFIG_PCI_SCAN_SHOW    /* show pci devices on startup */
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957  /* Freescale */
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_HAS_FSL_DR_USB
 #define CONFIG_SYS_SCCR_USBDRCM                3
 

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 4d4c758eb294886fa5677fa43f6be9dedea7cbb6..a8657b110bbafa549ad867513b1fc849d5fdf381 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -318,7 +318,6 @@
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_SKIP_HOST_BRIDGE
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -327,11 +326,6 @@
 
 #endif /* CONFIG_PCI */
 
-
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 /*
  * QE UEC ethernet configuration
  */

diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index f136a8e16a0832ed12d192292853e9c123b012cf..823b9f127ee96cbc9181e227bc25a811e94d3d4a 100644 (file)
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -332,7 +332,6 @@
 
 #ifdef CONFIG_PCI
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_83XX_PCI_STREAMING
 
@@ -342,11 +341,6 @@
 
 #endif /* CONFIG_PCI */
 
-
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 /*
  * QE UEC ethernet configuration
  */

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index da2b11da8e05cb5bb273e42a1150ed751e825e87..865d3176a5c6bfebf435c1bfc0c5fb2794d52f4f 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -386,7 +386,6 @@
 #undef PCI_ONE_PCI1
 #endif
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_83XX_PCI_STREAMING
 
@@ -410,9 +409,6 @@
 #define CONFIG_TSEC_ENET               /* TSEC ethernet support */
 
 #if defined(CONFIG_TSEC_ENET)
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
 
 #define CONFIG_GMII            1       /* MII PHY management */
 #define CONFIG_TSEC1   1

diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h
index de233ffe627a3ed8243f7133ae98e72367c478c2..4999004d4a313fcaf67fa3a3d752c3c9fe45a41b 100644 (file)
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -384,7 +384,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 #define CONFIG_SYS_PCI2_IO_SIZE        0x01000000      /* 16M */
 #endif
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #ifndef CONFIG_PCI_PNP
@@ -408,7 +407,6 @@ boards, we say we have two, but don't display a message if we find only one. */
 
 #ifdef CONFIG_TSEC_ENET
 
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_PHY_GIGE                /* In case CONFIG_CMD_MII is specified */
 

diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 49d64a55eb88e9bc73934e6271ba073f65986938..63034d2f848c0a8a79b59d6ad94b44012b53c591 100644 (file)
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -370,7 +370,6 @@
 
 #ifdef CONFIG_PCI
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_83XX_PCI_STREAMING
 
@@ -381,10 +380,6 @@
 #endif /* CONFIG_PCI */
 
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_HWCONFIG                1
 
 /*

diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index 851872ae3cfd0b538ce1762b550343537fae7e51..909e8ab3c604e3f73e3564c6e2950a2fff4dded8 100644 (file)
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -290,7 +290,6 @@
 
 #ifdef CONFIG_PCI
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -299,11 +298,6 @@
 
 #endif /* CONFIG_PCI */
 
-
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 /*
  * QE UEC ethernet configuration
  */

diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h
index abccfd6439e1196d032213696d674a19269a2def..03aedeca53eea1e06b5de1b061c1965ad2214220 100644 (file)
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -385,7 +385,6 @@ extern int board_pci_host_broken(void);
 
 #define CONFIG_HAS_FSL_DR_USB  1 /* fixup device tree for the DR USB */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -393,10 +392,6 @@ extern int board_pci_host_broken(void);
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957  /* Freescale */
 #endif /* CONFIG_PCI */
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 /*
  * TSEC
  */

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index ea3056b93f75cab016eb726e810218ff3c67a1bb..d0e4b2c00bd086fb93a0bf101e5356284e372ec7 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -399,7 +399,6 @@
 #define CONFIG_SYS_PCIE2_IO_SIZE       0x00800000
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 
 #undef CONFIG_PCI_SCAN_SHOW    /* show pci devices on startup */
@@ -411,7 +410,6 @@
  */
 #ifdef CONFIG_TSEC_ENET
 
-#define CONFIG_NET_MULTI
 #define CONFIG_GMII                    /* MII PHY management */
 
 #define CONFIG_TSEC1

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index f3d325a0c97a713d413619d36ebe9e3913a8fa33..3efe9373fdeaa7d0e76375faf0cea989fc1d0a2b 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -542,7 +542,6 @@
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 /*PCIE video card used*/
@@ -600,10 +599,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */
 #define CONFIG_TSEC1   1

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index fc0edacede217b8c9542190cdc922614f8375f5b..301efbefade0a271713a6ff39809786e8f1195cf 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -289,7 +289,6 @@
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -309,10 +308,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "TSEC0"

diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index ae19036d87b36a4430e5c64ea7f039036328db6a..b2503a40f76bdfd8a71a5f121b02a6554bf96af6 100644 (file)
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -331,7 +331,6 @@ extern unsigned long get_clock_freq(void);
 #if defined(CONFIG_PCI)
 
 #define CONFIG_MPC85XX_PCI2
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -345,10 +344,6 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "TSEC0"

diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 6b03d27410a94fe9cfb69eca6e0b66701d896acc..97b55696abdd6863b39d67348f0700cc13e8a714 100644 (file)
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -320,7 +320,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #endif
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -350,10 +349,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */
 #define CONFIG_TSEC1   1

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index aca77ff6b970e19549bf4dc092ea7d01cec2be1a..63e23c276e82e0985ae8c020ab3dae30dd7da1bf 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -377,7 +377,6 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -390,10 +389,6 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "eTSEC0"

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 93d4c3e5fbe0e66f9bf8f67449cfa2055e0f2872..efd42807f62fbab55d353e50ce8419d334b7c207 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -328,7 +328,6 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_MPC85XX_PCI2
 
@@ -343,10 +342,6 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "TSEC0"

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index e03fea3cc93827f4a599d6dac425a5b3f5f9adcb..8cf2bf2b3c8a9b074b8be79e519763265a52c763 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -283,7 +283,6 @@
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -303,10 +302,6 @@
 
 #ifdef CONFIG_TSEC_ENET
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #ifndef CONFIG_MII
 #define CONFIG_MII             1       /* MII PHY management */
 #endif

diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index cf0ea47e7a63f90e61ee1f6426fcae5b97f417ce..994e7aeded2d3541551a040f67b685df261f186b 100644 (file)
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -347,7 +347,6 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -358,10 +357,6 @@ extern unsigned long get_clock_freq(void);
 
 #endif /* CONFIG_PCI */
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #if defined(CONFIG_TSEC_ENET)
 
 #define CONFIG_MII             1       /* MII PHY management */

diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index dd7278c4b8a41a8ca31a1665c2ac229845408103..a4734eba65e39db919f5d702cd734ef0d2e4c57a 100644 (file)
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -480,7 +480,6 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -491,10 +490,6 @@ extern unsigned long get_clock_freq(void);
 
 #endif /* CONFIG_PCI */
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 /*
  * Environment
  */

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 6067e608521fe3951d68fda9b7f52e902484be55..da20278d7a80e89b000f9e74eafb1ada06e3e57c 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -540,7 +540,6 @@
 #define CONFIG_SYS_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET
 #endif
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -571,10 +570,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */
 #define CONFIG_TSEC1   1

diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 31dbc3b7d92912f6d8abf9501113731825897195..c90b69dd5c4dd0b5f9452271aff8ae073105fb04 100644 (file)
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -298,7 +298,6 @@
 
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_NET
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_CMD_REGINFO

diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index 0ddb76f868ff1fd343949767a1a330ce0c9a4bba..2bd67c3e1155d9f7145b9b045c8b89a9f3cf3748 100644 (file)
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -371,7 +371,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #undef CONFIG_SYS_SCSI_SCAN_BUS_REVERSE
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #define CONFIG_RTL8139
@@ -428,10 +427,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 
 #define CONFIG_TSEC1           1

diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h
index 27ebceb01f249743be26a7e2ff1162c3408f72cf..f304272ff7ecebcf3f7587ac4d3db470df4ce16b 100644 (file)
--- a/include/configs/MUSENKI.h
+++ b/include/configs/MUSENKI.h
@@ -90,7 +90,6 @@
 #define CONFIG_PCI                     /* include pci support          */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support */
 
 #define CONFIG_TULIP
 

diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h
index 6f4d187595b1b08a3e15cf8e1d17150b6f01d61b..ade48930c3c1939e461b63a267d03e34a0c0540d 100644 (file)
--- a/include/configs/MVBC_P.h
+++ b/include/configs/MVBC_P.h
@@ -261,7 +261,6 @@
 /*
  * Ethernet configuration
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT 5
 
 #define CONFIG_E1000

diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h
index c201310f268179c8e8595f27df73806656082ac6..31c85e22de56c2a09435625cfdad8a224b076889 100644 (file)
--- a/include/configs/MVBLM7.h
+++ b/include/configs/MVBLM7.h
@@ -184,7 +184,6 @@
 #define CONFIG_SYS_PCI1_IO_PHYS        0xE2000000
 #define CONFIG_SYS_PCI1_IO_SIZE        0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_NET_RETRY_COUNT 3
 
 #define CONFIG_PCI_66M

diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h
index 5674636a3aa8706ed63e1a48890092dcfe0666f8..072475273206b92fd060153500c2c47fdaef4531 100644 (file)
--- a/include/configs/MVBLUE.h
+++ b/include/configs/MVBLUE.h
@@ -158,7 +158,6 @@
 #define CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW
 
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         5
 
 #define CONFIG_TULIP

diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h
index 812759d3e30ba8faa704417f131a03e024614b08..619a8002a73267c43770c1a705397439a96a1de9 100644 (file)
--- a/include/configs/MigoR.h
+++ b/include/configs/MigoR.h
@@ -50,7 +50,6 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9111 */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE    (0xB0000000)
 

diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h
index 88339ac0a890dcc55e6757d5b0b7f6b4b3cef723..e36476e30a9277aedb5107e1ffb9d1e641c034ea 100644 (file)
--- a/include/configs/NETPHONE.h
+++ b/include/configs/NETPHONE.h
@@ -99,7 +99,6 @@
 
 #define        CONFIG_RTC_MPC8xx               /* use internal RTC of MPC8xx   */
 
-#define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
 #define        FEC_ENET                1       /* eth.c needs it that way... */
 #undef CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_MII             1

diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h
index 92b7d6a1ee19f2deedb5a23d4cc15289f5329ad1..acf5dcbc0e876edf20e9160360f4915265fbd8ba 100644 (file)
--- a/include/configs/NETTA.h
+++ b/include/configs/NETTA.h
@@ -95,7 +95,6 @@
 
 #define        CONFIG_RTC_MPC8xx               /* use internal RTC of MPC8xx   */
 
-#define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
 #define        FEC_ENET                1       /* eth.c needs it that way... */
 #undef  CONFIG_SYS_DISCOVER_PHY                /* do not discover phys */
 #define CONFIG_MII             1

diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h
index d02dca98fdb3df289da33d229ce15867fcbc3d48..c58899beea6e2b7d98618162426060fc0d5f0d82 100644 (file)
--- a/include/configs/NETTA2.h
+++ b/include/configs/NETTA2.h
@@ -100,7 +100,6 @@
 
 #define        CONFIG_RTC_MPC8xx               /* use internal RTC of MPC8xx   */
 
-#define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
 #define        FEC_ENET                1       /* eth.c needs it that way... */
 #undef CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_MII             1

diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h
index 65a366ab041869a292f06d11aa8f6ab9b7bd0ba6..47110aff246d63d518d57ae188b83601931469d2 100644 (file)
--- a/include/configs/OCRTC.h
+++ b/include/configs/OCRTC.h
@@ -56,7 +56,6 @@
 #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 */
-#define CONFIG_NET_MULTI
 
 
 /*

diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h
index c2e3b2bcc1e272650e83324dc8d1e0417baef04b..9f754c2a81e56519a0e9b48c91cd07cd22c0cdbb 100644 (file)
--- a/include/configs/ORSG.h
+++ b/include/configs/ORSG.h
@@ -54,7 +54,6 @@
 #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 */
-#define CONFIG_NET_MULTI
 
 
 /*

diff --git a/include/configs/OXC.h b/include/configs/OXC.h
index bc8e718f17f7e189cde7d6716ac21a7fb33687cc..1343419e115e3226bc5b110227798ef5b8ca2715 100644 (file)
--- a/include/configs/OXC.h
+++ b/include/configs/OXC.h
@@ -106,7 +106,6 @@
 
 #define CONFIG_PCI                             /* include pci support          */
 
-#define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100                                /* Ethernet Express PRO 100     */
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index a3cccf4c3faab11d181793d91990f71a07739ac2..d892b6701b99258fdfb56c9426256bb8b92ee071 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -336,7 +336,6 @@
 #define CONFIG_SYS_PCIE3_IO_SIZE       0x00010000      /* 64k */
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
 #define CONFIG_E1000                   /* Define e1000 pci Ethernet card */
@@ -380,7 +379,6 @@
 #ifdef CONFIG_TSEC_ENET
 
 #define CONFIG_TSECV2
-#define CONFIG_NET_MULTI
 
 #define CONFIG_MII                     /* MII PHY management */
 #define CONFIG_TSEC1           1

diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index 9386674974465b89480990b42378464b2bc0d5e0..e9069222dc784a124009d7f7e58212f1afdff90c 100644 (file)
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -394,15 +394,10 @@ extern unsigned long get_clock_freq(void);
 
 #if defined(CONFIG_PCI)
 #define CONFIG_E1000           /* Defind e1000 pci Ethernet card */
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */
 #endif /* CONFIG_PCI */
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI
-#endif
-
 /*
  * Environment
  */

diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 043515dbd44ba34643847c4e5f3a30832926a627..ba74a150c1d395c833bd8a7dbac2eeaf8b54a89a 100644 (file)
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -471,7 +471,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #endif /* CONFIG_PCI */
 
-#define CONFIG_NET_MULTI       1
 
 #if defined(CONFIG_TSEC_ENET)
 #define CONFIG_MII             1       /* MII PHY management */

diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index f6b788e578dd1e9c829fb0b84b2ee3f4da0af652..3fa38daaf890d6273d5098ed9cde82c3fb4b38d7 100644 (file)
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -528,7 +528,6 @@
 #endif
 #define CONFIG_SYS_SRIO2_MEM_SIZE      0x20000000      /* 512M */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -558,10 +557,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */
 #define CONFIG_TSEC1   1

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index c7f076122c0420674e4ffec11df9659624748d05..91c250f05a536c110ad3e3d32650d6e378443ede 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -437,7 +437,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #endif
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_E1000
 

diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h
index eb641f556f132526d990e1e500d0d73a437b0150..f7ef6434a1a2d996fac76a844b5e1a714a067677 100644 (file)
--- a/include/configs/P3G4.h
+++ b/include/configs/P3G4.h
@@ -68,7 +68,6 @@
 #define        CONFIG_MPSC
 #define CONFIG_MPSC_PORT       0
 
-#define CONFIG_NET_MULTI        /* attempt all available adapters */
 
 /* define this if you want to enable GT MAC filtering */
 #define CONFIG_GT_USE_MAC_HASH_TABLE

diff --git a/include/configs/PCIPPC2.h b/include/configs/PCIPPC2.h
index b2b94b4439e10542e7cbe93a2529a5a92711ab95..fb485b03ee05ec738f79162d7c1726b382b29970 100644 (file)
--- a/include/configs/PCIPPC2.h
+++ b/include/configs/PCIPPC2.h
@@ -243,7 +243,6 @@
 
 #define CONFIG_WATCHDOG
 
-#define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/PCIPPC6.h b/include/configs/PCIPPC6.h
index c126605b3a426af994ac0f3b708c04749dada9e4..16d6450d91664caa7bd7110dfbaab130af4c30ad 100644 (file)
--- a/include/configs/PCIPPC6.h
+++ b/include/configs/PCIPPC6.h
@@ -245,7 +245,6 @@
 
 #define CONFIG_WATCHDOG
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 2dc6057f80a960c0c4ec4af3bfa1a602126c2f57..07415f4b5743fc8420f2646af9ce48dc5970654a 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -277,7 +277,6 @@
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                1       /* PHY address                  */
-#define CONFIG_NET_MULTI
 /************************************************************
  * RTC
  ***********************************************************/

diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h
index 95c30ccde655aa61b6426a4bdcb7222e55ca6f1c..3fe2b3eeeddbc7dab35aa2910f1255b27073091e 100644 (file)
--- a/include/configs/PK1C20.h
+++ b/include/configs/PK1C20.h
@@ -154,7 +154,6 @@
  * cache bypass so there's no need to monkey with inx/outx macros.
  *----------------------------------------------------------------------*/
 #define CONFIG_SMC91111_BASE   0x82110300      /* Base addr (bypass)   */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111                        /* Using SMC91c111      */
 #undef CONFIG_SMC91111_EXT_PHY                 /* Internal PHY         */
 #define CONFIG_SMC_USE_32_BIT                  /* 32-bit interface     */

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

diff --git a/include/configs/PM520.h b/include/configs/PM520.h
index 8354e70fd0706b55b4d5779ceb36ffe034effd37..9b01e4fee443f85ea284752476516e49b9790cd3 100644 (file)
--- a/include/configs/PM520.h
+++ b/include/configs/PM520.h
@@ -67,7 +67,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index 501f691ea523c2ec0f0ab18e4412ffeafdb13c23..f4f93059fac24c6cb9047c77c97aa1506b173433 100644 (file)
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -109,7 +109,6 @@
  * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be
  * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.
  */
-#define        CONFIG_NET_MULTI
 #undef CONFIG_ETHER_NONE               /* define if ether on something else */
 
 #undef CONFIG_ETHER_ON_SCC             /* define if ether on SCC       */

diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 1af043df332fc92389546b33d63d7ac3ba206bf6..28666d646b32e8c8e5fa8d60855b0b4413ee65d5 100644 (file)
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -109,7 +109,6 @@
  * if CONFIG_ETHER_NONE is defined, then either the ethernet routines must be
  * defined elsewhere (as for the console), or CONFIG_CMD_NET must be unset.
  */
-#define CONFIG_NET_MULTI
 #undef CONFIG_ETHER_NONE               /* define if ether on something else */
 
 #undef CONFIG_ETHER_ON_SCC             /* define if ether on SCC       */

diff --git a/include/configs/PMC405.h b/include/configs/PMC405.h
index 0f44e6413461b34b0b22e8a3f622cdda1638fca5..2dceff747dffae0514f782903ea3902956194496 100644 (file)
--- a/include/configs/PMC405.h
+++ b/include/configs/PMC405.h
@@ -59,7 +59,6 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 /* allow baudrate change        */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_PPC4xx_EMAC

diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h
index 83cee9654939fbd05095b9618efbfbbcc053d2c4..60aabf3f2723e6c238800c7d3b5330b3827ea8a6 100644 (file)
--- a/include/configs/PMC405DE.h
+++ b/include/configs/PMC405DE.h
@@ -46,7 +46,6 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change*/
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1
 
 #define CONFIG_PPC4xx_EMAC

diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 4eb0735fcffe5462b2ca07cf52d6b73397b61f77..bee74aa53d0b864eb97108a1abb98fc18bdf95cc 100644 (file)
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -324,7 +324,6 @@
 #define CONFIG_HAS_ETH0
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* Number of ethernet rx buffers & descriptors */
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1       /* add support for "eth1addr"   */
 #define CONFIG_PHY1_ADDR       1
 #define CONFIG_RESET_PHY_R     1

diff --git a/include/configs/PN62.h b/include/configs/PN62.h
index 7f2f1131b0acb386600e0b68caead17017eec4a3..d562877c9a2a8bbf0f30d3615e88a0eee256948a 100644 (file)
--- a/include/configs/PN62.h
+++ b/include/configs/PN62.h
@@ -130,7 +130,6 @@
 /*
  * Networking stuff
  */
-#define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_PCNET                           /* there are 2 AMD PCnet 79C973 */
 #define CONFIG_PCNET_79C973

diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index 195925ac5cfd127158199520d8fcbbea5af02e72..2d456189f203828412da94db017fb8bdd4cf9692 100644 (file)
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -105,7 +105,6 @@
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
 #undef CONFIG_EXT_PHY
-#define CONFIG_NET_MULTI       1
 
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1       /* MII PHY management           */

diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index b5612d66cae8555c1277b26456a726d158747133..7a965308031ed642542c40d73cef225ce64055cb 100644 (file)
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -238,7 +238,6 @@
 
 #if defined(CONFIG_TSEC_ENET)          /* TSEC Ethernet port */
 
-#  define CONFIG_NET_MULTI     1
 #  define CONFIG_MPC85xx_TSEC1
 #  define CONFIG_MPC85xx_TSEC1_NAME    "TSEC0"
 #  define CONFIG_MII           1       /* MII PHY management           */

diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h
index 339e02b5ee365055b68926f3eae5b53a2c5c07f2..e006b55533bf009f55478baba45596e5c1908e9e 100644 (file)
--- a/include/configs/SIMPC8313.h
+++ b/include/configs/SIMPC8313.h
@@ -272,7 +272,6 @@
  */
 #define CONFIG_TSEC_ENET               /* TSEC ethernet support */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_GMII                    /* MII PHY management */
 
 #ifdef CONFIG_TSEC1

diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h
index 524a3e0690c1ff6c9fdfdb1d9f76d9e79ed941d6..35171b6b92ba5e9f697f4c0ec90bd94d706fddf2 100644 (file)
--- a/include/configs/Sandpoint8240.h
+++ b/include/configs/Sandpoint8240.h
@@ -129,7 +129,6 @@
 #define CONFIG_PCI                             /* include pci support          */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h
index 87aa4fdac392229599669e900c43742675f5983f..9ba307e1c0af715feca3314a0f7f6e15619d027d 100644 (file)
--- a/include/configs/Sandpoint8245.h
+++ b/include/configs/Sandpoint8245.h
@@ -97,7 +97,6 @@
 #define CONFIG_PCI                             /* include pci support          */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI                       /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h
index d6ea22d746495f0a0d9b90d52503ab0f2aa02981..3a01292e29cd24cad63f006a2edb4a153dd01c02 100644 (file)
--- a/include/configs/TOP860.h
+++ b/include/configs/TOP860.h
@@ -203,7 +203,6 @@
 /*-----------------------------------------------------------------------
  * defines we need to get FEC running
  */
-#define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
 #define CONFIG_FEC_ENET                1       /* Ethernet only via FEC        */
 #define        FEC_ENET                1       /* eth.c needs it that way... */
 #define CONFIG_SYS_DISCOVER_PHY        1

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 3154e13f2f32c4ca159c75733b7fe35469ac2403..6ea3faac1ab9a4c232ef3b6c0c32036b740fe7ac 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -106,7 +106,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index 5cd517d942d626cec7a31bbc143829e77471e2d7..9370ca821e84684ea2eaa340e396a72e7ab587f0 100644 (file)
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -215,10 +215,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI
-#endif
-
 #define CONFIG_TSEC1           1
 #define CONFIG_TSEC1_NAME      "TSEC0"
 #define CONFIG_TSEC2           1

diff --git a/include/configs/TQM85xx.h b/include/configs/TQM85xx.h
index fe6b7281040360a0cfc0062853ae15b4d07edbe2..780abd978d27a3f5517bdb12e4ce33fe18e1d59b 100644 (file)
--- a/include/configs/TQM85xx.h
+++ b/include/configs/TQM85xx.h
@@ -421,7 +421,6 @@
 
 #endif /* CONFIG_PCI */
 
-#define CONFIG_NET_MULTI       1
 
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_TSEC1   1

diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 0082e71e3a2d94900fc709769ea04327f2c60d06..79bea34173f641e6a3f8dd849c828352aff11e4d 100644 (file)
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -475,7 +475,6 @@
                         MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 |   \
                         MAMR_RLFA_1X    | MAMR_WLFA_1X    | MAMR_TLFA_4X)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
 #define CONFIG_ETHPRIME                "SCC"

diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 6e891e7f1252d60bb75dca26982cbfa816eaabde..76934590b33bb1f6b947bde825ee1c9d9be5c064 100644 (file)
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -476,7 +476,6 @@
                         MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 |   \
                         MAMR_RLFA_1X    | MAMR_WLFA_1X    | MAMR_TLFA_4X)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
 #define CONFIG_ETHPRIME                "SCC"

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 717b5cdd804ade55dfd129d738f2c2da5d6f08dc..16b2dacc6c187920997b5fe3e2ca887d8bb53ffa 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -99,7 +99,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h
index 740cb7550440df793b4fa918dff4dad874d032ca..183045b4604bfc578d932f7300c07276b5bde99f 100644 (file)
--- a/include/configs/VCMA9.h
+++ b/include/configs/VCMA9.h
@@ -111,7 +111,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_CS8900                  /* we have a CS8900 on-board */
 #define CONFIG_CS8900_BASE             0x20000300
 #define CONFIG_CS8900_BUS16

diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h
index f0c0bd9662c78917670059a1ef967ee05e3cb8da..5b8f41fdd884d1a25015b95b8ea067813acca656 100644 (file)
--- a/include/configs/VOH405.h
+++ b/include/configs/VOH405.h
@@ -54,7 +54,6 @@
 
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
-#define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
 #define CONFIG_PPC4xx_EMAC

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

diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index 5d1c188499c3fd68e2b6457b426f6b06456f21e0..1d97d3e35955e7b84debb15a8dcab27c197002b2 100644 (file)
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -71,7 +71,6 @@
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1               /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0               /* PHY address                  */
-#define CONFIG_NET_MULTI
 
 #define CONFIG_RTC_M48T35A     1               /* ST Electronics M48 timekeeper */
 

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index 422a781a5cabb23a3c066f1e4461d64e653c4ec4..93caacce608274f80704dac7ab6d4292906365ae 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -71,7 +71,6 @@
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII             1               /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0               /* PHY address                  */
-#define CONFIG_NET_MULTI
 
 #define CONFIG_RTC_M48T35A     1               /* ST Electronics M48 timekeeper */
 #define CONFIG_DTT_LM75     1                /* ON Semi's LM75 */

diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h
index 027a904ee22d10b299a319d0ad44c77f4f988de7..504ad96b038cee7686b561d9f6adaddcda6dda82 100644 (file)
--- a/include/configs/WUH405.h
+++ b/include/configs/WUH405.h
@@ -60,7 +60,6 @@
 #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 */
-#define CONFIG_NET_MULTI
 
 #define CONFIG_PHY_CLK_FREQ    EMAC_STACR_CLK_66MHZ /* 66 MHz OPB clock*/
 

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 0e340e898e099e34b6d894fe21d7faea42b10d69..5f925b328c30d8d7d71f02927bc70eaf0f6ce913 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -97,7 +97,6 @@
 #define CONFIG_CMD_SNTP
 
 
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 
 /*

diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h
index 5489bd831d5b725530fd34061d51e619ba22af27..5350f619f8c43adb624e3fab2eaca65aebdbb9e8 100644 (file)
--- a/include/configs/ZUMA.h
+++ b/include/configs/ZUMA.h
@@ -77,7 +77,6 @@
 
 #define CONFIG_MPSC_PORT       0
 
-#define CONFIG_NET_MULTI        /* attempt all available adapters */
 
 /* define this if you want to enable GT MAC filtering */
 #define CONFIG_GT_USE_MAC_HASH_TABLE

diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h
index 62913b5842d2693123157093abae56b70400b6d8..45a7c53f7d90dd6969804526294063647b450ba8 100644 (file)
--- a/include/configs/a320evb.h
+++ b/include/configs/a320evb.h
@@ -71,7 +71,6 @@
 /*
  * Ethernet
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_FTMAC100
 
 #define CONFIG_BOOTDELAY       3

diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h
index b5d20bd7b25d1386b2c58e2de042d28417041f19..1c139048ec3404b013e5684910e13be964de12d7 100644 (file)
--- a/include/configs/a4m072.h
+++ b/include/configs/a4m072.h
@@ -78,7 +78,6 @@
 
 #define CONFIG_SYS_XLB_PIPELINING      1
 
-#undef CONFIG_NET_MULTI
 #undef CONFIG_EEPRO100
 
 /* Partitions */

diff --git a/include/configs/actux1.h b/include/configs/actux1.h
index 2717abaced3baa4f0f19ce48ae121bb2e7ae3162..00780d0d8b3416c077a3392d725c0ad9de6bd80a 100644 (file)
--- a/include/configs/actux1.h
+++ b/include/configs/actux1.h
@@ -166,7 +166,6 @@
 
 /* include IXP4xx NPE support */
 #define CONFIG_IXP4XX_NPE              1
-#define CONFIG_NET_MULTI               1
 /* NPE0 PHY address */
 #define        CONFIG_PHY_ADDR                 0
 /* NPE1 PHY address (HW Release E only) */

diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index eca814b3ee60f92d866e861f2530251a3bdeb72f..cb97434c3ef6de8147be3cb0e663576cd107942a 100644 (file)
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -143,7 +143,6 @@
 
 /* include IXP4xx NPE support */
 #define CONFIG_IXP4XX_NPE              1
-#define CONFIG_NET_MULTI               1
 /* NPE0 PHY address */
 #define        CONFIG_PHY_ADDR                 0x00
 /* MII PHY management */

diff --git a/include/configs/actux3.h b/include/configs/actux3.h
index c1033124026e687f7015942284922f8469cf48cf..816d982a31732b5bb2933fd6fceadfe94e23be82 100644 (file)
--- a/include/configs/actux3.h
+++ b/include/configs/actux3.h
@@ -143,7 +143,6 @@
 /* include IXP4xx NPE support */
 #define CONFIG_IXP4XX_NPE              1
 
-#define CONFIG_NET_MULTI               1
 /* NPE0 PHY address */
 #define        CONFIG_PHY_ADDR                 0x10
 /* MII PHY management */

diff --git a/include/configs/actux4.h b/include/configs/actux4.h
index 190de5a3907fd47bf243aff9c469db7eb1108458..90badd39c5984d528846e8c5c326dd5a19a8f34f 100644 (file)
--- a/include/configs/actux4.h
+++ b/include/configs/actux4.h
@@ -154,7 +154,6 @@
 /* include IXP4xx NPE support */
 #define CONFIG_IXP4XX_NPE              1
 
-#define CONFIG_NET_MULTI               1
 /* NPE0 PHY address */
 #define        CONFIG_PHY_ADDR                 0x1C
 /* MII PHY management */

diff --git a/include/configs/aev.h b/include/configs/aev.h
index fb958fd943a57c4bef86b29c51984b4d46dde8ef..8d0890fc8adad997d755d5cd83b6763e6e790cdc 100644 (file)
--- a/include/configs/aev.h
+++ b/include/configs/aev.h
@@ -80,7 +80,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 2c2c0776d5a2a59a9115d8a783319df38b05c82f..2adf8f9e5c43a6d1cfb1cc2cd7a881dfe0e1f9e6 100644 (file)
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -124,7 +124,6 @@
 #define CONFIG_MACB
 #define CONFIG_RESET_PHY_R
 
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         20
 
 /* USB */

diff --git a/include/configs/alpr.h b/include/configs/alpr.h
index d93e505907c9b112da73958bf88fca9e0e3b7fc0..0d53e51b9d5568471eeba37779ede66258e03ce7 100644 (file)
--- a/include/configs/alpr.h
+++ b/include/configs/alpr.h
@@ -206,7 +206,6 @@
 
 #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 */
 #define CONFIG_PHY1_ADDR       0x03    /* dummy setting, no EMAC1 used */
 #define CONFIG_PHY2_ADDR       0x01    /* PHY address for EMAC2        */

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index b5d3e102b29bb68fcb7d0fce0162f1b619cc7334..76ef56f2f4f0787f19c0655cfcbfce821db09012 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -52,7 +52,6 @@
  */
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                     /* MII PHY management           */
-#define CONFIG_NET_MULTI
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */
 #if defined(CONFIG_440)
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* number of eth rx buffers     */

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 45126c724dbf11c5cc057a70b64141d07353a624..42a134bbc143de917f8e975a1cd8451fefd312eb 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -53,7 +53,6 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9118 */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X 1
 #define CONFIG_SMC911X_32_BIT 1
 #define CONFIG_SMC911X_BASE 0xB6080000

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 1f959fc8feece5b0dcbc79518550ecbb004697bf..46595d911a585ac60d0ab74ef0ba59724c26a1d7 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -86,7 +86,6 @@
 /*
  * SMC91c96 Etherent
  */
-#define CONFIG_NET_MULTI
 #define        CONFIG_LAN91C96
 #define        CONFIG_LAN91C96_BASE    (APOLLON_CS1_BASE+0x300)
 #define        CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/aria.h b/include/configs/aria.h
index 3a60de0d4701b75e4cc516df9a564fdb07bdcffc..0619cf780d262defccf179d57e439069042ac41e 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -398,7 +398,6 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC512x_FEC             1
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR                        0x17
 #define CONFIG_MII                     1       /* MII PHY management */
 #define CONFIG_FEC_AN_TIMEOUT          1

diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index b847798aa44a1d5c06c2753e62afc4ee2910c425..7e6c1554cbce573e5a237477036f41eefacc5222 100644 (file)
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -147,7 +147,6 @@
 /*
  * Network Driver Setting
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_DRIVER_AT91EMAC
 #define CONFIG_SYS_RX_ETH_BUFFER       16
 #define CONFIG_RMII

diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index 88578c69472ac87f486af4a66097eceae3fdd900..c439f3e821db83f0f3764de0120ce0e95a51c75a 100644 (file)
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -161,7 +161,6 @@
 /* Ethernet */
 #define CONFIG_MACB                    1
 #define CONFIG_RMII                    1
-#define CONFIG_NET_MULTI               1
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R             1
 

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 126907f445c093c7a096e3a94f031ea8741daf0f..c8fc9e7bd158964f61a569d19d7833fde60b2bcc 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -153,7 +153,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* Ethernet */
-#define CONFIG_NET_MULTI
 #define CONFIG_DRIVER_DM9000
 #define CONFIG_DM9000_BASE             0x30000000
 #define DM9000_IO                      CONFIG_DM9000_BASE

diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index d817423a7ed3ee8ce98a3b8c3bb729dbf44dd7a9..f73d952ff83ea3a5ad96b611e707e0b22667953a 100644 (file)
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -290,7 +290,6 @@
 /* Ethernet */
 #define CONFIG_MACB                    1
 #define CONFIG_RMII                    1
-#define CONFIG_NET_MULTI               1
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R             1
 

diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index b08cbf2345473e9cca762e7c7555a35e091ba4cf..05575cd34c46c0b72d96b73af9ce1556b39a7bba 100644 (file)
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -145,7 +145,6 @@
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R
 

diff --git a/include/configs/atc.h b/include/configs/atc.h
index 53da0f7e2c6c4ca5049fd08b8c6fccc72bd51de4..bf1f2028012bd55f8e4c383cfc740fc8d8ed858e 100644 (file)
--- a/include/configs/atc.h
+++ b/include/configs/atc.h
@@ -72,7 +72,6 @@
 #undef CONFIG_ETHER_NONE               /* define if ether on something else */
 #define CONFIG_ETHER_ON_FCC
 
-#define        CONFIG_NET_MULTI
 #define CONFIG_ETHER_ON_FCC2
 
 /*

diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
index bda6eedcf2b7b2c1afddb403b4f35cbfee2cf9ed..8f9ed238976c52248abe6760b5cb4f97915db145 100644 (file)
--- a/include/configs/atngw100.h
+++ b/include/configs/atngw100.h
@@ -96,7 +96,6 @@
  * "ethaddr" and "eth1addr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP/DHCP options

diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h
index f24452be3309fbec35119298a1c384fb6e07a830..44ce24296163ab67343721ba0c8c6cd3ad210f22 100644 (file)
--- a/include/configs/atstk1002.h
+++ b/include/configs/atstk1002.h
@@ -120,7 +120,6 @@
  * "ethaddr" and "eth1addr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP options

diff --git a/include/configs/atstk1006.h b/include/configs/atstk1006.h
index 26c08e2128db0d757d8427ce404d598198b42778..a30aa70b1a4d923d2c7550cc00aea7868c7d508e 100644 (file)
--- a/include/configs/atstk1006.h
+++ b/include/configs/atstk1006.h
@@ -120,7 +120,6 @@
  * "ethaddr" and "eth1addr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP options

diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index a55e1786dd54ba2654c3e3baa6aad58d482e64b1..72d0948c1bbf27fb3b3cec4e29f1acd6689bbf6d 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -68,7 +68,6 @@
 #define ADI_CMDS_NETWORK       1
 #define CONFIG_BFIN_MAC                1
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HOSTNAME                brettl2
 #define CONFIG_IPADDR          192.168.233.224
 #define CONFIG_GATEWAYIP       192.168.233.1

diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 6eec1c91a7e870c9a731ee497e1d13ef44d51e95..a97972b81caa90f85c8bc3e2bbb7a74018136909 100644 (file)
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -84,7 +84,6 @@
        P_MII0_MDIO, \
        0 }
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                bf518f-ezbrd
 #define CONFIG_PHY_ADDR                3

diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index c28f86712ceeaefdef9a9344617d21f91a03333a..1945c032ab5d78931b59088c8cd44bdc50c4ff35 100644 (file)
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -84,7 +84,6 @@
 #define CONFIG_BFIN_MAC
 #define CONFIG_RMII
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                bf526-ezbrd
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index 22a5639e5626a29a9840daf0b12312cb974e6636..1256e815d50825e4ccc065c6d04c135eca5d6eba 100644 (file)
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -82,7 +82,6 @@
 #define CONFIG_BFIN_MAC
 #define CONFIG_RMII
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                bf527-ezkit
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/bf533-ezkit.h b/include/configs/bf533-ezkit.h
index 95d3afa85cc5faaf8ff4c82b6c00640dd4eb07be..c1a5ecda7ed5ece2c59b1e35f0d45bace1841526 100644 (file)
--- a/include/configs/bf533-ezkit.h
+++ b/include/configs/bf533-ezkit.h
@@ -65,7 +65,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20310300
 #define SMC91111_EEPROM_INIT() \

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index cb37ee797c6e1cd3a87c3b35d9513623b8a41f07..e3344e9e85166e52b9be5f5d3e2a47c609f33b87 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -60,7 +60,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20300300
 #define SMC91111_EEPROM_INIT() \

diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index 11929c77bf9ade844061003c7c815dad166cfb3c..c6ae4f15060c6ee3566d2288cb9cc886147272c9 100644 (file)
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -75,7 +75,6 @@
 #ifndef __ADSPBF534__
 #define CONFIG_BFIN_MAC
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #ifdef CONFIG_BFIN_MAC
 #define CONFIG_IPADDR          192.168.0.15

diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 0913ce4e6916593e4d3286ea0c573cb3f79d6c5d..62bd3bf085c904841b206f1c7f705605e193ec6c 100644 (file)
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -63,7 +63,6 @@
 #define ADI_CMDS_NETWORK       1
 #define CONFIG_BFIN_MAC
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                bf537-pnav
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index e8024d7a2c03be391ef9097b4f68a1571225723f..da3681def2c171a8faec3cfa220ce0c20390a72b 100644 (file)
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -75,7 +75,6 @@
 #ifndef __ADSPBF534__
 #define CONFIG_BFIN_MAC
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #ifdef CONFIG_BFIN_MAC
 #define CONFIG_IPADDR          192.168.0.15

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 1a7273b1ec99eb980d3165688342c40ee4981fad..05029d497bb14b481cccb437f547782ed1b2212c 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -63,7 +63,6 @@
 #define ADI_CMDS_NETWORK       1
 #define CONFIG_BFIN_MAC
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                bf537-stamp
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 717a35a81f155ac4a01e639525d4ba4a34b5a53a..77822e792f8c1e44c9348ef15b140b99e788880e 100644 (file)
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -60,7 +60,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20310300
 #define CONFIG_HOSTNAME                bf538f-ezkit

diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index 4862baa39d5be3a1c60dead8b1bef0ac01b7c3aa..3eadcefb83e3dd28d20d1d3619796f67812fceab 100644 (file)
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -69,7 +69,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X 1
 #define CONFIG_SMC911X_BASE    0x24000000
 #define CONFIG_SMC911X_16_BIT

diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 1490b2f9839e94b3515711bd4ccfc68ec0a2d4a3..ee585c0ffdeabe5a66cbaccc1bf37188e580622b 100644 (file)
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -76,7 +76,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK                       1
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index 6cfc19b6b8da4ad16a94039fd4752ba8abb92a0b..1a9d27ea2a04f673e6bdae92b4690d0b6d6f982d 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -60,7 +60,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x2C010300
 #define CONFIG_SMC_USE_32_BIT  1

diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 85f08ea88804dfa1d1bcaa3fdcd64173ee93f07c..63791be3e344bebebab0a99692b5079401ff4832 100644 (file)
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -30,7 +30,6 @@
 /*
  * Board settings
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20300300
 

diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index 9950e44f5207becddeec97519af1f93b02c88241..b425b7b6288e212dd407223f60695ff3b6c0b64c 100644 (file)
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -72,26 +72,22 @@
  * Then use the dedicated card IP + 1 for the board
  * http://docs.blackfin.uclinux.org/doku.php?id=setting_up_the_network
  */
-#define CONFIG_NET_MULTI
-
 #define CONFIG_DRIVER_AX88180  1
 #define AX88180_BASE           0x2c000000
 #define CONFIG_CMD_MII         /* enable probing PHY */
 
-#ifdef CONFIG_NET_MULTI                /* also used as the network enabler */
-# define CONFIG_HOSTNAME       blackvme        /* Bfin board  */
-# define CONFIG_IPADDR         169.254.144.145 /* Bfin board  */
-# define CONFIG_GATEWAYIP      169.254.144.144 /* dedic card  */
-# define CONFIG_SERVERIP       169.254.144.144 /* tftp server */
-# define CONFIG_NETMASK                255.255.255.0
-# define CONFIG_ROOTPATH       /export/uClinux-dist/romfs      /*NFS*/
-# define CFG_AUTOLOAD          "no"
-# define CONFIG_CMD_DHCP
-# define CONFIG_CMD_PING
-# define CONFIG_ENV_OVERWRITE  1       /* enable changing MAC at runtime */
+#define CONFIG_HOSTNAME        blackvme        /* Bfin board  */
+#define CONFIG_IPADDR          169.254.144.145 /* Bfin board  */
+#define CONFIG_GATEWAYIP       169.254.144.144 /* dedic card  */
+#define CONFIG_SERVERIP        169.254.144.144 /* tftp server */
+#define CONFIG_NETMASK         255.255.255.0
+#define CONFIG_ROOTPATH        /export/uClinux-dist/romfs      /*NFS*/
+#define CFG_AUTOLOAD           "no"
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_ENV_OVERWRITE   1       /* enable changing MAC at runtime */
 /* Comment out hardcoded MAC to enable MAC storage in EEPROM */
 /* # define CONFIG_ETHADDR     ff:ee:dd:cc:bb:aa */
-#endif
 
 /*
  * SDRAM settings & memory map

diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h
index 8c57eabb8caa87dcc60bfce02b8e197a7d301bfa..2675c56b067d4192854c1dcb2f6a6563ee53c3f7 100644 (file)
--- a/include/configs/ca9x4_ct_vxp.h
+++ b/include/configs/ca9x4_ct_vxp.h
@@ -50,7 +50,6 @@
 #define VEXPRESS_FLASHPROG_FLVPPEN     (1 << 0)
 
 /* SMSC9115 Ethernet from SMSC9118 family */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X                 1
 #define CONFIG_SMC911X_32_BIT          1
 #define CONFIG_SMC911X_BASE            0x4E000000
@@ -78,7 +77,6 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVEENV
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_RUN
 
 #define CONFIG_CMD_FAT

diff --git a/include/configs/cerf250.h b/include/configs/cerf250.h
index 7e179beef7b7c5d54b1e24283029209e518f2c40..be325e8c264ca9f5afe1108ae063e940d68e22d5 100644 (file)
--- a/include/configs/cerf250.h
+++ b/include/configs/cerf250.h
@@ -53,7 +53,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE 0x04000300
 #define CONFIG_SMC_USE_32_BIT

diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index e0c6d53b2c7abf7273b5e303c68eba718dc203c9..4f2b904d54ef6ffd0e7ea50d6f76f3254ccd7d74 100644 (file)
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -82,7 +82,6 @@
 #define CONFIG_BFIN_MAC
 #define CONFIG_RMII
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                cm-bf527
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/cm-bf533.h b/include/configs/cm-bf533.h
index 75152964b61d8c358971630357199d80f866a953..e2b954c0633b5fb9f86fbeeec2df8f03659f7ca9 100644 (file)
--- a/include/configs/cm-bf533.h
+++ b/include/configs/cm-bf533.h
@@ -63,7 +63,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111        1
 #define CONFIG_SMC91111_BASE   0x20200300
 #define CONFIG_HOSTNAME                cm-bf533

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index 9649e18f7a61e4a6e0b40b62db03cbec8f7b2f13..77f47d9457f85c9ab124a056d314df8fdef8124d 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -69,7 +69,6 @@
 #define CONFIG_SMC911X_BASE    0x20308000
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537e
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 84846efadd0903b60d799bc2155b18fc6fc1f637..55e61d674fd1feefff87a138bbb798381c9570f9 100644 (file)
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -67,7 +67,6 @@
 #define CONFIG_SMC911X_BASE    0x20308000
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                cm-bf537u
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h
index fa62a8e9c1da26bec526e475af39cd853e8f2e0d..a6d2fa8ae4bcc7c277a77f340b5a465fa20de2b3 100644 (file)
--- a/include/configs/cm-bf548.h
+++ b/include/configs/cm-bf548.h
@@ -72,7 +72,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X 1
 #define CONFIG_SMC911X_BASE    0x24000000
 #define CONFIG_SMC911X_16_BIT

diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index c60401c8fecb3a33058b720820f58e9fed837f2d..93e3c8677e66a247537d7e0b8f7cecdca7606ba9 100644 (file)
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -63,7 +63,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X         1
 #define CONFIG_SMC911X_BASE    0x24008000 /* AMS1 */
 #define CONFIG_SMC911X_16_BIT

diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h
index 5777062c60a634baba517850195350e757cd2606..81e4de45d6e8f4b9339492fd267e594b147f5a59 100644 (file)
--- a/include/configs/cm4008.h
+++ b/include/configs/cm4008.h
@@ -38,7 +38,6 @@
 #define CONFIG_INITRD_TAG       1
 
 #define CONFIG_DRIVER_KS8695ETH                /* use KS8695 ethernet driver   */
-#define CONFIG_NET_MULTI
 
 /*
  * Size of malloc() pool

diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h
index 66e689aa85873463244b9fee99897918326c21be..785ab0a62a42a39a1da07726e5772d42a887a04e 100644 (file)
--- a/include/configs/cm41xx.h
+++ b/include/configs/cm41xx.h
@@ -38,7 +38,6 @@
 #define CONFIG_INITRD_TAG       1
 
 #define CONFIG_DRIVER_KS8695ETH                /* use KS8695 ethernet driver   */
-#define CONFIG_NET_MULTI
 
 /*
  * Size of malloc() pool

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 496a904f2bf1a489b2be4b9d790a9dbcc5c91653..026d22203c41a9f1761a9d469441e7d63b521418 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -328,7 +328,6 @@
 #define CONFIG_ENV_ADDR                        SMNAND_ENV_OFFSET
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
 #define CM_T3X_SMC911X_BASE    0x2C000000

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index 5348ad126b54359dfb69ec3c39bbecba1934a86a..6d97a0cdc2ae5ed8226cd86fc2bbc1fa061b41d0 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -155,7 +155,6 @@
 #undef CONFIG_CMD_MII
 
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index 23bfbeb1d7cef4f4266980b74ede0769be908873..011731b87495cd97f98c10c1ba86fdeee264d001 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -84,7 +84,6 @@
 #define        CONFIG_CMD_PING
 #define        CONFIG_CMD_DHCP
 
-#define        CONFIG_NET_MULTI                1
 #define        CONFIG_DRIVER_DM9000            1
 #define CONFIG_DM9000_BASE             0x08000000
 #define DM9000_IO                      (CONFIG_DM9000_BASE)

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 4bbca88604dd82c10f68560fd6c71a0d879a3dd7..007521055067b3f679dae9631ae7d829c924b4c9 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -498,7 +498,6 @@
 #endif
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_E1000
 

diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h
index c1742c1a693c8a0e649e8ec679452c801eaeb6de..a9cfe267f54e500d23a542467302e1b0469522ea 100644 (file)
--- a/include/configs/cpci5200.h
+++ b/include/configs/cpci5200.h
@@ -84,7 +84,6 @@
 
 #define CONFIG_MII
 #if 0                          /* test-only !!! */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8       /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index ba9f797d6e7942ff22287968fb0f031902259194..0c86d6220de7d866824579a66656fcb6d58591f9 100644 (file)
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -327,7 +327,6 @@
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT                 20
 #define CONFIG_MACB_SEARCH_PHY
 

diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h
index 75b881cf84429d597ce2acf104006b15d7b23c0e..1b43c54f486bec0a27b478cc3de2ba64be8692b5 100644 (file)
--- a/include/configs/cpuat91.h
+++ b/include/configs/cpuat91.h
@@ -153,7 +153,6 @@
 #define CONFIG_SYS_MEMTEST_END                 \
        (CONFIG_SYS_MEMTEST_START + CONFIG_SYS_SDRAM_SIZE - 512 * 1024)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_DRIVER_AT91EMAC
 #define CONFIG_SYS_RX_ETH_BUFFER       16
 #define CONFIG_RMII

diff --git a/include/configs/cradle.h b/include/configs/cradle.h
index 21a8e648e3a633169d6a2232e7390060b734247c..25be616651b7ac7cdd4b016b5bacc55ba13d4aaa 100644 (file)
--- a/include/configs/cradle.h
+++ b/include/configs/cradle.h
@@ -48,7 +48,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE 0x10000300
 #define CONFIG_SMC91111_EXT_PHY

diff --git a/include/configs/csb226.h b/include/configs/csb226.h
index 934dfcdef2fa79909e421ba36b99e93129a71e9d..804469bf857174205ccea8874de9de198d39038f 100644 (file)
--- a/include/configs/csb226.h
+++ b/include/configs/csb226.h
@@ -149,7 +149,6 @@
 /*
  * Network chip
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_CS8900
 #define CONFIG_CS8900_BUS32
 #define CONFIG_CS8900_BASE     0x08000000

diff --git a/include/configs/csb272.h b/include/configs/csb272.h
index 0ea34b89d85185971f2c52c2c13ced19a415160a..fb5f868af3c3f605e058760cd1dffe4170c8fbf5 100644 (file)
--- a/include/configs/csb272.h
+++ b/include/configs/csb272.h
@@ -193,7 +193,6 @@
 #define CONFIG_PHY_CMD_DELAY   40      /* PHY COMMAND delay            */
                                        /* 32usec min. for LXT971A      */
 #define CONFIG_PHY_RESET_DELAY 300     /* PHY RESET recovery delay     */
-#define CONFIG_NET_MULTI
 
 /*
  * RTC configuration

diff --git a/include/configs/csb472.h b/include/configs/csb472.h
index 23731676f25da36f4565299e4730ed83f592cc47..5d18ac7eaf33862fcaa0edb7860dbd3e24c6b9dd 100644 (file)
--- a/include/configs/csb472.h
+++ b/include/configs/csb472.h
@@ -192,7 +192,6 @@
 #define CONFIG_PHY_CMD_DELAY   40      /* PHY COMMAND delay            */
                                        /* 32usec min. for LXT971A      */
 #define CONFIG_PHY_RESET_DELAY 300     /* PHY RESET recovery delay     */
-#define CONFIG_NET_MULTI
 
 /*
  * RTC configuration

diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index 66fdea22f60aa7e08287566a60f5b07846ee6dff..c522af97b6837c5c739c98daaa10f2f0d6a0909c 100644 (file)
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -94,7 +94,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 #endif
 
 /*

diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index f6068a2b3411d3a6b6bc73dc0611e57c43da706f..cad56209add19c08c7d161d10ccd28beb6148b78 100644 (file)
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -128,7 +128,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 #endif
 
 #ifdef CONFIG_USE_NOR

diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h
index 56d0ac9b334f23e329fd32e616453dd43a8d2ac8..ddf673c846d9e108235d562c227c2e7cffbe964d 100644 (file)
--- a/include/configs/davinci_dm355evm.h
+++ b/include/configs/davinci_dm355evm.h
@@ -55,7 +55,6 @@
 #define CONFIG_DM9000_BASE             0x04014000
 #define DM9000_IO                      CONFIG_DM9000_BASE
 #define DM9000_DATA                    (CONFIG_DM9000_BASE + 2)
-#define CONFIG_NET_MULTI
 
 /* I2C */
 #define CONFIG_HARD_I2C

diff --git a/include/configs/davinci_dm355leopard.h b/include/configs/davinci_dm355leopard.h
index b44b2ea7ac618e57bc04b7c73ce8763888ab5cc2..dfa0a00475d8baa36298321044cc28cf159cc3db 100644 (file)
--- a/include/configs/davinci_dm355leopard.h
+++ b/include/configs/davinci_dm355leopard.h
@@ -54,7 +54,6 @@
 #define CONFIG_DM9000_BASE             0x04000000
 #define DM9000_IO                      CONFIG_DM9000_BASE
 #define DM9000_DATA                    (CONFIG_DM9000_BASE + 16)
-#define CONFIG_NET_MULTI
 
 /* I2C */
 #define CONFIG_HARD_I2C

diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 28b9db9a70e6f37f372ce0bd2d279e88b297c8ff..323c0b4dfed0ad428a81e01caeaad7d5186e384c 100644 (file)
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -67,7 +67,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 
 /* I2C */
 #define CONFIG_HARD_I2C

diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index a0a30f57859571c00c3291f2a424d40876734062..d97c0f36c4afbd1c730e10bccc7e3ccfea3f490e 100644 (file)
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -91,7 +91,6 @@ extern unsigned int davinci_arm_clk_get(void);
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_NET
 
 /* Flash & Environment */

diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 086a2d7d40632e953b84e87a145957948508894a..88c6beeb9daefe2ab404bfae6bbc354993b0c110 100644 (file)
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -112,7 +112,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 /*=====================*/
 /* Flash & Environment */
 /*=====================*/

diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 5cc8bc05025320e9ae8c8f2c2df15f143c36b7aa..b6f61ee4bfdbc4904b24cc9156f76b40cebc6327 100644 (file)
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -76,7 +76,6 @@
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 /*=====================*/
 /* Flash & Environment */
 /*=====================*/

diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index 307b9f27419b02645cfb7b6d9f2d83c97ede55f5..ce2721275b70c8be7bb8931a1e6daaa14eeddc11 100644 (file)
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -73,7 +73,6 @@
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 /* Flash & Environment */
 #undef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_SYS_NO_FLASH

diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 2336129f1f45ce14c9c9f3ce4c511f28150eb76b..163f1a2103ea6162f9b7ce66673acf5f09de5d09 100644 (file)
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -108,7 +108,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 /*=====================*/
 /* Flash & Environment */
 /*=====================*/

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index d8c936250e885c56621f3ace881fc293c297ae53..1d5cf2c4111c371411ea2027d249603f86927125 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -208,7 +208,6 @@
 
 #define CONFIG_NR_DRAM_BANKS   2
 
-#define CONFIG_NET_MULTI
 
 #ifdef CONFIG_DBAU1550
 #define MEM_SIZE 192

diff --git a/include/configs/debris.h b/include/configs/debris.h
index 7ad36a1ce882e851d80c7f62f1a309d08a6c119f..60c70ebb2e74077e0a23c07fde9543abc100d821 100644 (file)
--- a/include/configs/debris.h
+++ b/include/configs/debris.h
@@ -174,7 +174,6 @@
 #define CONFIG_PCI                             /* include pci support          */
 #define CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI               /* Multi ethernet cards support */
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8       /* use 8 rx buffer on eepro100  */
 #define CONFIG_EEPRO100_SROM_WRITE

diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index fbcbdb3afffe991ad72a4da68f17e0826c3757d6..ba0d23e312bee313db1330a8a924cd7c36c70393 100644 (file)
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -73,7 +73,6 @@
 #define CONFIG_OMAP3_MICRON_DDR                1
 
 /* DM9000 */
-#define CONFIG_NET_MULTI               1
 #define CONFIG_NET_RETRY_COUNT         20
 #define        CONFIG_DRIVER_DM9000            1
 #define        CONFIG_DM9000_BASE              0x2c000000

diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 0e05df3b5e68066acb894c3ef104a28928a94199..3a05c82995e13eaaefb3c59dd41d6446918564c5 100644 (file)
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -165,7 +165,6 @@
  * SMSC9220 Ethernet
  */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
 #define CONFIG_SMC911X_BASE     0x2C000000

diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h
index 6b328a54765a57fdea8d412a1979604286212309..4ab48c774058c0b7cb96b1c2582e06db1a6b1af5 100644 (file)
--- a/include/configs/dnp5370.h
+++ b/include/configs/dnp5370.h
@@ -49,7 +49,6 @@
 #ifndef __ADSPBF534__
 #define CONFIG_ROOTPATH        /romfs
 
-#define CONFIG_NET_MULTI        1
 #define CONFIG_BFIN_MAC         1
 #define CONFIG_PHY_ADDR         0
 #define CONFIG_RMII             1

diff --git a/include/configs/dvlhost.h b/include/configs/dvlhost.h
index bccd416fcc1001b9f99b5e7ec3cb586824ebfc93..86fecd15a685f11d5c95568b11ac2aa9dcc02f90 100644 (file)
--- a/include/configs/dvlhost.h
+++ b/include/configs/dvlhost.h
@@ -151,7 +151,6 @@
 /* include IXP4xx NPE support */
 #define CONFIG_IXP4XX_NPE              1
 
-#define CONFIG_NET_MULTI               1
 /* NPE0 PHY: MII dLAN200 AVmodule, 100BaseT-FDX fixed */
 #define        CONFIG_PHY_ADDR                 0x18
 /* NPE1 PHY: MII IP175 switch, port 5 is host port */

diff --git a/include/configs/eNET.h b/include/configs/eNET.h
index 548d52c6a00fa2141412c2d5c490c16ab1a8c0dc..70c74f63d4c2f498a5548698da06e2160183f175 100644 (file)
--- a/include/configs/eNET.h
+++ b/include/configs/eNET.h
@@ -233,7 +233,6 @@
 /*-----------------------------------------------------------------------
  * Network device (TRL8100B) support
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_RTL8139
 
 /*-----------------------------------------------------------------------

diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h
index 61f34ddc446221a34c8134aea8720515036a31be..afb1de6388d134dcfe8b0784dbc4d681a26b8943 100644 (file)
--- a/include/configs/eXalion.h
+++ b/include/configs/eXalion.h
@@ -185,7 +185,6 @@
 #define CONFIG_PCI             1       /* include pci support          */
 #undef CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI       1       /* Multi ethernet cards support */
 
 #define CONFIG_EEPRO100                1
 

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index 48ce9453f4f1b52b501e89380beb37bebfda5365..a2e317825f8dc2536b6c1b69965c62907be1d334 100644 (file)
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -93,7 +93,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 #endif
 
 #ifdef CONFIG_USE_SPIFLASH

diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h
index c4b1e654c7d8bb086fd223e9d0f0f37b8298d66b..4324172a8e22040e8cf8ae4d6b0d36084190b206 100644 (file)
--- a/include/configs/eb_cpux9k2.h
+++ b/include/configs/eb_cpux9k2.h
@@ -182,7 +182,6 @@
 /*
  * network
  */
-#define CONFIG_NET_MULTI               1
 
 #define CONFIG_NET_RETRY_COUNT         10
 #define CONFIG_RESET_PHY_R             1

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 371e781701b6faf0cbb6bcc5685850db8a7c93a0..f8affa80e6b6ed7f763659cb3bb73f01db85bfe0 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -145,7 +145,6 @@
 #define CONFIG_PHY_BASE_ADR    0x8
 #define CONFIG_RESET_PHY_R     /* use reset_phy() to init mv8831116 PHY */
 #define CONFIG_NETCONSOLE      /* include NetConsole support   */
-#define CONFIG_NET_MULTI       /* specify more that one ports available */
 #define        CONFIG_MII              /* expose smi ove miiphy interface */
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */
 #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */

diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h
index bb87d3623cd398bd6d6dbd41defe741998d683a8..2b40f59186bd900baf3b69baacafb8624f13f3d4 100644 (file)
--- a/include/configs/ep8248.h
+++ b/include/configs/ep8248.h
@@ -64,7 +64,6 @@
 #define CONFIG_ETHER_ON_FCC            /* Ethernet is on FCC     */
 #undef CONFIG_ETHER_NONE               /* No external Ethernet   */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SYS_CPMFCR_RAMTYPE      0
 #define CONFIG_SYS_FCC_PSMR            (FCC_PSMR_FDE | FCC_PSMR_LPB)
 

diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index 692f0ec77a69b71cbcf6b4d5251e0f16275f23a9..04c07086c83d35c92b5f70ca2d3d5fa55f53dc53 100644 (file)
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -67,7 +67,6 @@
 #define CONFIG_ETHER_ON_FCC            /* Ethernet is on FCC     */
 #undef CONFIG_ETHER_NONE               /* No external Ethernet   */
 
-#define CONFIG_NET_MULTI
 
 #define CONFIG_ETHER_ON_FCC2
 #define CONFIG_ETHER_ON_FCC3

diff --git a/include/configs/espt.h b/include/configs/espt.h
index 74daeb0a9626601bca1bb55f6e690a83eacbe87d..38058c7aff1de295fefb03b3f84e0f03d7cece77 100644 (file)
--- a/include/configs/espt.h
+++ b/include/configs/espt.h
@@ -117,7 +117,6 @@
 #define CONFIG_SYS_HZ       1000
 
 /* Ether */
-#define CONFIG_NET_MULTI 1
 #define CONFIG_SH_ETHER 1
 #define CONFIG_SH_ETHER_USE_PORT (1)
 #define CONFIG_SH_ETHER_PHY_ADDR (0x00)

diff --git a/include/configs/favr-32-ezkit.h b/include/configs/favr-32-ezkit.h
index 4c30b39bdf0020ff8b91ed868719a0e88fd1df25..757636decba2a4d598ff2b27afa968c90c4e532e 100644 (file)
--- a/include/configs/favr-32-ezkit.h
+++ b/include/configs/favr-32-ezkit.h
@@ -119,7 +119,6 @@
  * "ethaddr" and "eth1addr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP options

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 5f72163473f074f3f7b8ec5e89ef493dbcf822f8..a9f3b3b3054bf9ea6be616668697386ba5ec7b61 100644 (file)
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -69,7 +69,6 @@
 /* Network configuration */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_CMD_PING
-#define CONFIG_NET_MULTI
 #define CONFIG_ARMADA100_FEC
 
 /* DHCP Support */

diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h
index dc62ea30c26c40e0c1a3f68903fa3bbbaf52d4ea..a127a2ba39758f123c56ccf5cacee6404d1312b7 100644 (file)
--- a/include/configs/gr_cpci_ax2000.h
+++ b/include/configs/gr_cpci_ax2000.h
@@ -291,7 +291,6 @@
 /*
  * Ethernet configuration uses on board SMC91C111
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111          1
 #define CONFIG_SMC91111_BASE           0x20000300      /* chip select 3         */
 #define CONFIG_SMC_USE_32_BIT          1       /* 32 bit bus  */

diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h
index 5efe676bce2441bd3af8ac7052ff4cb5f4720a5b..643efc4f18bd7764e2e7b79f7731b5130f6d8424 100644 (file)
--- a/include/configs/gr_ep2s60.h
+++ b/include/configs/gr_ep2s60.h
@@ -266,7 +266,6 @@
 #ifndef USE_GRETH
 
 /* USE SMC91C111 MAC */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111          1
 #define CONFIG_SMC91111_BASE           0x20000300      /* chip select 3         */
 #define CONFIG_SMC_USE_32_BIT          1       /* 32 bit bus  */
@@ -277,7 +276,6 @@
 #else
 
 /* USE GRETH Ethernet Driver */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_GRETH   1
 
 /* Default GRETH Ethernet HARDWARE address */

diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h
index 505db10a0f7ba7eb2b2599a59a4e401c1c779922..e13299e0130fe8d456ee5649fd8cd59237e9eecb 100644 (file)
--- a/include/configs/gr_xc3s_1500.h
+++ b/include/configs/gr_xc3s_1500.h
@@ -237,7 +237,6 @@
  * Ethernet configuration
  */
 #define CONFIG_GRETH   1
-#define CONFIG_NET_MULTI       1
 
 /* Default GRETH Ethernet HARDWARE address */
 #define GRETH_HWADDR_0 0x00

diff --git a/include/configs/grasshopper.h b/include/configs/grasshopper.h
index 9779449bc6ac15b3cbc2b41717d9b519c1362109..e27216ac15821874ca9a28b25ecc24e7cf65def0 100644 (file)
--- a/include/configs/grasshopper.h
+++ b/include/configs/grasshopper.h
@@ -112,7 +112,6 @@
  * "ethaddr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP options

diff --git a/include/configs/grsim.h b/include/configs/grsim.h
index bbd2f91abd312f24bfc110b51342cf29dd0e3c38..f868d965cfa40f5aa1e05dd86d6b28de02e43b79 100644 (file)
--- a/include/configs/grsim.h
+++ b/include/configs/grsim.h
@@ -262,7 +262,6 @@
  * Ethernet configuration
  */
 #define CONFIG_GRETH   1
-#define CONFIG_NET_MULTI       1
 
 /* Default HARDWARE address */
 #define GRETH_HWADDR_0 0x00

diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h
index 294d6c4f870dcaf0907b976176b9e58aace48dab..ed1008f9fcf12f92d76c26b49032c5bba6b67fb9 100644 (file)
--- a/include/configs/grsim_leon2.h
+++ b/include/configs/grsim_leon2.h
@@ -260,7 +260,6 @@
  * Ethernet configuration
  */
 /*#define CONFIG_GRETH 1*/
-/*#define CONFIG_NET_MULTI     1*/
 
 /* Default HARDWARE address */
 #define GRETH_HWADDR_0 0x00

diff --git a/include/configs/gth2.h b/include/configs/gth2.h
index b5f454cd8a99627aa448cfb9141f5e1245e1601f..76e911a9820d941a21e825ea134061879aa99727 100644 (file)
--- a/include/configs/gth2.h
+++ b/include/configs/gth2.h
@@ -163,7 +163,6 @@
 
 #define CONFIG_NR_DRAM_BANKS   2
 
-#define CONFIG_NET_MULTI
 
 #define CONFIG_MEMSIZE_IN_BYTES
 

diff --git a/include/configs/hammerhead.h b/include/configs/hammerhead.h
index bfdfc0a8c5029dabe2e727b0c48ce1746529449a..94e680c42c7993c40c87d57371f0b85c4da3fefe 100644 (file)
--- a/include/configs/hammerhead.h
+++ b/include/configs/hammerhead.h
@@ -97,7 +97,6 @@
  * "ethaddr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP/DHCP options

diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 23a88d0b6c0f35962f6e3d24f9cbd20028c3b3cc..5f88d96679b5c944d31e4de0888470da426a6fc3 100644 (file)
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -93,7 +93,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
 
 /*
  * Nand Flash

diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 055f8a0f4ec8d588d5e934c73c1c9504ea562f65..294af735d6ec34aa5e631954d71eb96e17b61293 100644 (file)
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -61,7 +61,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI
 #define CONFIG_DRIVER_AX88180  1
 #define AX88180_BASE           0x2c000000
 #define CONFIG_HOSTNAME                ibf-dsp561

diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index fc046d60556869960a48d43a5c96f0580cc5e7fc..4bc36b99f2375f51307697ab53b903cf75280333 100644 (file)
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -155,7 +155,6 @@
  */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#      define CONFIG_NET_MULTI         1
 #      define CONFIG_MII               1
 #      define CONFIG_MII_INIT          1
 #      define CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/igep0020.h b/include/configs/igep0020.h
index b6534e474e4cdeac68f89306ce5e478c73e588cc..279a9d2cc643e7608223e9053542f1e37bb0a4ed 100644 (file)
--- a/include/configs/igep0020.h
+++ b/include/configs/igep0020.h
@@ -264,7 +264,6 @@
  * SMSC911x Ethernet
  */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
 #define CONFIG_SMC911X_BASE    0x2C000000

diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h
index 8d93277c22044694626b74cb1c38563ac13c9c08..6953a800d5b083f5c7bde8807fc42bb8430d6ebd 100644 (file)
--- a/include/configs/imx27lite-common.h
+++ b/include/configs/imx27lite-common.h
@@ -137,7 +137,6 @@
 #define CONFIG_FEC_MXC
 #define CONFIG_FEC_MXC_PHYADDR         0x1f
 #define CONFIG_MII
-#define CONFIG_NET_MULTI
 
 /*
  * MTD

diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 5e976bc165699f8b5ace1803705706f96a629ef3..31f05134f8319676414d386a4c5db322bfdccc67 100644 (file)
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -112,7 +112,6 @@
        "prg_uboot=tftpboot 0x80000000 u-boot-imx31_litekit.bin; protect off all; erase 0xa00d0000 0xa01effff; cp.b 0x80000000 0xa00d0000 $(filesize)\0"
 
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X         1
 #define CONFIG_SMC911X_BASE    (CS4_BASE + 0x00020000)
 #define CONFIG_SMC911X_32_BIT  1

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index a0c0f1b4a1cc30ff3dc0154f0a0f688218b76ce9..61f05345b067cbe0f7ee3d9a629ee3a01c3c684b 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -107,7 +107,6 @@
        "prg_jffs2=tftpboot 0x80000000 $(jffs2); erase 0xa01c0000 0xa1ffffff; cp.b 0x80000000 0xa01c0000 $(filesize)\0"
 
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X         1
 #define CONFIG_SMC911X_BASE    0xa8000000
 #define CONFIG_SMC911X_32_BIT  1

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 0e5ad2b4d3a7865fd07a0154f309593531028d66..70c9bb4422d3e51d6e9bd7957da9c8220fd8a066 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -166,7 +166,6 @@
 #define CONFIG_NR_DRAM_BANKS   1
 
 #define CONFIG_INCA_IP_SWITCH
-#define CONFIG_NET_MULTI
 #define CONFIG_INCA_IP_SWITCH_AMDIX
 
 /*

diff --git a/include/configs/innokom.h b/include/configs/innokom.h
index 2e4b3463748dd314c355b9b157c9fbb8d8f9da32..a0a3da1e82c0d00762e58ec9762e1632b7ea4e5d 100644 (file)
--- a/include/configs/innokom.h
+++ b/include/configs/innokom.h
@@ -160,7 +160,6 @@
 /*
  * SMSC91C111 Network Card
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111                1
 #define CONFIG_SMC91111_BASE           0x14000000 /* chip select 5         */
 #undef  CONFIG_SMC_USE_32_BIT                     /* 16 bit bus access     */

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 3b983afb690e42e639b4876211b7aec746e029b9..61b87618b3e6195d479d9b95d3f93c23141351b4 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -68,8 +68,6 @@
 #define CONFIG_SYS_SERIAL0             0x16000000
 #define CONFIG_SYS_SERIAL1             0x17000000
 
-/*#define CONFIG_NET_MULTI */
-
 
 /*
  * BOOTP options

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index e9b68c6918aa742816c17a1ae500231d892328e1..7ae34b71b49754da01e9b5e537632086933e21e5 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -54,7 +54,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC_USE_32_BIT
 #define CONFIG_SMC91111_BASE    0xC8000000

diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index c024d78c18ac8a2bc972019a5e8f364be6774da2..d36ae43664e813cc006ef22081bfa61a5a019bb2 100644 (file)
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -69,7 +69,6 @@
  * Network Settings
  */
 #define ADI_CMDS_NETWORK       1
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HOSTNAME                IP04
 
 #define CONFIG_DRIVER_DM9000   1

diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h
index ba08d92e354653662febc511de1cf3a9daaa2ce0..cfa4d8c91e27b219c6e711723c055bce44e5de2d 100644 (file)
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@@ -98,7 +98,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h
index 03757320094910a9310b230ea2c111fd5f0f4cf1..20e1087daee1652cf690baa3111ba2800543d3c1 100644 (file)
--- a/include/configs/jadecpu.h
+++ b/include/configs/jadecpu.h
@@ -80,7 +80,6 @@
 /*
  * Ethernet
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_BASE    0x02000000
 #define CONFIG_SMC911X_16_BIT

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index 8d27c0b2d10dcbc7ca72a5c896772a1691c4288e..f5adccb5183047bd68e39b0e12e7d013f18f3c4c 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -79,7 +79,6 @@
 
 #define CONFIG_SYS_XLB_PIPELINING      1
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 

diff --git a/include/configs/km/km82xx-common.h b/include/configs/km/km82xx-common.h
index 0360cd31cea9a1913462fe1c9c49f63a5712d3e0..02a82a69bc2ab9d80b489ffb81db99c2d8c84312 100644 (file)
--- a/include/configs/km/km82xx-common.h
+++ b/include/configs/km/km82xx-common.h
@@ -52,7 +52,6 @@
 #define        CONFIG_ETHER_ON_SCC             /* Ethernet is on SCC */
 #undef CONFIG_ETHER_ON_FCC             /* Ethernet is not on FCC     */
 #undef CONFIG_ETHER_NONE               /* No external Ethernet   */
-#define CONFIG_NET_MULTI
 
 #define CONFIG_ETHER_INDEX     4
 #define CONFIG_HAS_ETH0

diff --git a/include/configs/km/km83xx-common.h b/include/configs/km/km83xx-common.h
index 4a357d685015c496fdf2c14674b1b89433c90d0a..2014e3770a169c9a6b69caa8c3b56a9d22286a99 100644 (file)
--- a/include/configs/km/km83xx-common.h
+++ b/include/configs/km/km83xx-common.h
@@ -150,9 +150,6 @@
 #define CONFIG_OF_BOARD_SETUP
 #define CONFIG_OF_STDOUT_VIA_ALIAS
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI
-#endif
 /*
  * QE UEC ethernet configuration
  */

diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 8476eb77bb92bb5bdb65f176bf350429a145a505..c117943f286484da2d655caefccb393762ce9def 100644 (file)
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -153,7 +153,6 @@
  * Ethernet Driver configuration
  */
 #define CONFIG_NETCONSOLE      /* include NetConsole support   */
-#define CONFIG_NET_MULTI       /* specify more that one ports available */
 #define CONFIG_MII             /* expose smi ove miiphy interface */
 #define CONFIG_MVGBE           /* Enable Marvell Gbe Controller Driver */
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN        /* detect link using phy */

diff --git a/include/configs/korat.h b/include/configs/korat.h
index 66cb53337d6d8b01401ccc53b5cc2f1ed50a7f63..46335b4b7f7977d8f62e417d95ebe1f3f0def4f5 100644 (file)
--- a/include/configs/korat.h
+++ b/include/configs/korat.h
@@ -250,7 +250,6 @@
 #define CONFIG_HAS_ETH0
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* Number of ethernet rx        */
                                        /*   buffers & descriptors      */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1       /* add support for "eth1addr"   */
 #define CONFIG_PHY1_ADDR       3
 

diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h
index 95fc2437dd5b7bec976d1f1ee1113b05c21e1eb0..203a4b219b447ff8d9106cefeb68d1817287bab1 100644 (file)
--- a/include/configs/kvme080.h
+++ b/include/configs/kvme080.h
@@ -173,7 +173,6 @@
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI
 #define CONFIG_EEPRO100
 #define CONFIG_EEPRO100_SROM_WRITE
 

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index b00647b3e01eef168660e215b4e77d703d3aa6e8..cdf68273f9161e567ee8988dd492bc29260b4b4f 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -211,7 +211,6 @@
 /*-----------------------------------------------------------------------
  * Ethernet stuff
  */
-#define CONFIG_NET_MULTI
 
 #if defined(CONFIG_LAN) || defined(CONFIG_HLAN)
 #define CONFIG_TULIP

diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h
index b6ee9190a3def186a502caf37bf66c6d3c2a3edc..bbdae3c5517c49e8ae155f3a918af170d0379d6e 100644 (file)
--- a/include/configs/lubbock.h
+++ b/include/configs/lubbock.h
@@ -57,7 +57,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x0C000000
 

diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h
index a1ead70ee00a73c3942b2948cc6fb356593a93d5..a6f2864c6593733f57a8738b10aa534287ab5f0d 100644 (file)
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -379,7 +379,6 @@
 #define CONFIG_HAS_ETH0
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* Number of ethernet rx buffers & descriptors */
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_HAS_ETH1                1       /* add support for "eth1addr"   */
 #define CONFIG_PHY1_ADDR       1
 

diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h
index b9cf1dc7975a2b260f1d2e84a0db2be4d5678048..19ef2544a0cb2f7694e4d5de2c358fcc9894d549 100644 (file)
--- a/include/configs/mecp5123.h
+++ b/include/configs/mecp5123.h
@@ -268,7 +268,6 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC512x_FEC     1
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR                0x1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_FEC_AN_TIMEOUT  1

diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h
index 9961f122b1128323b912783850044c85c6da36bb..22e95b3bde50136c89a059812411b9c07803fb2d 100644 (file)
--- a/include/configs/mecp5200.h
+++ b/include/configs/mecp5200.h
@@ -66,7 +66,6 @@
 
 #define CONFIG_MII
 #if 0 /* test-only !!! */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/meesc.h b/include/configs/meesc.h
index e100cb41cec8753849423eac893b02a04afdbb78..a2b55d5fb2c2cc534fed168dcd314f05338644c0 100644 (file)
--- a/include/configs/meesc.h
+++ b/include/configs/meesc.h
@@ -162,7 +162,6 @@
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_FIT
 #define CONFIG_NET_RETRY_COUNT                 20
 #undef CONFIG_RESET_PHY_R

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index a811b76d7b011803430336565afaa658fcb32857..09ff7c4fb936cae7beffb3a8d89c872082f1c4c9 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -243,12 +243,10 @@
 
 #ifndef CONFIG_SYS_ENET
 # undef CONFIG_CMD_NET
-# undef CONFIG_NET_MULTI
 # undef CONFIG_CMD_NFS
 #else
 # define CONFIG_CMD_PING
 # define CONFIG_CMD_DHCP
-# define CONFIG_NET_MULTI
 #endif
 
 #if defined(CONFIG_SYSTEMACE)

diff --git a/include/configs/mimc200.h b/include/configs/mimc200.h
index 6c5276920dec4762dcabd2c3dfc799fe39f8f541..d8d82561f02912d60adb9817a33bca9354153d64 100644 (file)
--- a/include/configs/mimc200.h
+++ b/include/configs/mimc200.h
@@ -103,7 +103,6 @@
  * "ethaddr" and "eth1addr". This is normally done during production.
  */
 #define CONFIG_OVERWRITE_ETHADDR_ONCE
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP/DHCP options

diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h
index e7ef29809a90114fbe45d58f2ef7cbf9e65ad6d3..4288894726cc3921435dfa85a2597973ce324a42 100644 (file)
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -362,7 +362,6 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC512x_FEC     1
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR                0x1
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_FEC_AN_TIMEOUT  1

diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h
index 927446438ceb45742c5bc3e4f89cb804577a9937..700dcdaae6e873dc441f7d63043dea8c340ea8d9 100644 (file)
--- a/include/configs/mpc7448hpc2.h
+++ b/include/configs/mpc7448hpc2.h
@@ -128,7 +128,6 @@
 #define CONFIG_TSI108_ETH
 #define CONFIG_TSI108_ETH_NUM_PORTS    2
 
-#define CONFIG_NET_MULTI
 
 #define CONFIG_BOOTFILE                zImage.initrd.elf
 #define CONFIG_LOADADDR                0x400000

diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h
index d7a3a9690fe7581ce305e23d3d9402894cbff897..9e61fc17b468223e08ac65092f278a8f477645b2 100644 (file)
--- a/include/configs/mpc8308_p1m.h
+++ b/include/configs/mpc8308_p1m.h
@@ -360,7 +360,6 @@
 /*
  * TSEC
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_TSEC_ENET       /* TSEC ethernet support */
 #define CONFIG_SYS_TSEC1_OFFSET        0x24000
 #define CONFIG_SYS_TSEC1       (CONFIG_SYS_IMMR+CONFIG_SYS_TSEC1_OFFSET)

diff --git a/include/configs/mpq101.h b/include/configs/mpq101.h
index f0ed4d10833e1ae908fbdba92514449153baba20..a6dc14675943147bc10ee7501b6b08c9335617a6 100644 (file)
--- a/include/configs/mpq101.h
+++ b/include/configs/mpq101.h
@@ -261,10 +261,6 @@
  */
 #ifdef CONFIG_TSEC_ENET
 
-# ifndef CONFIG_NET_MULTI
-#  define CONFIG_NET_MULTI
-# endif
-
 # define CONFIG_MII                /* MII PHY management */
 # define CONFIG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */
 

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index c8d04f7cfdc93bfcc6532938987377919e7e894c..7cf641fd13b91c7d909d831d0f1efa57895fbb90 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -48,7 +48,6 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9111 */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE    (0xB8000000)
 

diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h
index 7b68ec5b60252a7ca4b90aa6132601a6cac82935..0643312baf665fd1883c488135fb07446ea90841 100644 (file)
--- a/include/configs/mx1ads.h
+++ b/include/configs/mx1ads.h
@@ -63,7 +63,6 @@
 /*
  *  CS8900 Ethernet drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_CS8900          /* we have a CS8900 on-board */
 #define CONFIG_CS8900_BASE     0x15000300
 #define CONFIG_CS8900_BUS16    /* the Linux driver does accesses as shorts */

diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 0afae24b29b4cb3be0767875b6de296ac1ecd85c..8414376edd9b22d16b5da189394a06faece6eb4c 100644 (file)
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -89,7 +89,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         0x1f
 #define CONFIG_MII
 #define CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
 #define CONFIG_ENV_OVERWRITE
 
 #define CONFIG_BOOTDELAY       3

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 0bea8589b6cdbde30a8e8f933621f5beb0ca19a1..457a24a5a31ba74086763689f252b074b251dec5 100644 (file)
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -115,7 +115,6 @@
                "cp.b ${loadaddr} ${uboot_addr} ${filesize}; "          \
                "setenv filesize; saveenv\0"
 
-#define CONFIG_NET_MULTI
 #define CONFIG_CS8900
 #define CONFIG_CS8900_BASE     0xb4020300
 #define CONFIG_CS8900_BUS16            1       /* follow the Linux driver */

diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index cd156d8b617947c31f17d32009a41a81024da173..8c5730ac219a063e9b80b8e79d25798bc9767eb8 100644 (file)
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -117,7 +117,6 @@
                "nand erase 0x0 0x40000; "                              \
                "nand write 0x81000000 0x0 0x40000\0"
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_BASE    0xB6000000
 #define CONFIG_SMC911X_32_BIT

diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 4e9022d814e55aa0c6a91d5b3b104c091e5d232d..670e76dacc1ab9f56adc5e84356c4c2e72776c62 100644 (file)
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -123,7 +123,6 @@
 #define CONFIG_SMC911X_BASE CS5_BASE_ADDR
 
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_ETHPRIME
 
 /*

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index d62a4f2965598e0a8c6fc83d03893ac7ace1b40b..0c108703c0a467ce43b11e5b3883073753270aa1 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -94,7 +94,6 @@
  * Eth Configs
  */
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 

diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h
index 26fc219ca2c42d93e643a3acdff3688976cd540c..3e9903172c9c1bfd0771190d9d86ec8ac56befa2 100644 (file)
--- a/include/configs/mx53ard.h
+++ b/include/configs/mx53ard.h
@@ -68,7 +68,6 @@
 
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_MII_GASKET
 #define CONFIG_DISCOVER_PHY

diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index b127b06cc38e4124125eeab5bf3a40fd1c0d5075..2033492961290bff7adb9465f7489c2bf10bb0a6 100644 (file)
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -76,7 +76,6 @@
 
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 4091703732ed63da5d29be7ddd312196ffb6e856..c3e4e1396a0d718f4aabba65c1e83d2c9e2927c6 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -61,7 +61,6 @@
 
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 

diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h
index 261f0bc45c4c486dbffe03c0694864d98c2c370e..c117a337a345c944130f074b5121b9a5791ed790 100644 (file)
--- a/include/configs/mx53smd.h
+++ b/include/configs/mx53smd.h
@@ -68,7 +68,6 @@
 
 /* Eth Configs */
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 

diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 758f19dc49d045cb90b6e75449275c14ec08aa9d..13d1e6637ba49223b6c01c018bb7cf3260d16912 100644 (file)
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -135,7 +135,6 @@
 #define __io(a)                        ((void __iomem *)(PCI_IO_VADDR + (a)))
 #define __mem_isa(a)           ((a) + PCI_MEMORY_VADDR)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111        /* Using SMC91c111*/
 #define CONFIG_SMC91111_BASE   0x34000300
 #undef  CONFIG_SMC91111_EXT_PHY        /* Internal PHY */

diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index d57d53cca564b89598638127b9b170fa1072a1f4..1395939ce04d9cdffd5c707ad4ff60b44bad994c 100644 (file)
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -92,7 +92,6 @@
 #undef CONFIG_CMD_XIMG
 
 #ifdef CONFIG_CMD_NET
-# define CONFIG_NET_MULTI
 # define CONFIG_CMD_DHCP
 # define CONFIG_CMD_PING
 #endif

diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h
index 9f5a0b89b7c200714005bf5029767a6a44f2c06a..22eb0047f59ae33c0016fd910546d52aafa5c07f 100644 (file)
--- a/include/configs/o2dnt.h
+++ b/include/configs/o2dnt.h
@@ -65,7 +65,6 @@
 
 #define CONFIG_SYS_XLB_PIPELINING      1
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/omap1510inn.h b/include/configs/omap1510inn.h
index 62c1721a2f292574779fd0456ebd524b6a922b78..43de18b25c0b28b190f1b0c84d89a33d21d64155 100644 (file)
--- a/include/configs/omap1510inn.h
+++ b/include/configs/omap1510inn.h
@@ -59,7 +59,6 @@
 #define CONFIG_SMC9196_BASE 0x08000300
 #define CONFIG_SMC9196_EXT_PHY
 */
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x08000300
 #define CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/omap1610h2.h b/include/configs/omap1610h2.h
index 9fa33172f79f3958bc084903f77a2dbeebe1fa1a..d57e1a79bc057b9d4a7f9b8f4d7bac33632fc0e3 100644 (file)
--- a/include/configs/omap1610h2.h
+++ b/include/configs/omap1610h2.h
@@ -57,7 +57,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/omap1610inn.h b/include/configs/omap1610inn.h
index e3f3487ce21ee14bce383ceabe45049a4fbf6d1a..7901b6c94e9242072b02eee2bd301276024b0ce5 100644 (file)
--- a/include/configs/omap1610inn.h
+++ b/include/configs/omap1610inn.h
@@ -58,7 +58,6 @@
  */
 /*
 */
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04000300
 #define CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/omap2420h4.h b/include/configs/omap2420h4.h
index 01f402bf3a323d955092e746b009370ba5e6b059..46d1643c60442a3c84807fea799797a8aa9a4fd4 100644 (file)
--- a/include/configs/omap2420h4.h
+++ b/include/configs/omap2420h4.h
@@ -82,7 +82,6 @@
 /*
  * SMC91c96 Etherent
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE     (H4_CS1_BASE+0x300)
 #define CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 1369c89e4aa1725b73dce2207a3a99afef66883c..a0264786a192bfdb19bba555ee52c17f150ddf10 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -138,7 +138,6 @@
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_USB_ETHER_ASIX
 
-#define CONFIG_NET_MULTI
 
 /* commands to include */
 #include <config_cmd_default.h>

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 7af30c206d9ad3d1977247275d090b7071d8ae83..4c95a78d32053a674dcee876f6e920dd83897a90 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -345,7 +345,6 @@
  */
 #if defined(CONFIG_CMD_NET)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
 #define CONFIG_SMC911X_BASE    0x2C000000

diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 3f3726350e1ec48d8fdb4ecdd0f1d9e6a73acb4c..2f3743cccee5ab5baa3659c6d895005613211b31 100644 (file)
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -291,7 +291,6 @@
  *----------------------------------------------------------------------------
  */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X         1
 #define CONFIG_SMC911X_32_BIT
 #define CONFIG_SMC911X_BASE     0x2C000000

diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index 6a826ba69b671b95595b9bf325aae11a544f7d03..35472bb044916721f7bf53b7b3e334ca10624e36 100644 (file)
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -201,7 +201,6 @@
  */
 #if defined(CONFIG_CMD_NET)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE   DEBUG_BASE
 #define CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
index db25b863783d182541b29ce5420df00c13731c3c..a8dfef321d36ca5668bdb27d7daf4f1773bf6a39 100644 (file)
--- a/include/configs/omap5912osk.h
+++ b/include/configs/omap5912osk.h
@@ -60,7 +60,6 @@
  */
 /*
 */
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE 0x04800300
 #define CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/omap730p2.h b/include/configs/omap730p2.h
index bf8e000cb4bed5a88d2aa2e9edcbebe9f91035ef..26e7e1f1e0efd4a6a455066d210c359d0c68bc56 100644 (file)
--- a/include/configs/omap730p2.h
+++ b/include/configs/omap730p2.h
@@ -64,7 +64,6 @@
  * Hardware drivers
  */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_LAN91C96
 #define CONFIG_LAN91C96_BASE      0x04000300
 #define CONFIG_LAN91C96_EXT_PHY

diff --git a/include/configs/otc570.h b/include/configs/otc570.h
index 9ecb2b0f3525bacd9a82e288795f92e4b92cd702..e2c2eda37e8db8c80a642b8db9a1d82a1f0f87d9 100644 (file)
--- a/include/configs/otc570.h
+++ b/include/configs/otc570.h
@@ -214,7 +214,6 @@
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_FIT
 #define CONFIG_NET_RETRY_COUNT                 20
 #undef CONFIG_RESET_PHY_R

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 71eb78495f2613d074601a3cfc03d7e0a81f1f1d..94a69927edbd377c6f6ca1995690f6a5aec4c767 100644 (file)
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -117,7 +117,6 @@
  *----------------------------------------------------------------------*/
 /* Change the default ethernet port, use this define (options: 0, 1, 2) */
 #define CONFIG_SYS_ETH_PORT            ETH_0
-#define CONFIG_NET_MULTI
 #define MV_ETH_DEVS            2
 #define CONFIG_PHY_RESET        1      /* reset phy upon startup         */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */

diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h
index 719a12aaa0cbe4376a334a71a8ecd8a1e8d1e6e3..d7b1ca203a693445970217ee41656e557f3e220e 100644 (file)
--- a/include/configs/p3p440.h
+++ b/include/configs/p3p440.h
@@ -171,7 +171,6 @@
 #define CONFIG_PHY_ADDR                0x1c    /* PHY address                  */
 #define CONFIG_HAS_ETH1
 #define CONFIG_PHY1_ADDR       0x1d    /* EMAC1 PHY address            */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* Number of ethernet rx buffers & descriptors */
 
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index d5cf89abbccee0d91c773f58997ad1b59dc716bc..eea8ed3adb09199cdb94b3cac081653cf87ab32d 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -126,7 +126,6 @@
 
 #define CONFIG_NR_DRAM_BANKS   2
 
-#define CONFIG_NET_MULTI
 
 #define CONFIG_MEMSIZE_IN_BYTES
 

diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h
index deb5b332f1fea53f99d5dfea5dee20ea8ff48452..26627bbf6024f49bc2e012b8c1f13d93ce703128 100644 (file)
--- a/include/configs/pcs440ep.h
+++ b/include/configs/pcs440ep.h
@@ -225,7 +225,6 @@
 
 #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"   */
 #define CONFIG_PHY_ADDR                1       /* PHY address, See schematics  */
 #define CONFIG_PHY1_ADDR        2

diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h
index 831af6a7d251123eefcaa76215b0482270fed38b..f0154e091e5883d8ed462f1622b03b70ffa49220 100644 (file)
--- a/include/configs/pdm360ng.h
+++ b/include/configs/pdm360ng.h
@@ -344,7 +344,6 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC512x_FEC     1
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_ADDR                0x1F
 #define CONFIG_MII             1       /* MII PHY management   */
 #define CONFIG_FEC_AN_TIMEOUT  1

diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h
index 7fe9e5b268190d7fe582c555f9bade1a112e3b1f..56bb4641fca84a9d846214508f77f68f80c94bb1 100644 (file)
--- a/include/configs/pdnb3.h
+++ b/include/configs/pdnb3.h
@@ -40,7 +40,6 @@
  * Ethernet
  */
 #define CONFIG_IXP4XX_NPE      1       /* include IXP4xx NPE support   */
-#define CONFIG_NET_MULTI       1
 #define        CONFIG_PHY_ADDR         16      /* NPE0 PHY address             */
 #define CONFIG_HAS_ETH1
 #define CONFIG_PHY1_ADDR       18      /* NPE1 PHY address             */

diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h
index 5830345921e7d0e5e9c62c55eb9300092a6613e8..4a985456d9b5feb60c48c5a48ca5277489224a40 100644 (file)
--- a/include/configs/pf5200.h
+++ b/include/configs/pf5200.h
@@ -82,7 +82,6 @@
 
 #define CONFIG_MII             1
 #if 0                          /* test-only !!! */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8       /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/pleb2.h b/include/configs/pleb2.h
index ad8221390c447cde48feb7e96ca430b8618d0207..7dd6246f112f2b3cbf36ab91ac54c5c631d70461 100644 (file)
--- a/include/configs/pleb2.h
+++ b/include/configs/pleb2.h
@@ -56,7 +56,6 @@
  */
 
 /* None - PLEB 2 doesn't have any of this.
-       #define CONFIG_NET_MULTI
        #define CONFIG_LAN91C96
        #define CONFIG_LAN91C96_BASE 0x0C000000
  */

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 3a8b095f0102cba191756480f8d4f70e8ffba6b0..89e17b83f09b5addba016db4dea4862d74d0a34b 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -256,7 +256,6 @@
 #define CONFIG_DM9000_USE_16BIT                        1
 #define CONFIG_NET_RETRY_COUNT                 20
 #define CONFIG_RESET_PHY_R                     1
-#define CONFIG_NET_MULTI
 
 /* USB */
 #define CONFIG_USB_ATMEL

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 1e282d2016c6c4254371e23207c6bfe870c92a75..57a0416899f70c2945d8bf0858c99120d4a59f22 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -281,7 +281,6 @@
 /* Ethernet */
 #define CONFIG_MACB                    1
 #define CONFIG_RMII                    1
-#define CONFIG_NET_MULTI               1
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R             1
 

diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h
index 672f66345a196320d1cf94a25f5a7624e05c2d4e..acc120445184bca895fae680609cabebf85c7c95 100644 (file)
--- a/include/configs/pm9g45.h
+++ b/include/configs/pm9g45.h
@@ -128,7 +128,6 @@
 /* Ethernet */
 #define CONFIG_MACB                    1
 #define CONFIG_RMII                    1
-#define CONFIG_NET_MULTI               1
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R             1
 

diff --git a/include/configs/ppmc7xx.h b/include/configs/ppmc7xx.h
index 652b85efd594c332f9034069346acb2e0f26fa59..d3c89908572422aef643c2309e0bd519901d9862 100644 (file)
--- a/include/configs/ppmc7xx.h
+++ b/include/configs/ppmc7xx.h
@@ -121,12 +121,10 @@
 /*
  * Network config
  *
- * CONFIG_NET_MULTI            - Support for multiple network interfaces
  * CONFIG_EEPRO100             - Intel 8255x Ethernet Controller
  * CONFIG_EEPRO100_SROM_WRITE  - Enable writing to network card ROM
  */
 
-#define        CONFIG_NET_MULTI
 #define        CONFIG_EEPRO100
 #define        CONFIG_EEPRO100_SROM_WRITE
 

diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h
index e591d87db72f4974d3de2c8cd1f90559d991615e..cd95081a99fe4700c833873bfff94cb8b24717c5 100644 (file)
--- a/include/configs/pxa255_idp.h
+++ b/include/configs/pxa255_idp.h
@@ -86,7 +86,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE   (PXA_CS5_PHYS + IDP_CS5_ETH_OFFSET + 0x300)
 #define CONFIG_SMC_USE_32_BIT  1

diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h
index fb697d5558bb02f5ee671e26bf109794f559b0c8..f5a137e01ddbed54dc2d675171f17ab42d7572bd 100644 (file)
--- a/include/configs/qemu-mips.h
+++ b/include/configs/qemu-mips.h
@@ -157,8 +157,6 @@
 
 #define CONFIG_ENV_OVERWRITE   1
 
-#undef CONFIG_NET_MULTI
-
 #define MEM_SIZE               128
 
 #undef CONFIG_MEMSIZE_IN_BYTES

diff --git a/include/configs/qong.h b/include/configs/qong.h
index 78b37017e8d0802c3c10dc37a21d15b686326562..e4bc1d0be286530fde2e58b133f728812ba29e29 100644 (file)
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -77,7 +77,6 @@
 /* Ethernet */
 #define CONFIG_DNET            1
 #define CONFIG_DNET_BASE       (CS1_BASE + QONG_FPGA_PERIPH_SIZE)
-#define CONFIG_NET_MULTI       1
 
 /* Framebuffer and LCD */
 #define CONFIG_LCD

diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
index 5fd7838d52a52862bf0a11c7c2d2d8247daa1b26..dc5ec3aa823dc3d3f957840b3b69e3e2edcedb24 100644 (file)
--- a/include/configs/quad100hd.h
+++ b/include/configs/quad100hd.h
@@ -48,7 +48,6 @@
 #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           */
 #define CONFIG_PHY_ADDR                0x01    /* PHY address                  */

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 657591695fa6850e591c601313eae4aee78f583f..a7a92f798cf3377dc77113333a76dce844e43242 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -122,7 +122,6 @@
 /*
  * Network device (RTL8139) support
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_RTL8139
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h
index 408a7e0b1d4e9e9cfe9897c0630c38e24df8c57e..b0655c32330098d4064774b8768c289da1725996 100644 (file)
--- a/include/configs/r7780mp.h
+++ b/include/configs/r7780mp.h
@@ -150,7 +150,6 @@
 
 #if defined(CONFIG_CMD_NET)
 /*
-#define CONFIG_NET_MULTI
 #define CONFIG_RTL8169
 */
 /* AX88796L Support(NE2000 base chip) */

diff --git a/include/configs/rsk7203.h b/include/configs/rsk7203.h
index 0802140ea1e87a53c0042dc060a174ba7a9a8ac6..59b45c84d7f45041414f80acdba3f4b393122853 100644 (file)
--- a/include/configs/rsk7203.h
+++ b/include/configs/rsk7203.h
@@ -105,7 +105,6 @@
 #define CONFIG_SYS_HZ                  (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
 
 /* Network interface */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_SMC911X_BASE (0x24000000)

diff --git a/include/configs/rsk7264.h b/include/configs/rsk7264.h
index 880199353a8a7b9efee5a9c7cbf07a4b7995b5b6..c1ffc348f71289f05ce2e6f7537ecaa0942c4419 100644 (file)
--- a/include/configs/rsk7264.h
+++ b/include/configs/rsk7264.h
@@ -70,7 +70,6 @@
 #define CONFIG_SYS_HZ          (CONFIG_SYS_CLK_FREQ / CMT_CLK_DIVIDER)
 
 /* Network interface */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_SMC911X_BASE    0x28000000

diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index 967a9914a1093f9f6dec121d042586fd06a8fa3a..1e355a8810038fafe35f16be6662317264ddb9f5 100644 (file)
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -128,7 +128,6 @@
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R
 #define CONFIG_MACB_SEARCH_PHY

diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 6f0d728f906e3d8df2527f05b57cf1bdcb775b31..cab666060a9db431668d873b88bc416438aa89cb 100644 (file)
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -64,7 +64,6 @@
 #define CONFIG_MII             1       /* MII PHY management           */
 #define CONFIG_PHY_ADDR                0       /* PHY address                  */
 #define CONFIG_PHY_RESET_DELAY 300     /* Intel LXT971A needs this     */
-#define CONFIG_NET_MULTI
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "bootargs=emac(0,0)host:/T221ppc/target/config/sbc405/vxWorks.st " \

diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h
index b418cf23baf60e8fc0daf3dfe434bad68e969dc6..fae95d7a5a49751ad7f259ca717ec8e912afd27c 100644 (file)
--- a/include/configs/sbc8349.h
+++ b/include/configs/sbc8349.h
@@ -332,7 +332,6 @@
 #undef PCI_ONE_PCI1
 #endif
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -355,9 +354,6 @@
 #define CONFIG_TSEC_ENET               /* TSEC ethernet support */
 
 #if defined(CONFIG_TSEC_ENET)
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
 
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "TSEC0"

diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 4ec323ecec02083e0c467eb0731a75589f0965fc..171058cf22cb00ffde0ff5c5b8b1e43417e17da1 100644 (file)
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -404,7 +404,6 @@
 
 #if defined(CONFIG_PCI)
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -417,10 +416,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "eTSEC0"

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index e0af0d26a81a8a3d309fa5657a1b1c76c633e68e..d2199257f80bebe41549b30e72ccd6de1536ae47 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -230,10 +230,6 @@
 
 #ifdef CONFIG_TSEC_ENET
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #ifndef CONFIG_MII
 #define CONFIG_MII             1       /* MII PHY management */
 #endif

diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 8d9f931b7f04206a737400615260c1d521f13cfa..61551ece4753dce4fb0fd388f43e1da84a65bd5b 100644 (file)
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -332,7 +332,6 @@
 
 #undef CONFIG_SYS_SCSI_SCAN_BUS_REVERSE
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -361,10 +360,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 /* #define CONFIG_MII          1 */    /* MII PHY management */
 
 #define CONFIG_TSEC1    1

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 852e80752bf16526884864e7c7b0414b93547fd6..2d6e51da41e791b4e6c77f7eefd2492cc10e9668 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -162,7 +162,6 @@
 #undef CONFIG_LOADS_ECHO   /* no echo on for serial download   */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   1       /* allow baudrate change        */
 
-#define CONFIG_NET_MULTI
 /* #define CONFIG_EEPRO100_SROM_WRITE */
 /* #define CONFIG_SHOW_MAC */
 #define CONFIG_EEPRO100

diff --git a/include/configs/scb9328.h b/include/configs/scb9328.h
index 1b5d93158edb2b1658683875765eabf367822ce0..180c5dad429f4291108af40425c0cc4856cf6491 100644 (file)
--- a/include/configs/scb9328.h
+++ b/include/configs/scb9328.h
@@ -243,7 +243,6 @@
 #define CONFIG_SYS_CS5U_VAL 0x00008400
 #define CONFIG_SYS_CS5L_VAL 0x00000D03
 
-#define CONFIG_NET_MULTI               1
 #define CONFIG_DRIVER_DM9000           1
 #define CONFIG_DM9000_BASE             0x16000000
 #define DM9000_IO                      CONFIG_DM9000_BASE

diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h
index 9799767c5e9c6d3fa0da77b5a108988b52e44052..4a5fd0d2921d7e16fa1ab74d01c95ece348dc81e 100644 (file)
--- a/include/configs/sh7757lcr.h
+++ b/include/configs/sh7757lcr.h
@@ -97,7 +97,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* Ether */
-#define CONFIG_NET_MULTI               1
 #define CONFIG_SH_ETHER                        1
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       1

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index 1221cd5e203412d794e8b70d1d1900e6f7bcdd73..b8eb13de455c3088f5ee6b22bf9b81ffa237e63d 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -117,7 +117,6 @@
 #define CONFIG_SYS_HZ          1000
 
 /* Ether */
-#define CONFIG_NET_MULTI 1
 #define CONFIG_SH_ETHER 1
 #define CONFIG_SH_ETHER_USE_PORT (1)
 #define CONFIG_SH_ETHER_PHY_ADDR (0x01)

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index 8eb9a1299d023de94307db23b98df898e984c5ac..1e71bcc3effb4b6c767d1f3bacc2ac8c040f09ad 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -175,7 +175,6 @@
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
 /* Network device (RTL8169) support */
-#define CONFIG_NET_MULTI
 #define CONFIG_RTL8169
 
 /* ENV setting */

diff --git a/include/configs/smdk2410.h b/include/configs/smdk2410.h
index a4a675bedd154e848d3409315e32da307bc21b55..77c0a08d4cc327aea9de9ed9cbfe21ea0328eec1 100644 (file)
--- a/include/configs/smdk2410.h
+++ b/include/configs/smdk2410.h
@@ -54,7 +54,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_CS8900          /* we have a CS8900 on-board */
 #define CONFIG_CS8900_BASE     0x19000300
 #define CONFIG_CS8900_BUS16    /* the Linux driver does accesses as shorts */

diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index d175ed6b36eda8b773958604c1cd5d2eb5dca384..4d0b7b2d4d282687a692646669c880e5194e72d5 100644 (file)
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -78,7 +78,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_CS8900                  /* we have a CS8900 on-board    */
 #define CONFIG_CS8900_BASE             0x18800300
 #define CONFIG_CS8900_BUS16            /* follow the Linux driver      */

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 19dde1be3962abf25803376f5abf8e968a126d88..6663629ce11451ef2a1e590159d9689faba94cee 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -238,7 +238,6 @@
  * Ethernet Contoller driver
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X         1       /* we have a SMC9115 on-board   */
 #define CONFIG_SMC911X_16_BIT  1       /* SMC911X_16_BIT Mode          */
 #define CONFIG_SMC911X_BASE    0x98800300      /* SMC911X Drive Base   */

diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 2f97beaec0a14277fb51fc9da70f18635b62b47f..59c9fdb1958d183817188aa864df76adb00a162e 100644 (file)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -159,7 +159,6 @@
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_BASE            0x5000000
 #define CONFIG_SMC911X_16_BIT

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 7def16fe6bb09edf078019e4a3bfe2b50ae4841a..cb3c674f496415ffe3d8d95ac54062d17305a3aa 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -75,7 +75,6 @@
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_RESET_PHY_R
 #define CONFIG_TFTP_PORT

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index af62aea7a685e6e7d6a025dedc1012b778305188..19b978a5b9a39898266652d0bbabb037e46d2327 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -284,7 +284,6 @@
 #endif /* CONFIG_PCI */
 
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_TSEC1   1
 #define CONFIG_TSEC1_NAME      "TSEC0"

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index f1cbe95715e3b239191fbd974c4f303367b9be55..fe40bf0e4cc395ce10e9b6ac1ded75eeee204a42 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -128,7 +128,6 @@
 
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_EEPRO100
 
 /*

diff --git a/include/configs/spieval.h b/include/configs/spieval.h
index d6195b186a384c01211f5d668ba5c0e8e23af00f..f27466cddc9cc4c6ca408d8527755c75fe6c829d 100644 (file)
--- a/include/configs/spieval.h
+++ b/include/configs/spieval.h
@@ -76,7 +76,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1

diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 66738d5953f328353eeb7479b45da552ed60dfa5..90d249b96485e0f8e80637d168d48fa3bd6f21de 100644 (file)
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -209,7 +209,6 @@
 
 #if defined(CONFIG_PCI)                        /* PCI Ethernet card */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #undef CONFIG_EEPRO100
@@ -228,10 +227,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management           */
 
 #define CONFIG_TSEC1   1

diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h
index a421ba43b2329a538aa945499ff542a3f3943c03..3d385b42538a2354cb9a80e01017d81d73e760c0 100644 (file)
--- a/include/configs/stxssa.h
+++ b/include/configs/stxssa.h
@@ -239,7 +239,6 @@
 
 #if defined(CONFIG_PCI)                        /* PCI Ethernet card */
 #define CONFIG_MPC85XX_PCI2    1
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 
 #define CONFIG_EEPRO100
@@ -258,10 +257,6 @@
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI       1
-#endif
-
 #define CONFIG_MII             1       /* MII PHY management           */
 
 #define CONFIG_TSEC1   1

diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h
index 890186e914832058f029f195b8d92c07c0a78269..e7f5a0d0f185557c6ace289728b4a75f6014f277 100644 (file)
--- a/include/configs/stxxtc.h
+++ b/include/configs/stxxtc.h
@@ -95,7 +95,6 @@
 
 #define        CONFIG_RTC_MPC8xx               /* use internal RTC of MPC8xx   */
 
-#define        CONFIG_NET_MULTI        1       /* the only way to get the FEC in */
 #define        FEC_ENET                1       /* eth.c needs it that way... */
 #undef CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_MII             1

diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index 011a683218b21487d0c0be3ade130f3d2003e2d6..fc2b57d11a4170d2d0733c1805133b76614d61e5 100644 (file)
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -184,7 +184,6 @@
  */
 #define CONFIG_PCI
 #define CONFIG_PCI_PNP
-#define CONFIG_NET_MULTI
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */
 

diff --git a/include/configs/tcm-bf518.h b/include/configs/tcm-bf518.h
index 52055e80dcbd03fb6b34800aedcf2228c54fbdc8..241f21051eab1b5c1b5de475ccd793c6b534905c 100644 (file)
--- a/include/configs/tcm-bf518.h
+++ b/include/configs/tcm-bf518.h
@@ -64,7 +64,6 @@
 #define ADI_CMDS_NETWORK       1
 #define CONFIG_BFIN_MAC
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf518
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index 2375fc576cdbfac30e56efb4886faedb759f7cd0..2adb071ddb99b824fb9e2bb49c75cb4f98de9147 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -69,7 +69,6 @@
 #define CONFIG_SMC911X_BASE    0x20308000
 #define CONFIG_SMC911X_16_BIT
 #define CONFIG_NETCONSOLE      1
-#define CONFIG_NET_MULTI       1
 #endif
 #define CONFIG_HOSTNAME                tcm-bf537
 /* Uncomment next line to use fixed MAC address */

diff --git a/include/configs/top9000.h b/include/configs/top9000.h
index 5bca6e1413af72526e98e13d54ca7230f0314ca0..2c66f33d895d1e9ecd3d9e90b837a5b9b9556ca3 100644 (file)
--- a/include/configs/top9000.h
+++ b/include/configs/top9000.h
@@ -103,7 +103,6 @@
 #define CONFIG_MACB
 #define CONFIG_SYS_PHY_ID      1
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT 20
 
 /* real time clock */

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index ec052c41d19626d109818224ff1e62943a666634..6ec9b8036e495aea530ad657a6cdca83322ba14d 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -291,7 +291,6 @@
 #define CONFIG_SYS_MCIO0_VAL           0x00008407
 #define CONFIG_SYS_MCIO1_VAL           0x0000c108
 
-#define CONFIG_NET_MULTI               1
 #define CONFIG_DRIVER_DM9000           1
 
 #if CONFIG_POLARIS

diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index 176d46861c0888fba03e05e9c1cffc7bc71bd399..6380bb8979ca2bfc022cce2242e2595135243046 100644 (file)
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -137,7 +137,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         0x1f
 #define CONFIG_MII
 #define CONFIG_CMD_NET
-#define CONFIG_NET_MULTI
 #define BOARD_LATE_INIT
 #define CONFIG_ENV_OVERWRITE
 

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index bb9f606a05f6f038f8cacd5a268d45b2c1a12e06..1e59ef37a2994ce903f133f511d008a1f84c847e 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -143,7 +143,6 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
 #define CONFIG_PCI                             /* include pci support          */
 #undef CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_NET_MULTI
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8               /* use 8 rx buffer on eepro100  */
 #define CONFIG_EEPRO100_SROM_WRITE

diff --git a/include/configs/vct.h b/include/configs/vct.h
index 325ac8c731f94bfb7130bf6bcda38ddac04c7381..9ddc7b1b67bcbf5c53783a11ffb0dcb9e72c6140 100644 (file)
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -93,7 +93,6 @@
 #define CONFIG_SMC911X_BASE    0x00000000
 #define CONFIG_SMC911X_32_BIT
 #define CONFIG_NET_RETRY_COUNT         20
-#define CONFIG_NET_MULTI
 #endif
 
 /*

diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h
index abb57fe94c560ef0e044e8d3e647ddaa5cad668a..9d37359c93fc3f3c9855c8fb629d48c9c82fc03e 100644 (file)
--- a/include/configs/ve8313.h
+++ b/include/configs/ve8313.h
@@ -302,7 +302,6 @@
  */
 #define CONFIG_TSEC_ENET               /* TSEC ethernet support */
 
-#define CONFIG_NET_MULTI
 
 #define CONFIG_TSEC1
 #ifdef CONFIG_TSEC1

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 3bfcdffb90b288409a825f7e84ef160b85ff818c..bb835e084d213e7a3963fda181b33332d86aa920 100644 (file)
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -77,7 +77,6 @@
  * Hardware drivers
  */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC_USE_32_BIT
 #define CONFIG_SMC91111_BASE   0x10010000

diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index d95c0ba444cc060ade2d4ae82d376ac33bc5a9e1..540dfa9f6b7b38d5ce3e5d0ef96e15cbc2d4a5da 100644 (file)
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -116,7 +116,6 @@
  * Eth Configs
  */
 #define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 #define CONFIG_DISCOVER_PHY
 

diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h
index d153762885f2aa0677022c6e1b9888df783c04e5..fe2bc1d9228e8d38cfbe9d26921805692abec099 100644 (file)
--- a/include/configs/vme8349.h
+++ b/include/configs/vme8349.h
@@ -266,7 +266,6 @@
 #endif
 
 #ifndef VME_CADDY2
-#define CONFIG_NET_MULTI
 #endif
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 
@@ -294,9 +293,6 @@
 #endif
 
 #if defined(CONFIG_TSEC_ENET)
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI
-#endif
 
 #define CONFIG_GMII                    /* MII PHY management */
 #define CONFIG_TSEC1
@@ -316,12 +312,6 @@
 
 #endif /* CONFIG_TSEC_ENET */
 
-#if defined(CONFIG_E1000)
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI
-#endif
-#endif
-
 /*
  * Environment
  */

diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index ea779716f2226a743349555ff359ee787d76cede..9db4d999b713fe206f5087aea92a158a2fa364b8 100644 (file)
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -90,7 +90,6 @@
 #define        CONFIG_CMD_PING
 #define        CONFIG_CMD_DHCP
 
-#define        CONFIG_NET_MULTI                1
 #define        CONFIG_DRIVER_DM9000            1
 #define        CONFIG_DM9000_BASE              0x08000300      /* CS2 */
 #define        DM9000_IO                       (CONFIG_DM9000_BASE)

diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 205e86c78b53d6441b6c3ee08548baef61d34887..8a414163059733f3f553ad16aabcbffc8186b8a1 100644 (file)
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -199,7 +199,6 @@
 /*
  * SMSC91C111 Network Card
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111                1
 #define CONFIG_SMC91111_BASE           0x10000300  /* chip select 3         */
 #define CONFIG_SMC_USE_32_BIT          1          /* 32 bit bus  */

diff --git a/include/configs/xm250.h b/include/configs/xm250.h
index 32544fed5801610ca26f88ef9c13d9f9ecc7de2b..a35bce3703e3b5a729626851100224847cbe65c5 100644 (file)
--- a/include/configs/xm250.h
+++ b/include/configs/xm250.h
@@ -50,7 +50,6 @@
 /*
  * Hardware drivers
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE           0x04000300
 #undef CONFIG_SMC91111_EXT_PHY

diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h
index cd7148df1537b1872ed7f0011799cef3ee92ab2b..d72921eebe6bae2e1cb7182ba1eeba987212ebf6 100644 (file)
--- a/include/configs/xpedite1000.h
+++ b/include/configs/xpedite1000.h
@@ -183,7 +183,6 @@ extern void out32(unsigned int, unsigned long);
  */
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_PHY_RESET       1       /* reset phy upon startup */
 #define CONFIG_SYS_RX_ETH_BUFFER 32    /* Number of ethernet rx buffers & descriptors */

diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index cb83a646711d6fd4ca7cb0bf6fb9c284c23993bf..20b43405b2f4addef7ced8e405f9ebb0be31e406 100644 (file)
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -361,7 +361,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_ETHPRIME                "eTSEC1"
 

diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index 42517c9da83147f70aa7b9ef8cdf0a6ce0a84acd..cb29c98c1e5c584a5fd5256cc2a0227afd1c92c8 100644 (file)
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -284,7 +284,6 @@
  */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_ETHPRIME                "eTSEC1"
 

diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index 202f209a7b6e2b30c5984ddc721d0dd3fc641ed1..34814797d9ed6d0ee7215fb87083174c9ee933c6 100644 (file)
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -363,7 +363,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_TSEC_TBI
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */

diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 0c2e7edb2388629180daa178ea47863b0e732f3a..87c894cccf728b3d00bd8b64fee11174e077c405 100644 (file)
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -333,7 +333,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  */
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_TSEC_TBI
 #define CONFIG_MII             1       /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index f9a6b9313f66eb72247de6b1bd282695b8c8d36f..63279b01ce2133e3df4bdf7c08bbefe7309b74b4 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -53,7 +53,6 @@
 #define CONFIG_PHY_ADDR                0x01    /* PHY address                  */
 #define CONFIG_HAS_ETH1                1
 #define CONFIG_PHY1_ADDR       0x11    /* EMAC1 PHY address            */
-#define CONFIG_NET_MULTI       1
 #define CONFIG_SYS_RX_ETH_BUFFER       16      /* Number of ethernet rx buffers & descriptors */
 #define CONFIG_PHY_RESET       1
 #define CONFIG_PHY_RESET_DELAY 300     /* PHY RESET recovery delay     */

diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h
index ab7f30f1e86670ce9ad0c83e778f5ad2a7d00e6e..0d5ee141f3449bf8a053f3e8651d289358e949f9 100644 (file)
--- a/include/configs/zmx25.h
+++ b/include/configs/zmx25.h
@@ -77,7 +77,6 @@
 #define CONFIG_FEC_MXC
 #define CONFIG_FEC_MXC_PHYADDR         0x00
 #define CONFIG_MII
-#define CONFIG_NET_MULTI
 
 /*
  * BOOTP options