diff options
Diffstat (limited to 'include/configs')
340 files changed, 10 insertions, 483 deletions
diff --git a/include/configs/A3000.h b/include/configs/A3000.h index 3d6014176..0c21bd8ec 100644 --- 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 6f12c8ddc..5cd8eef31 100644 --- 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 37dd75773..fd074fb5c 100644 --- 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 0adf3ed2a..9a65cbced 100644 --- 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 4963e9f68..99944766d 100644 --- 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 ee80d9d8f..7f4849921 100644 --- 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 e05099281..39c29ecc2 100644 --- 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 1497cae09..a3e882001 100644 --- 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 a83389372..8a73a9a4c 100644 --- 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 0b75a4ed2..84e4e78f6 100644 --- 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 daaf62440..63d838fe6 100644 --- 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 17282aad6..ed3f9e1cb 100644 --- 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 426fc57a6..cf1d1b39b 100644 --- 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 8f48ded23..d17458eaa 100644 --- 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 a042abf15..a0d16d24a 100644 --- 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 9b99ba866..98b8ef5a7 100644 --- 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 92ffaaaf1..d735e613d 100644 --- 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 b2ee87329..35daed05e 100644 --- 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 885d42b33..4aaceb77c 100644 --- 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 e2229b038..77414abda 100644 --- 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 53229d94b..6fe7fd33c 100644 --- 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 dbd224cc2..1f825fd0d 100644 --- 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 321692bc5..4218774de 100644 --- 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 1493f750d..24df85a88 100644 --- 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 ceab60485..8bd7940ba 100644 --- 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 033392579..1f774a932 100644 --- 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 8cce70c11..220372ccd 100644 --- 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 9a68b1ca4..b90540295 100644 --- 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 f7b5bc960..43c88428e 100644 --- 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 af602ffea..d64dd8de1 100644 --- 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 a15e686d2..4a41b5c6d 100644 --- 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 44ae48d60..8f4e544c6 100644 --- 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 827ecf26e..afb827324 100644 --- 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 bc5d761f8..135ef5540 100644 --- 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 c38e0d26d..ef652b2dc 100644 --- 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 fcf66b7bc..06fa676fd 100644 --- 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 a45cdc1bb..6f462be1a 100644 --- 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 cd12d2b7a..7bb6dfefc 100644 --- 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 7a44cf7de..b843e0770 100644 --- 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 992d738cb..1d3b5c354 100644 --- 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 b3c774f9c..de1516324 100644 --- 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 56a760fc8..e34dc4049 100644 --- 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 0c104805d..928b04415 100644 --- 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 d205e7c17..216244c9d 100644 --- 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 3adcf4dfa..67cdff11a 100644 --- 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 71b5af6e3..d0044b142 100644 --- 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 de88383e3..e2e244521 100644 --- 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 2662b3511..d934d8edf 100644 --- 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 6e0bef55e..f31972c7b 100644 --- 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 f3a295cb4..813f0cb47 100644 --- 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 f9681cd1a..da924c837 100644 --- 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 9b83e21a1..c75a256a5 100644 --- 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 ce9273b6f..247cd2ff6 100644 --- 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 c809a6b36..f7fba0ca4 100644 --- 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 3ff175c6d..210b60235 100644 --- 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 92c54d0ec..7f52bb196 100644 --- 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 a0cfd000f..ec8694950 100644 --- 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 4d4c758eb..a8657b110 100644 --- 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 f136a8e16..823b9f127 100644 --- 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 da2b11da8..865d3176a 100644 --- 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 de233ffe6..4999004d4 100644 --- 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 49d64a55e..63034d2f8 100644 --- 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 851872ae3..909e8ab3c 100644 --- 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 abccfd643..03aedeca5 100644 --- 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 ea3056b93..d0e4b2c00 100644 --- 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 f3d325a0c..3efe9373f 100644 --- 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 fc0edaced..301efbefa 100644 --- 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 ae19036d8..b2503a40f 100644 --- 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 6b03d2741..97b55696a 100644 --- 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 aca77ff6b..63e23c276 100644 --- 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 93d4c3e5f..efd42807f 100644 --- 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 e03fea3cc..8cf2bf2b3 100644 --- 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 cf0ea47e7..994e7aede 100644 --- 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 dd7278c4b..a4734eba6 100644 --- 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 6067e6085..da20278d7 100644 --- 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 31dbc3b7d..c90b69dd5 100644 --- 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 0ddb76f86..2bd67c3e1 100644 --- 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 27ebceb01..f304272ff 100644 --- 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 6f4d18759..ade48930c 100644 --- 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 c201310f2..31c85e22d 100644 --- 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 5674636a3..072475273 100644 --- 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 812759d3e..619a8002a 100644 --- 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 88339ac0a..e36476e30 100644 --- 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 92b7d6a1e..acf5dcbc0 100644 --- 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 d02dca98f..c58899bee 100644 --- 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 65a366ab0..47110aff2 100644 --- 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 c2e3b2bcc..9f754c2a8 100644 --- 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 bc8e718f1..1343419e1 100644 --- 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 a3cccf4c3..d892b6701 100644 --- 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 938667497..e9069222d 100644 --- 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 043515dbd..ba74a150c 100644 --- 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 f6b788e57..3fa38daaf 100644 --- 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 c7f076122..91c250f05 100644 --- 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 eb641f556..f7ef6434a 100644 --- 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 b2b94b443..fb485b03e 100644 --- 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 c126605b3..16d6450d9 100644 --- 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 2dc6057f8..07415f4b5 100644 --- 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 95c30ccde..3fe2b3eee 100644 --- 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 dcf629340..1cce57efd 100644 --- 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 8354e70fd..9b01e4fee 100644 --- 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 501f691ea..f4f93059f 100644 --- 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 1af043df3..28666d646 100644 --- 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 0f44e6413..2dceff747 100644 --- 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 83cee9654..60aabf3f2 100644 --- 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 4eb0735fc..bee74aa53 100644 --- 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 7f2f1131b..d562877c9 100644 --- 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 195925ac5..2d456189f 100644 --- 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 b5612d66c..7a9653080 100644 --- 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 339e02b5e..e006b5553 100644 --- 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 524a3e069..35171b6b9 100644 --- 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 87aa4fdac..9ba307e1c 100644 --- 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 d6ea22d74..3a01292e2 100644 --- 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 3154e13f2..6ea3faac1 100644 --- 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 5cd517d94..9370ca821 100644 --- 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 fe6b72810..780abd978 100644 --- 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 0082e71e3..79bea3417 100644 --- 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 6e891e7f1..76934590b 100644 --- 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 717b5cdd8..16b2dacc6 100644 --- 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 740cb7550..183045b46 100644 --- 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 f0c0bd966..5b8f41fdd 100644 --- 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 fec9df0da..2ca4ed028 100644 --- 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 5d1c18849..1d97d3e35 100644 --- 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 422a781a5..93caacce6 100644 --- 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 027a904ee..504ad96b0 100644 --- 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 0e340e898..5f925b328 100644 --- 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 5489bd831..5350f619f 100644 --- 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 62913b584..45a7c53f7 100644 --- 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 b5d20bd7b..1c139048e 100644 --- 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 2717abace..00780d0d8 100644 --- 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 eca814b3e..cb97434c3 100644 --- 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 c10331240..816d982a3 100644 --- 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 190de5a39..90badd39c 100644 --- 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 fb958fd94..8d0890fc8 100644 --- 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 2c2c0776d..2adf8f9e5 100644 --- 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 d93e50590..0d53e51b9 100644 --- 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 b5d3e102b..76ef56f2f 100644 --- 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 45126c724..42a134bbc 100644 --- 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 1f959fc8f..46595d911 100644 --- 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 3a60de0d4..0619cf780 100644 --- 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 b847798aa..7e6c1554c 100644 --- 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 88578c694..c439f3e82 100644 --- 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 126907f44..c8fc9e7bd 100644 --- 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 d817423a7..f73d952ff 100644 --- 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 b08cbf234..05575cd34 100644 --- 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 53da0f7e2..bf1f20280 100644 --- 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 bda6eedcf..8f9ed2389 100644 --- 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 f24452be3..44ce24296 100644 --- 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 26c08e212..a30aa70b1 100644 --- 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 a55e1786d..72d0948c1 100644 --- 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 6eec1c91a..a97972b81 100644 --- 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 c28f86712..1945c032a 100644 --- 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 22a5639e5..1256e815d 100644 --- 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 95d3afa85..c1a5ecda7 100644 --- 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 cb37ee797..e3344e9e8 100644 --- 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 11929c77b..c6ae4f150 100644 --- 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 0913ce4e6..62bd3bf08 100644 --- 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 e8024d7a2..da3681def 100644 --- 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 1a7273b1e..05029d497 100644 --- 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 717a35a81..77822e792 100644 --- 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 4862baa39..3eadcefb8 100644 --- 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 1490b2f98..ee585c0ff 100644 --- 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 6cfc19b6b..1a9d27ea2 100644 --- 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 85f08ea88..63791be3e 100644 --- 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 9950e44f5..b425b7b62 100644 --- 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 8c57eabb8..2675c56b0 100644 --- 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 7e179beef..be325e8c2 100644 --- 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 e0c6d53b2..4f2b904d5 100644 --- 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 75152964b..e2b954c06 100644 --- 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 9649e18f7..77f47d945 100644 --- 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 84846efad..55e61d674 100644 --- 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 fa62a8e9c..a6d2fa8ae 100644 --- 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 c60401c8f..93e3c8677 100644 --- 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 5777062c6..81e4de45d 100644 --- 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 66e689aa8..785ab0a62 100644 --- 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 496a904f2..026d22203 100644 --- 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 5348ad126..6d97a0cdc 100644 --- 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 23bfbeb1d..011731b87 100644 --- 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 4bbca8860..007521055 100644 --- 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 c1742c1a6..a9cfe267f 100644 --- 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 ba9f797d6..0c86d6220 100644 --- 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 75b881cf8..1b43c54f4 100644 --- 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 21a8e648e..25be61665 100644 --- 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 934dfcdef..804469bf8 100644 --- 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 0ea34b89d..fb5f868af 100644 --- 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 23731676f..5d18ac7ea 100644 --- 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 66fdea22f..c522af97b 100644 --- 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 f6068a2b3..cad56209a 100644 --- 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 56d0ac9b3..ddf673c84 100644 --- 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 b44b2ea7a..dfa0a0047 100644 --- 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 28b9db9a7..323c0b4df 100644 --- 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 a0a30f578..d97c0f36c 100644 --- 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 086a2d7d4..88c6beeb9 100644 --- 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 5cc8bc050..b6f61ee4b 100644 --- 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 307b9f274..ce2721275 100644 --- 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 2336129f1..163f1a210 100644 --- 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 d8c936250..1d5cf2c41 100644 --- 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 7ad36a1ce..60c70ebb2 100644 --- 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 fbcbdb3af..ba0d23e31 100644 --- 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 0e05df3b5..3a05c8299 100644 --- 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 6b328a547..4ab48c774 100644 --- 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 bccd416fc..86fecd15a 100644 --- 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 548d52c6a..70c74f63d 100644 --- 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 61f34ddc4..afb1de638 100644 --- 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 48ce9453f..a2e317825 100644 --- 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 c4b1e654c..4324172a8 100644 --- 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 371e78170..f8affa80e 100644 --- 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 bb87d3623..2b40f5918 100644 --- 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 692f0ec77..04c07086c 100644 --- 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 74daeb0a9..38058c7af 100644 --- 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 4c30b39bd..757636dec 100644 --- 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 5f7216347..a9f3b3b30 100644 --- 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 dc62ea30c..a127a2ba3 100644 --- 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 5efe676bc..643efc4f1 100644 --- 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 505db10a0..e13299e01 100644 --- 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 9779449bc..e27216ac1 100644 --- 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 bbd2f91ab..f868d965c 100644 --- 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 294d6c4f8..ed1008f9f 100644 --- 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 b5f454cd8..76e911a98 100644 --- 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 bfdfc0a8c..94e680c42 100644 --- 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 23a88d0b6..5f88d9667 100644 --- 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 055f8a0f4..294af735d 100644 --- 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 fc046d605..4bc36b99f 100644 --- 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 b6534e474..279a9d2cc 100644 --- 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 8d93277c2..6953a800d 100644 --- 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 5e976bc16..31f05134f 100644 --- 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 a0c0f1b4a..61f05345b 100644 --- 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 0e5ad2b4d..70c9bb442 100644 --- 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 2e4b34637..a0a3da1e8 100644 --- 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 3b983afb6..61b87618b 100644 --- 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 e9b68c691..7ae34b71b 100644 --- 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 c024d78c1..d36ae4366 100644 --- 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 ba08d92e3..cfa4d8c91 100644 --- 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 037573200..20e1087da 100644 --- 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 8d27c0b2d..f5adccb51 100644 --- 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 0360cd31c..02a82a69b 100644 --- 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 4a357d685..2014e3770 100644 --- 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 8476eb77b..c117943f2 100644 --- 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 66cb53337..46335b4b7 100644 --- 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 95fc2437d..203a4b219 100644 --- 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 b00647b3e..cdf68273f 100644 --- 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 b6ee9190a..bbdae3c55 100644 --- 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 a1ead70ee..a6f2864c6 100644 --- 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 b9cf1dc79..19ef2544a 100644 --- 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 9961f122b..22e95b3bd 100644 --- 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 e100cb41c..a2b55d5fb 100644 --- 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 a811b76d7..09ff7c4fb 100644 --- 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 6c5276920..d8d82561f 100644 --- 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 e7ef29809..428889472 100644 --- 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 927446438..700dcdaae 100644 --- 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 d7a3a9690..9e61fc17b 100644 --- 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 f0ed4d108..a6dc14675 100644 --- 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 c8d04f7cf..7cf641fd1 100644 --- 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 7b68ec5b6..0643312ba 100644 --- 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 0afae24b2..8414376ed 100644 --- 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 0bea8589b..457a24a5a 100644 --- 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 cd156d8b6..8c5730ac2 100644 --- 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 4e9022d81..670e76dac 100644 --- 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 d62a4f296..0c108703c 100644 --- 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 26fc219ca..3e9903172 100644 --- 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 b127b06cc..203349296 100644 --- 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 409170373..c3e4e1396 100644 --- 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 261f0bc45..c117a337a 100644 --- 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 758f19dc4..13d1e6637 100644 --- 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 d57d53cca..1395939ce 100644 --- 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 9f5a0b89b..22eb0047f 100644 --- 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 62c1721a2..43de18b25 100644 --- 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 9fa33172f..d57e1a79b 100644 --- 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 e3f3487ce..7901b6c94 100644 --- 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 01f402bf3..46d1643c6 100644 --- 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 1369c89e4..a0264786a 100644 --- 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 7af30c206..4c95a78d3 100644 --- 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 3f3726350..2f3743ccc 100644 --- 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 6a826ba69..35472bb04 100644 --- 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 db25b8637..a8dfef321 100644 --- 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 bf8e000cb..26e7e1f1e 100644 --- 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 9ecb2b0f3..e2c2eda37 100644 --- 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 71eb78495..94a69927e 100644 --- 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 719a12aaa..d7b1ca203 100644 --- 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 d5cf89abb..eea8ed3ad 100644 --- 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 deb5b332f..26627bbf6 100644 --- 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 831af6a7d..f0154e091 100644 --- 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 7fe9e5b26..56bb4641f 100644 --- 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 583034592..4a985456d 100644 --- 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 ad8221390..7dd6246f1 100644 --- 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 3a8b095f0..89e17b83f 100644 --- 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 1e282d201..57a041689 100644 --- 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 672f66345..acc120445 100644 --- 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 652b85efd..d3c899085 100644 --- 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 e591d87db..cd95081a9 100644 --- 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 fb697d555..f5a137e01 100644 --- 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 78b37017e..e4bc1d0be 100644 --- 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 5fd7838d5..dc5ec3aa8 100644 --- 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 657591695..a7a92f798 100644 --- 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 408a7e0b1..b0655c323 100644 --- 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 0802140ea..59b45c84d 100644 --- 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 880199353..c1ffc348f 100644 --- 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 967a9914a..1e355a881 100644 --- 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 6f0d728f9..cab666060 100644 --- 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 b418cf23b..fae95d7a5 100644 --- 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 4ec323ece..171058cf2 100644 --- 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 e0af0d26a..d2199257f 100644 --- 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 8d9f931b7..61551ece4 100644 --- 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 852e80752..2d6e51da4 100644 --- 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 1b5d93158..180c5dad4 100644 --- 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 9799767c5..4a5fd0d29 100644 --- 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 1221cd5e2..b8eb13de4 100644 --- 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 8eb9a1299..1e71bcc3e 100644 --- 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 a4a675bed..77c0a08d4 100644 --- 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 d175ed6b3..4d0b7b2d4 100644 --- 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 19dde1be3..6663629ce 100644 --- 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 2f97beaec..59c9fdb19 100644 --- 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 7def16fe6..cb3c674f4 100644 --- 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 af62aea7a..19b978a5b 100644 --- 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 f1cbe9571..fe40bf0e4 100644 --- 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 d6195b186..f27466cdd 100644 --- 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 66738d595..90d249b96 100644 --- 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 a421ba43b..3d385b425 100644 --- 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 890186e91..e7f5a0d0f 100644 --- 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 011a68321..fc2b57d11 100644 --- 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 52055e80d..241f21051 100644 --- 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 2375fc576..2adb071dd 100644 --- 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 5bca6e141..2c66f33d8 100644 --- 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 ec052c41d..6ec9b8036 100644 --- 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 176d46861..6380bb897 100644 --- 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 bb9f606a0..1e59ef37a 100644 --- 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 325ac8c73..9ddc7b1b6 100644 --- 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 abb57fe94..9d37359c9 100644 --- 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 3bfcdffb9..bb835e084 100644 --- 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 d95c0ba44..540dfa9f6 100644 --- 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 d15376288..fe2bc1d92 100644 --- 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 ea779716f..9db4d999b 100644 --- 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 205e86c78..8a4141630 100644 --- 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 32544fed5..a35bce370 100644 --- 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 cd7148df1..d72921eeb 100644 --- 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 cb83a6467..20b43405b 100644 --- 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 42517c9da..cb29c98c1 100644 --- 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 202f209a7..34814797d 100644 --- 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 0c2e7edb2..87c894ccc 100644 --- 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 f9a6b9313..63279b01c 100644 --- 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 ab7f30f1e..0d5ee141f 100644 --- 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 |