configs: remove CONFIG_NET_MULTI

CONFIG_NET_MULTI is not used anywhere and thus can safely be removed
from the configs.

Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Lars Poeschel <poeschel@lemonage.de>

diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index 82b7ba6d6dc938c107f4095345c6bb6a119eb0fa..6b5aa1b9f22a82ca67a6823bf2ae4806c623f605 100644 (file)
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -719,7 +719,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_E1000
 

diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index dc3efbaa6ca9f667aa9bbc0e0251d72f540cdeaa..e737960c549d80b84ebc99a5760efb3700c51c37 100644 (file)
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -440,7 +440,6 @@
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 
 #ifdef CONFIG_TSEC_ENET
-#define CONFIG_NET_MULTI
 #define CONFIG_MII                     /* MII PHY management */
 #define CONFIG_MII_DEFAULT_TSEC        1       /* Allow unregistered phys */
 #define CONFIG_TSEC1           1

diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index b59ecbb95a5d1b848832d79109f5cec5b821f19a..e40bbfd1020a064a07d23c688cf08d6db42a4721 100644 (file)
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -78,7 +78,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/T208xQDS.h b/include/configs/T208xQDS.h
index 93d72f79a076b2f740955a56b2e2797cbfe8ae2d..e80b0b5031d2cb495e9b0fc8ef885b0e1dad598e 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -620,7 +620,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_FSL_PCIE_RESET     /* need PCIe reset errata */
-#define CONFIG_NET_MULTI
 #define CONFIG_E1000
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 37b1ce20f51098beed282b1bd56060aed74d4689..c5db4f3eb10813a216cce32f5b7645d0a7ba2cf7 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -568,7 +568,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_FSL_PCIE_RESET           /* need PCIe reset errata LSZ ADD */
-#define CONFIG_NET_MULTI
 #define CONFIG_E1000
 #define CONFIG_PCI_PNP         /* do pci plug-and-play */
 #define CONFIG_PCI_SCAN_SHOW   /* show pci devices on startup */

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index a128d534461be3bd1b55d44f00f4bc5d26144ad0..e38a6f7f738e9ee606f2c9df6428feca14bfc7e9 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -277,7 +277,6 @@
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_E1000
 

diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h
index 54b7028c56043606540bee4e46d30024e4415183..28f4de21dc9d67edd60594ad0907fc8eff66a916 100644 (file)
--- a/include/configs/ac14xx.h
+++ b/include/configs/ac14xx.h
@@ -372,7 +372,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/adp-ag102.h b/include/configs/adp-ag102.h
index 39f7a3cd46fead68a98a8ac74c28fe43b499321e..c46eed9eada031fc8383a58164125fbbd6e49731 100644 (file)
--- a/include/configs/adp-ag102.h
+++ b/include/configs/adp-ag102.h
@@ -81,7 +81,6 @@
 /*
  * Ethernet
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_MAX_ADDR    32      /* this comes from <linux/phy.h> */
 #define CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_FTGMAC100

diff --git a/include/configs/alt.h b/include/configs/alt.h
index e9ffa4866bc940e6b4972f6cb3d503e4e2578a2b..646cb6102ca252d58888130d7bbb5ccc7b7a9cb9 100644 (file)
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -49,7 +49,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index a0e86ea710881559e6440ecd8ab0c8c27b28a93b..d4f4c236a95fc9fd639e7f8e104e26412ee28675 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -318,7 +318,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_GIGE
 #define CONFIG_PHYLIB
 

diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h
index b78b5b7daea3c9ac27117080a7563f76eb2964c4..96427e32c9a6eeda2a52d8a5513af4bce94acf86 100644 (file)
--- a/include/configs/apx4devkit.h
+++ b/include/configs/apx4devkit.h
@@ -86,7 +86,6 @@
 /* FEC Ethernet on SoC */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_FEC_MXC
-#define CONFIG_NET_MULTI
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         0
 #define IMX_FEC_BASE                   MXS_ENET0_BASE

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 14b07810d222bae886dbed724c3d486e1c66813c..e540e3f1f34fbfca4918b51d5c33b51200fff8ea 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -120,7 +120,6 @@
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE)
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x0

diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h
index eaed7eaa202de2bc802646d4afba96f98f26d1df..83747336c658063eb8094ba96b7c3b78fec2d3ec 100644 (file)
--- a/include/configs/atngw100mkii.h
+++ b/include/configs/atngw100mkii.h
@@ -100,7 +100,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/axs101.h b/include/configs/axs101.h
index 389f75bca88cd210d75af932511b0dee3e015511..5e8c14d72179f30d3031b2c8014b5c28b33f87f4 100644 (file)
--- a/include/configs/axs101.h
+++ b/include/configs/axs101.h
@@ -117,7 +117,6 @@
  * Ethernet configuration
  */
 #define CONFIG_DW_AUTONEG
-#define CONFIG_NET_MULTI
 
 /*
  * Command line configuration

diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index 7032ef91ddd81ca4c905750ede865845d8bc5c2c..73f3bfe197dee83ca0cb6484c27caf6f198a6d84 100644 (file)
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -69,7 +69,6 @@
  */
 #define ADI_CMDS_NETWORK
 #define CONFIG_NETCONSOLE
-#define CONFIG_NET_MULTI
 #define CONFIG_HOSTNAME                "bf609-ezkit"
 #define CONFIG_PHY_ADDR                1
 #define CONFIG_DW_PORTS                1

diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h
index 4812a20580f080ddba696a71bfef096abb643fcf..34442728d4d67b95694ec911a45e5effb077d5e2 100644 (file)
--- a/include/configs/bg0900.h
+++ b/include/configs/bg0900.h
@@ -41,7 +41,6 @@
 /* FEC Ethernet on SoC */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_FEC_MXC
-#define CONFIG_NET_MULTI
 #endif
 
 /* SPI */

diff --git a/include/configs/edb93xx.h b/include/configs/edb93xx.h
index a82e8bcadc034f3a1e5b54b0631101e051f32096..70f122643a0156fd937780f1fca84cd359bb9b5d 100644 (file)
--- a/include/configs/edb93xx.h
+++ b/include/configs/edb93xx.h
@@ -142,7 +142,6 @@
 #define CONFIG_MII_SUPPRESS_PREAMBLE
 #define CONFIG_MII
 #define CONFIG_PHY_ADDR                1
-#define CONFIG_NET_MULTI
 #undef CONFIG_NETCONSOLE
 
 /* SDRAM configuration */

diff --git a/include/configs/gose.h b/include/configs/gose.h
index 0dc28c7ecec37ef841b6e62ec8bce995a5795f22..04f0383cbebb309c773655630e8ca148517f3f6b 100644 (file)
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -49,7 +49,6 @@
 #define CONFIG_SPI_FLASH_SPANSION
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index c1ca56c692e34f89abe2cd1f285a09a3058bb0df..8b4278dfd36bb04aef379d4ef2d8f4e558705d8e 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -171,7 +171,6 @@
 #define CONFIG_TSEC1
 #define CONFIG_TSEC2
 #define CONFIG_TSEC_ENET
-#define CONFIG_NET_MULTI
 #define CONFIG_HARD_SPI
 #define CONFIG_HARD_I2C
 

diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h
index b5909962f8770801ba8573fd1e07379349c4863a..3b6213ea3431bd3aa8ba2652d1cf553885e783aa 100644 (file)
--- a/include/configs/ima3-mx53.h
+++ b/include/configs/ima3-mx53.h
@@ -45,7 +45,6 @@
 #define CONFIG_DOS_PARTITION
 
 /* Ethernet on FEC */
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 
 #define CONFIG_FEC_MXC

diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h
index 8439db78187b77f35ede8816b58dee8641ed50ca..12eb172a14e8719389027525e09a277647256329 100644 (file)
--- a/include/configs/integratorap.h
+++ b/include/configs/integratorap.h
@@ -68,7 +68,6 @@
 #define CONFIG_CMD_PCI
 #define CONFIG_PCI_PNP
 
-#define CONFIG_NET_MULTI
 #define CONFIG_TULIP
 #define CONFIG_EEPRO100
 #define CONFIG_SYS_RX_ETH_BUFFER       8       /* use 8 rx buffer on eepro100  */

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 1dffab137421ce0086d62573b08a5e105d9394a0..61c015f3ca661e46e83716422b5682abcb958566 100644 (file)
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -49,7 +49,6 @@
 #define CONFIG_SPI_FLASH_SPANSION
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1

diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h
index bf7833607a9c979e20331acf564e742b1f74af50..0f0220e905d8641b1c9aadb1f3bdbbfef840c77f 100644 (file)
--- a/include/configs/ks2_evm.h
+++ b/include/configs/ks2_evm.h
@@ -97,7 +97,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT         32
-#define CONFIG_NET_MULTI
 #define CONFIG_SYS_SGMII_REFCLK_MHZ    312
 #define CONFIG_SYS_SGMII_LINERATE_MHZ  1250
 #define CONFIG_SYS_SGMII_RATESCALE     2

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index ac74ae7fb381b61305e47cebf8676e2702b87a89..7111b083879d6db782171a1074eff0f65648d0d0 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -127,7 +127,6 @@
 #define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
 
 /* Ether */
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
 #define CONFIG_SMC911X

diff --git a/include/configs/lager.h b/include/configs/lager.h
index e830c6df0acdf64c1a3f45961ee9436b74a75505..f121b9c9aa39cd480607af47cda0f9b60d37d880 100644 (file)
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -49,7 +49,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 24ef2b10dd7160b015c36e41e2d6b2d6f95cc3b9..e7f7a3258c1c9396d697bfe663400cc4f6d21fe6 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -525,7 +525,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_PCIE_MEM_SIZE       0x08000000      /* 128M */
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP
 #define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 88bdd061092ddc4dd638e0b3f1eba1cb0f32fe87..8c3f27185c54d9c2646b06f7dc7e2e9e3fbe547a 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -342,7 +342,6 @@
 #define CONFIG_SYS_PCIE_MEM_SIZE       0x08000000      /* 128M */
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP
 #define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h
index a0f44d90766cd1c416f8e62c2850191e361ddf08..cd2b080335d40b7fa2d5788658a8c40790ab3a11 100644 (file)
--- a/include/configs/ls2085aqds.h
+++ b/include/configs/ls2085aqds.h
@@ -304,7 +304,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP
 #define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h
index 1d7f2c99be4a6418aa5f85287a245269805bb67e..0837fcd306cf40d57400dea2f40843445a37dc5d 100644 (file)
--- a/include/configs/ls2085ardb.h
+++ b/include/configs/ls2085ardb.h
@@ -269,7 +269,6 @@ unsigned long get_board_sys_clk(void);
 #define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */
 
 #ifdef CONFIG_PCI
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP
 #define CONFIG_E1000
 #define CONFIG_PCI_SCAN_SHOW

diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 13b75eb5684d5378ecfac0b1daf83cc99550381a..94fae6b1728ce4809ab896976e05e499accd0428 100644 (file)
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -104,7 +104,6 @@
 /* FEC Ethernet on SoC */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_FEC_MXC
-#define CONFIG_NET_MULTI
 #define CONFIG_MX28_FEC_MAC_IN_OCOTP
 #endif
 

diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h
index ab5475e047041a2e8106acc4833fb2c84086f6f5..91a74138c5525aada83158c0aa499a5e45549b61 100644 (file)
--- a/include/configs/omapl138_lcdk.h
+++ b/include/configs/omapl138_lcdk.h
@@ -191,7 +191,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/p1_twr.h b/include/configs/p1_twr.h
index 322e0748bc5c80a76145266f1ae70ecaa92b987d..58dc98abc1482a968affb07e94e360a2dc842eee 100644 (file)
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -302,7 +302,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_SYS_PCIE1_IO_PHYS       0xffc00000
 #define CONFIG_SYS_PCIE1_IO_SIZE       0x00010000      /* 64k */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP /* do pci plug-and-play */
 #define CONFIG_E1000   /* Defind e1000 pci Ethernet card*/
 #define CONFIG_CMD_PCI
@@ -313,10 +312,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 
 #if defined(CONFIG_TSEC_ENET)
 
-#ifndef CONFIG_NET_MULTI
-#define CONFIG_NET_MULTI
-#endif
-
 #define CONFIG_MII             /* MII PHY management */
 #define CONFIG_TSEC1
 #define CONFIG_TSEC1_NAME      "eTSEC1"

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 601c919190cb0b4568ee4758c2b5dbe5af1d8b8a..45c2df6da029425661282a18a65bb94882b8d4c5 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -163,7 +163,6 @@
 #define CONFIG_USB_ETH_RNDIS
 #endif /* CONFIG_MUSB_GADGET */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_GIGE
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_SMSC

