diff mbox

[U-Boot,v2] configs: Remove CONFIG_NET_MULTI from board files

Message ID 1326639788-6085-1-git-send-email-festevam@gmail.com
State Accepted
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Jan. 15, 2012, 3:03 p.m. UTC 
CONFIG_NET_MULTI is not used anymore, so remove it from board files.

Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Fix P1010RDB and p1_p2_rdb_pc targets
 include/configs/P1010RDB.h         |    4 ----
 include/configs/PM826.h            |    2 --
 include/configs/PM828.h            |    2 --
 include/configs/cam_enc_4xx.h      |    1 -
 include/configs/coreboot.h         |    6 ------
 include/configs/da850_am18xxevm.h  |    1 -
 include/configs/ecovec.h           |    1 -
 include/configs/efikamx.h          |    1 -
 include/configs/enbw_cmc.h         |    1 -
 include/configs/ethernut5.h        |    1 -
 include/configs/flea3.h            |    1 -
 include/configs/m28evk.h           |    1 -
 include/configs/omap3_evm_common.h |    1 -
 include/configs/omap3_mvblx.h      |    1 -
 include/configs/p1_p2_rdb_pc.h     |    6 ------
 include/configs/tam3517-common.h   |    1 -
 16 files changed, 0 insertions(+), 31 deletions(-)

Comments

Tom Rini Jan. 15, 2012, 3:06 p.m. UTC | #1 
On Sun, Jan 15, 2012 at 8:03 AM, Fabio Estevam <festevam@gmail.com> wrote:
> CONFIG_NET_MULTI is not used anymore, so remove it from board files.
>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Kumar Gala <kumar.gala@freescale.com>
> Cc: Sandeep Paulraj <s-paulraj@ti.com>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

Acked-by: Tom Rini <trini@ti.com>

For the TI bits.
Mike Frysinger Jan. 15, 2012, 6:38 p.m. UTC | #2 
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
Stefano Babic Jan. 17, 2012, 10:22 a.m. UTC | #3 
On 15/01/2012 16:03, Fabio Estevam wrote:
> CONFIG_NET_MULTI is not used anymore, so remove it from board files.
> 
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Kumar Gala <kumar.gala@freescale.com>
> Cc: Sandeep Paulraj <s-paulraj@ti.com>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index af4609f..2ee2619 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -519,10 +519,6 @@  extern unsigned long get_sdram_size(void);
 #endif
 
 #if defined(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 */
 #define CONFIG_TSEC1	1
diff --git a/include/configs/PM826.h b/include/configs/PM826.h
index f4f9305..cde0fd6 100644
--- a/include/configs/PM826.h
+++ b/include/configs/PM826.h
@@ -100,11 +100,9 @@ 
  *
  * if CONFIG_ETHER_ON_SCC is selected, then
  *   - CONFIG_ETHER_INDEX must be set to the channel number (1-4)
- *   - CONFIG_NET_MULTI must not be defined
  *
  * if CONFIG_ETHER_ON_FCC is selected, then
  *   - one or more CONFIG_ETHER_ON_FCCx (x=1,2,3) must also be selected
- *   - CONFIG_NET_MULTI must be defined
  *
  * 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.
diff --git a/include/configs/PM828.h b/include/configs/PM828.h
index 28666d6..74ced5a 100644
--- a/include/configs/PM828.h
+++ b/include/configs/PM828.h
@@ -100,11 +100,9 @@ 
  *
  * if CONFIG_ETHER_ON_SCC is selected, then
  *   - CONFIG_ETHER_INDEX must be set to the channel number (1-4)
- *   - CONFIG_NET_MULTI must not be defined
  *
  * if CONFIG_ETHER_ON_FCC is selected, then
  *   - one or more CONFIG_ETHER_ON_FCCx (x=1,2,3) must also be selected
- *   - CONFIG_NET_MULTI must be defined
  *
  * 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.
diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h
index a21d448..50a967c 100644
--- a/include/configs/cam_enc_4xx.h
+++ b/include/configs/cam_enc_4xx.h
@@ -68,7 +68,6 @@ 
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
-#define CONFIG_NET_MULTI
 #define CONFIG_CMD_MII
 #define CONFIG_SYS_DCACHE_OFF
 #define CONFIG_RESET_PHY_R
diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h
index 348a25b..2c65d74 100644
--- a/include/configs/coreboot.h
+++ b/include/configs/coreboot.h
@@ -216,10 +216,4 @@ 
  */
 #define CONFIG_PCI
 
-/*-----------------------------------------------------------------------
- * Network device support
- */
-#define CONFIG_NET_MULTI
-
-
 #endif	/* __CONFIG_H */
diff --git a/include/configs/da850_am18xxevm.h b/include/configs/da850_am18xxevm.h
index 9b7bf1e..6fb3920 100644
--- a/include/configs/da850_am18xxevm.h
+++ b/include/configs/da850_am18xxevm.h
@@ -125,7 +125,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/ecovec.h b/include/configs/ecovec.h
index 2e2a9a7..4549a4c 100644
--- a/include/configs/ecovec.h
+++ b/include/configs/ecovec.h
@@ -88,7 +88,6 @@ 
 #define CONFIG_SH_I2C_BASE1		0xA4750000
 
 /* Ether */
-#define CONFIG_NET_MULTI 1
 #define CONFIG_SH_ETHER 1
 #define CONFIG_SH_ETHER_USE_PORT (0)
 #define CONFIG_SH_ETHER_PHY_ADDR (0x1f)
diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h
index 522487b..e2f0f74 100644
--- a/include/configs/efikamx.h
+++ b/include/configs/efikamx.h
@@ -206,7 +206,6 @@ 
 /* USB NET */
 #ifdef	CONFIG_CMD_NET
 #define	CONFIG_USB_ETHER_ASIX
-#define	CONFIG_NET_MULTI
 #define	CONFIG_CMD_PING
 #define	CONFIG_CMD_DHCP
 #endif
diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h
index c427dc7..5c14379 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -146,7 +146,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/ethernut5.h b/include/configs/ethernut5.h
index f878665..604d2dd 100644
--- a/include/configs/ethernut5.h
+++ b/include/configs/ethernut5.h
@@ -179,7 +179,6 @@ 
 #endif
 
 /* Ethernet */
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_MACB
 #define CONFIG_RMII
diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index aac3930..649e272 100644
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -113,7 +113,6 @@ 
 /*
  * Ethernet on SOC (FEC)
  */
-#define CONFIG_NET_MULTI
 #define CONFIG_FEC_MXC
 #define IMX_FEC_BASE	FEC_BASE_ADDR
 #define CONFIG_PHYLIB
diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h
index 39c841f..51eb1c1 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -179,7 +179,6 @@ 
  * Ethernet on SOC (FEC)
  */
 #ifdef	CONFIG_CMD_NET
-#define	CONFIG_NET_MULTI
 #define	CONFIG_ETHPRIME			"FEC0"
 #define	CONFIG_FEC_MXC
 #define	CONFIG_FEC_MXC_MULTI
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index b256317..4910dda 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -248,7 +248,6 @@ 
 #if defined(CONFIG_CMD_NET)
 
 /* Ethernet (SMSC9115 from SMSC9118 family) */
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
 #define CONFIG_SMC911X_BASE		0x2C000000
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index eb51ea9..0d78529 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -272,7 +272,6 @@ 
  *----------------------------------------------------------------------------
  */
 #if defined(CONFIG_CMD_NET)
-  #define CONFIG_NET_MULTI
   #define CONFIG_SMC911X		1
   #define CONFIG_SMC911X_32_BIT
   #define CONFIG_SMC911X_BASE     0x2C000000
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 8e8fa16..b5081b0 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -630,7 +630,6 @@ 
 #endif
 #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
@@ -641,11 +640,6 @@ 
 #endif /* CONFIG_PCI */
 
 #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/tam3517-common.h b/include/configs/tam3517-common.h
index 817d468..6682714 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -238,7 +238,6 @@ 
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 
 /* Defines for SPL */
 #define CONFIG_SPL