From: Lars Poeschel Date: Tue, 2 Jun 2015 09:25:54 +0000 (+0200) Subject: configs: remove CONFIG_NET_MULTI X-Git-Tag: v2015.07-rc2~45 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fkernel%2Fu-boot.git;a=commitdiff_plain;h=42eccdd650915962345daeae831dab183d67511b 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 Acked-by: Viresh Kumar Signed-off-by: Lars Poeschel --- diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 82b7ba6..6b5aa1b 100644 --- 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 dc3efba..e737960 100644 --- 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 b59ecbb..e40bbfd 100644 --- 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 93d72f7..e80b0b5 100644 --- 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 37b1ce2..c5db4f3 100644 --- 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 a128d53..e38a6f7 100644 --- 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 54b7028..28f4de2 100644 --- 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 39f7a3c..c46eed9 100644 --- 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 */ #define CONFIG_SYS_DISCOVER_PHY #define CONFIG_FTGMAC100 diff --git a/include/configs/alt.h b/include/configs/alt.h index e9ffa48..646cb61 100644 --- 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 a0e86ea..d4f4c23 100644 --- 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 de14d11..445cb19 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -87,7 +87,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 14b0781..e540e3f 100644 --- 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 eaed7ea..8374733 100644 --- 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 389f75b..5e8c14d 100644 --- 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 7032ef9..73f3bfe 100644 --- 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 910f699..7f364cd 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -42,7 +42,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 a82e8bc..70f1226 100644 --- 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 0dc28c7..04f0383 100644 --- 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 c1ca56c..8b4278d 100644 --- 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 ad1614a..71ca77a 100644 --- a/include/configs/ima3-mx53.h +++ b/include/configs/ima3-mx53.h @@ -46,7 +46,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 8439db7..12eb172 100644 --- 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 1dffab1..61c015f 100644 --- 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 42280ca..036f2cb 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -98,7 +98,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 ac74ae7..7111b08 100644 --- 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 e830c6d..f121b9c 100644 --- 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 c7f5033..ca913b0 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -526,7 +526,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 cc8c936..6b6f2ba 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -343,7 +343,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 a0f44d9..cd2b080 100644 --- 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 1d7f2c9..0837fcd 100644 --- 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 03ff885..bc0ae28 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -105,7 +105,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 ab5475e..91a7413 100644 --- 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 322e074..58dc98a 100644 --- 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 601c919..45c2df6 100644 --- 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 9703c84..f85d39c 100644 --- 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 f678021..cf9e2ff 100644 --- 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 bfd8aa7..c4141a0 100644 --- 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 61f5107..f086e73 100644 --- 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 161e0a5..ccfcede 100644 --- 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 e742acf..5ba2f6a 100644 --- 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 59455ab..30a3f50 100644 --- 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 fd208b1b..efd76da 100644 --- 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 1dbd6c8..372a02b 100644 --- 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 bef821f..7dfb6da 100644 --- 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 5b63076..d235da4 100644 --- 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 be77e50..1a52e7d 100644 --- 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