diff --git a/include/configs/porter.h b/include/configs/porter.h
index 9703c840b7ba956662145e61031e0b7137076645..f85d39cfedb681bebd11d519492eb4e2a7651e10 100644 (file)
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -50,7 +50,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1

diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index f678021aac4f84ef98c0c6896a086b7c7b35e333..cf9e2ff0e01ff30544f1de692cb3212ab0c81f01 100644 (file)
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -135,7 +135,6 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void);
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_E1000
 

diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h
index bfd8aa7e6c2ef7fb738cd6c3d0c5c47af8dccc63..c4141a019d174a320ed842f7a84dc3248074b55d 100644 (file)
--- a/include/configs/sama5d3_xplained.h
+++ b/include/configs/sama5d3_xplained.h
@@ -74,7 +74,6 @@
 /* Ethernet Hardware */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         20
 #define CONFIG_MACB_SEARCH_PHY
 #define CONFIG_RGMII

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index 61f51070f6e140e4afcd2841e251eb968a041be2..f086e730cd50a5ea2b9712040aebc0bcdd24a0c7 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -304,7 +304,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
 
 #define CONFIG_NAND
 /* NAND support */

diff --git a/include/configs/silk.h b/include/configs/silk.h
index 161e0a5e2690d59e1dbff1c850e6617b882e5059..ccfcede1ead08b7dcddbc46390e400a860b6004e 100644 (file)
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -50,7 +50,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 /* SH Ether */
-#define        CONFIG_NET_MULTI
 #define CONFIG_SH_ETHER
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       0x1

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index e742acf8021caf8652916eb341a7d508f5dadbdc..5ba2f6a831167528acb21fc1bb353314500e2274 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -97,7 +97,6 @@
  * Ethernet on SoC (EMAC)
  */
 #if defined(CONFIG_CMD_NET) && !defined(CONFIG_SOCFPGA_VIRTUAL_TARGET)
-#define CONFIG_NET_MULTI
 #define CONFIG_DW_ALTDESCRIPTOR
 #define CONFIG_MII
 #define CONFIG_AUTONEG_TIMEOUT         (15 * CONFIG_SYS_HZ)

diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h
index 59455abce2951f49a7542be2c4350fae82a944be..30a3f509aef66b6d899e24dfa624c3815e0ab2a9 100644 (file)
--- a/include/configs/spear-common.h
+++ b/include/configs/spear-common.h
@@ -18,7 +18,6 @@
 
 /* Ethernet driver configuration */
 #define CONFIG_MII
-#define CONFIG_NET_MULTI
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_GIGE                        /* Include GbE speed/duplex detection */

diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index fd208b1baca6e3aaecec9a9c3f26f870f6954f77..efd76da119d9e2c420f51d82aae3ab5a3cb1961a 100644 (file)
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -232,7 +232,6 @@
 
 #ifdef CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
-#define CONFIG_NET_MULTI
 #define CONFIG_PCI_PNP                 /* do pci plug-and-play */
 #define CONFIG_E1000
 

diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index 1dbd6c8d3fd14c817b6d35da19ceb731f0486d79..372a02be0ebeedc3f1f810c5f722dc2c3e736044 100644 (file)
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -227,7 +227,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
 #define CONFIG_PHY_GIGE
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_ET1011C

diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index bef821f3371a2227dd505ba59e72c895cfd3d6af..7dfb6da3570ca2429b4714311734ffc544edf775 100644 (file)
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -325,7 +325,6 @@
 /* Ethernet */
 #define CONFIG_MACB
 #define CONFIG_RMII
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT         5
 #define CONFIG_AT91_WANTS_COMMON_PHY
 

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 5b6307661473e063a15f80266b6239d2fdb50d64..d235da4ad69bf7711fce2675cc3a75159311872b 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -74,7 +74,6 @@
 
 /* Ethernet config options */
 #define CONFIG_MII
-#define CONFIG_NET_MULTI
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_RESET_DELAY                 10000           /* in usec */
 #define CONFIG_PHY_ADDR                0       /* PHY address */

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index be77e509e55897089bf94ae3381c0e6863ded1b4..1a52e7d538261a9d36b078d61e00e60bf8918227 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -48,7 +48,6 @@
 
 /* Ethernet driver */
 #if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1)
-# define CONFIG_NET_MULTI
 # define CONFIG_ZYNQ_GEM
 # define CONFIG_MII
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN