configs: remove CONFIG_NET_MULTI

PATCH New poeschel at lemonage.de 4 participants 4 messages Jun 2, 2015 Arm/Zynq architecture

lore

Share & tools

lore

poeschel at lemonage.de

author

2015-06-02 09:25 UTC #0 lore raw

PATCH v2 2/2 configs: remove CONFIG_NET_MULTI

From: Lars Poeschel <[email protected]>

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

Signed-off-by Lars Poeschel <[email protected]>

---
 include/configs/B4860QDS.h             | 1 -
 include/configs/C29XPCIE.h             | 1 -
 include/configs/M54418TWR.h            | 1 -
 include/configs/T208xQDS.h             | 1 -
 include/configs/T208xRDB.h             | 1 -
 include/configs/T4240RDB.h             | 1 -
 include/configs/ac14xx.h               | 1 -
 include/configs/adp-ag102.h            | 1 -
 include/configs/alt.h                  | 1 -
 include/configs/am43xx_evm.h           | 1 -
 include/configs/apx4devkit.h           | 1 -
 include/configs/armadillo-800eva.h     | 1 -
 include/configs/atngw100mkii.h         | 1 -
 include/configs/axs101.h               | 1 -
 include/configs/bf609-ezkit.h          | 1 -
 include/configs/bg0900.h               | 1 -
 include/configs/edb93xx.h              | 1 -
 include/configs/gose.h                 | 1 -
 include/configs/ids8313.h              | 1 -
 include/configs/ima3-mx53.h            | 1 -
 include/configs/integratorap.h         | 1 -
 include/configs/koelsch.h              | 1 -
 include/configs/ks2_evm.h              | 1 -
 include/configs/kzm9g.h                | 1 -
 include/configs/lager.h                | 1 -
 include/configs/ls1021aqds.h           | 1 -
 include/configs/ls1021atwr.h           | 1 -
 include/configs/ls2085aqds.h           | 1 -
 include/configs/ls2085ardb.h           | 1 -
 include/configs/mx28evk.h              | 1 -
 include/configs/omapl138_lcdk.h        | 1 -
 include/configs/p1_twr.h               | 5 -----
 include/configs/pcm051.h               | 1 -
 include/configs/porter.h               | 1 -
 include/configs/qemu-ppce500.h         | 1 -
 include/configs/sama5d3_xplained.h     | 1 -
 include/configs/siemens-am33x-common.h | 1 -
 include/configs/silk.h                 | 1 -
 include/configs/socfpga_common.h       | 1 -
 include/configs/spear-common.h         | 1 -
 include/configs/t4qds.h                | 1 -
 include/configs/ti814x_evm.h           | 1 -
 include/configs/vl_ma2sc.h             | 1 -
 include/configs/x600.h                 | 1 -
 include/configs/zynq-common.h          | 1 -
 45 files changed, 49 deletions(-)

include/configs/B4860QDS.h +0 -1

index dca1ca5..35824af 100644
@@ -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

include/configs/C29XPCIE.h +0 -1

index 7c45c36..f63fe7e 100644
@@ -441,7 +441,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

include/configs/M54418TWR.h +0 -1

index 25b3cda..275aa4e 100644
@@ -79,7 +79,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

include/configs/T208xQDS.h +0 -1

index bad3613..a43d958 100644
@@ -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 */

include/configs/T208xRDB.h +0 -1

index 107efdc..a5f2f23 100644
@@ -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 */

include/configs/T4240RDB.h +0 -1

index 2a22249..19dc332 100644
@@ -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

include/configs/ac14xx.h +0 -1

index 54b7028..28f4de2 100644
@@ -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

include/configs/adp-ag102.h +0 -1

index 39f7a3c..c46eed9 100644
@@ -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

include/configs/alt.h +0 -1

index e9ffa48..646cb61 100644
@@ -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

include/configs/am43xx_evm.h +0 -1

index 331fdac..cd43cfb 100644
@@ -319,7 +319,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

include/configs/apx4devkit.h +0 -1

index d1f18bc..d51ce41 100644
@@ -88,7 +88,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

include/configs/armadillo-800eva.h +0 -1

index 72469f3..623011b 100644
@@ -121,7 +121,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

include/configs/atngw100mkii.h +0 -1

index eaed7ea..8374733 100644
@@ -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

include/configs/axs101.h +0 -1

index 389f75b..5e8c14d 100644
@@ -117,7 +117,6 @@
  * Ethernet configuration
  */
 #define CONFIG_DW_AUTONEG
-#define CONFIG_NET_MULTI
 
 /*
  * Command line configuration

include/configs/bf609-ezkit.h +0 -1

index 7507d57..5ff7b4e 100644
@@ -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

include/configs/bg0900.h +0 -1

index 507d972..8be592f 100644
@@ -44,7 +44,6 @@
 /* FEC Ethernet on SoC */
 #ifdef	CONFIG_CMD_NET
 #define CONFIG_FEC_MXC
-#define CONFIG_NET_MULTI
 #endif
 
 /* SPI */

include/configs/edb93xx.h +0 -1

index a82e8bc..70f1226 100644
@@ -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 */

include/configs/gose.h +0 -1

index 0dc28c7..04f0383 100644
@@ -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

include/configs/ids8313.h +0 -1

index c1ca56c..8b4278d 100644
@@ -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

include/configs/ima3-mx53.h +0 -1

index ad1614a..71ca77a 100644
@@ -46,7 +46,6 @@
 #define CONFIG_DOS_PARTITION
 
 /* Ethernet on FEC */
-#define CONFIG_NET_MULTI
 #define CONFIG_MII
 
 #define CONFIG_FEC_MXC

include/configs/integratorap.h +0 -1

index 8439db7..12eb172 100644
@@ -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	*/

include/configs/koelsch.h +0 -1

index 1dffab1..61c015f 100644
@@ -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

include/configs/ks2_evm.h +0 -1

index 42280ca..036f2cb 100644
@@ -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

include/configs/kzm9g.h +0 -1

index ac74ae7..7111b08 100644
@@ -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

include/configs/lager.h +0 -1

index e830c6d..f121b9c 100644
@@ -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

include/configs/ls1021aqds.h +0 -1

index 1a41a2f..ffd456b 100644
@@ -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

include/configs/ls1021atwr.h +0 -1

index 8ea428e..18b33d7 100644
@@ -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

include/configs/ls2085aqds.h +0 -1

index 711d529..912a82f 100644
@@ -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

include/configs/ls2085ardb.h +0 -1

index d1c2548..fc17dd9 100644
@@ -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

include/configs/mx28evk.h +0 -1

index 9daa0bf..3800351 100644
@@ -107,7 +107,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

include/configs/omapl138_lcdk.h +0 -1

index 68b4010..bc48525 100644
@@ -191,7 +191,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
-#define CONFIG_NET_MULTI
 #endif
 
 /*

include/configs/p1_twr.h +0 -5

index 9864c15..41970e3 100644
@@ -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

@@ -314,10 +313,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"

include/configs/pcm051.h +0 -1

index 601c919..45c2df6 100644
@@ -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

include/configs/porter.h +0 -1

index 9703c84..f85d39c 100644
@@ -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

include/configs/qemu-ppce500.h +0 -1

index 7071849..76373f3 100644
@@ -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

include/configs/sama5d3_xplained.h +0 -1

index bfd8aa7..c4141a0 100644
@@ -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

include/configs/siemens-am33x-common.h +0 -1

index c7affd6..c17f87f 100644
@@ -305,7 +305,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT         10
-#define CONFIG_NET_MULTI
 
 #define CONFIG_NAND
 /* NAND support */

include/configs/silk.h +0 -1

index 161e0a5..ccfcede 100644
@@ -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

include/configs/socfpga_common.h +0 -1

index e742acf..5ba2f6a 100644
@@ -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)

include/configs/spear-common.h +0 -1

index 409cf54..e51fae9 100644
@@ -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 */

include/configs/t4qds.h +0 -1

index 75609b9..c67f8b7 100644
@@ -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

include/configs/ti814x_evm.h +0 -1

index dcc2bdc..a7b3504 100644
@@ -228,7 +228,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

include/configs/vl_ma2sc.h +0 -1

index bef821f..7dfb6da 100644
@@ -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

include/configs/x600.h +0 -1

index 27a66a5..aee5ec8 100644
@@ -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 */

include/configs/zynq-common.h +0 -1

index be77e50..1a52e7d 100644
@@ -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

Signature · 1 line

2.1.4

Viresh Kumar

2015-06-02 09:53 UTC #1 lore raw

PATCH v2 2/2 configs: remove CONFIG_NET_MULTI

Quoted 6 lines · poeschel at lemonage.de

From: Lars Poeschel <[email protected]>
CONFIG_NET_MULTI is not used anywhere and thus can safely be removed from the configs.
 include/configs/spear-common.h         | 1 -

Acked-by Viresh Kumar <[email protected]>

Signature · 1 line

viresh

Marek Vasut

2015-06-02 14:31 UTC #2 lore raw

PATCH v2 2/2 configs: remove CONFIG_NET_MULTI

In reply to poeschel at lemonage.de

Quoted 6 lines · poeschel at lemonage.de

From: Lars Poeschel <[email protected]>
CONFIG_NET_MULTI is not used anywhere and thus can safely be removed from the configs.
Signed-off-by Lars Poeschel <[email protected]>

Acked-by Marek Vasut <[email protected]>

Best regards,
Marek Vasut

Tom Rini

2015-06-02 15:19 UTC #3 lore raw

PATCH v2 2/2 configs: remove CONFIG_NET_MULTI

In reply to poeschel at lemonage.de

Quoted 8 lines · poeschel at lemonage.de

From: Lars Poeschel <[email protected]>
CONFIG_NET_MULTI is not used anywhere and thus can safely be removed from the configs.
Acked-by Viresh Kumar <[email protected]>
Acked-by Marek Vasut <[email protected]>
Signed-off-by Lars Poeschel <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150602/461c62a4/attachment.sig>