configs: Remove CONFIG_NET_MULTI from board files

PATCH Superseded Fabio Estevam 7 participants 14 messages Jan 11, 2012 – Jan 17, 2012

lore

Share & tools

lore

Fabio Estevam

author

2012-01-11 12:47 UTC #0 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

CONFIG_NET_MULTI is not used anymore, so remove it from board files.

Cc Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Kumar Gala <[email protected]>

Cc Sandeep Paulraj <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
 include/configs/P1010RDB.h         |    5 -----
 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     |    7 -------
 include/configs/tam3517-common.h   |    1 -
 16 files changed, 0 insertions(+), 33 deletions(-)

include/configs/P1010RDB.h +0 -5

index af4609f..a9251b4 100644
@@ -518,11 +518,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #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

include/configs/PM826.h +0 -2

index f4f9305..cde0fd6 100644
@@ -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.

include/configs/PM828.h +0 -2

index 28666d6..74ced5a 100644
@@ -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.

include/configs/cam_enc_4xx.h +0 -1

index a21d448..50a967c 100644
@@ -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

include/configs/coreboot.h +0 -6

index 348a25b..2c65d74 100644
@@ -216,10 +216,4 @@
  */
 #define CONFIG_PCI
 
-/*-----------------------------------------------------------------------
- * Network device support
- */
-#define CONFIG_NET_MULTI
-
-
 #endif	/* __CONFIG_H */

include/configs/da850_am18xxevm.h +0 -1

index 9b7bf1e..6fb3920 100644
@@ -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

include/configs/ecovec.h +0 -1

index 2e2a9a7..4549a4c 100644
@@ -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)

include/configs/efikamx.h +0 -1

index 522487b..e2f0f74 100644
@@ -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

include/configs/enbw_cmc.h +0 -1

index c427dc7..5c14379 100644
@@ -146,7 +146,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
-#define CONFIG_NET_MULTI
 #endif
 
 /*

include/configs/ethernut5.h +0 -1

index f878665..604d2dd 100644
@@ -179,7 +179,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_MACB
 #define CONFIG_RMII

include/configs/flea3.h +0 -1

index aac3930..649e272 100644
@@ -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

include/configs/m28evk.h +0 -1

index 39c841f..51eb1c1 100644
@@ -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

include/configs/omap3_evm_common.h +0 -1

index b256317..4910dda 100644
@@ -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

include/configs/omap3_mvblx.h +0 -1

index eb51ea9..0d78529 100644
@@ -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

include/configs/p1_p2_rdb_pc.h +0 -7

index 8e8fa16..9297dd0 100644
@@ -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

@@ -640,12 +639,6 @@
 #define CONFIG_DOS_PARTITION
 #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"

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

index 817d468..6682714 100644
@@ -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

Signature · 1 line

1.7.1

Marek Vasut

2012-01-11 12:49 UTC #1 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

Quoted 7 lines

Acked-by Marek Vasut <[email protected]>

For efikamx:

Tested-by Marek Vasut <[email protected]>

Quoted 240 lines

---
 include/configs/P1010RDB.h         |    5 -----
 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     |    7 -------
 include/configs/tam3517-common.h   |    1 -
 16 files changed, 0 insertions(+), 33 deletions(-)

include/configs/P1010RDB.h +0 -5

index af4609f..a9251b4 100644
@@ -518,11 +518,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #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

include/configs/PM826.h +0 -2

index f4f9305..cde0fd6 100644
@@ -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

include/configs/PM828.h +0 -2

@@ -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

include/configs/cam_enc_4xx.h +0 -1

@@ -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

include/configs/coreboot.h +0 -6

index 348a25b..2c65d74 100644
@@ -216,10 +216,4 @@
  */
 #define CONFIG_PCI
 
-/*-----------------------------------------------------------------------
- * Network device support
- */
-#define CONFIG_NET_MULTI
-
-
 #endif	/* __CONFIG_H */

(quoted diff) +0 -0

b/include/configs/da850_am18xxevm.h index 9b7bf1e..6fb3920 100644

include/configs/da850_am18xxevm.h +0 -1

@@ -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

include/configs/ecovec.h +0 -1

index 2e2a9a7..4549a4c 100644
@@ -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)

include/configs/efikamx.h +0 -1

index 522487b..e2f0f74 100644
@@ -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

include/configs/enbw_cmc.h +0 -1

index c427dc7..5c14379 100644
@@ -146,7 +146,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
-#define CONFIG_NET_MULTI
 #endif
 
 /*

include/configs/ethernut5.h +0 -1

index f878665..604d2dd 100644
@@ -179,7 +179,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_MACB
 #define CONFIG_RMII

include/configs/flea3.h +0 -1

index aac3930..649e272 100644
@@ -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

include/configs/m28evk.h +0 -1

index 39c841f..51eb1c1 100644
@@ -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

(quoted diff) +0 -0

b/include/configs/omap3_evm_common.h index b256317..4910dda 100644

include/configs/omap3_evm_common.h +0 -1

@@ -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

include/configs/omap3_mvblx.h +0 -2

index eb51ea9..0d78529 100644
@@ -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

(quoted diff) +0 -0

b/include/configs/p1_p2_rdb_pc.h index 8e8fa16..9297dd0 100644

include/configs/p1_p2_rdb_pc.h +0 -7

@@ -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

@@ -640,12 +639,6 @@
 #define CONFIG_DOS_PARTITION
 #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"

(quoted diff) +0 -0

b/include/configs/tam3517-common.h index 817d468..6682714 100644

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

@@ -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

Heiko Schocher

2012-01-11 13:38 UTC #2 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Hello Fabio,

Quoted 17 lines · Fabio Estevam

Quoted 8 lines

 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     |    7 -------
 include/configs/tam3517-common.h   |    1 -
 16 files changed, 0 insertions(+), 33 deletions(-)

Acked-by Heiko Schocher <[email protected]>

Tested on the enbw_cmc and cam_enc_4xx board, so:

Tested-by Heiko Schocher <[email protected]>

Thanks!

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Kumar Gala

2012-01-11 14:06 UTC #3 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Quoted 17 lines · Fabio Estevam

Quoted 8 lines

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     |    7 -------
include/configs/tam3517-common.h   |    1 -
16 files changed, 0 insertions(+), 33 deletions(-)

Acked-by Kumar Gala <[email protected]>

For P1010RDB & p1_p2_rdb_pc.h

- k

Stefano Babic

2012-01-11 14:06 UTC #4 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Quoted 17 lines · Fabio Estevam

Quoted 9 lines

 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     |    7 -------
 include/configs/tam3517-common.h   |    1 -
 16 files changed, 0 insertions(+), 33 deletions(-)

Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Tom Rini

2012-01-11 16:19 UTC #5 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Quoted 24 lines · Fabio Estevam

CONFIG_NET_MULTI is not used anymore, so remove it from board files.

Cc Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Kumar Gala <[email protected]>

Cc Sandeep Paulraj <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---

?include/configs/P1010RDB.h ? ? ? ? | ? ?5 -----
?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 ? ? | ? ?7 -------
?include/configs/tam3517-common.h ? | ? ?1 -

Quoted 1 line

Acked-by Tom Rini <[email protected]>

For the TI parts.

Signature · 1 line

Tom

Stefano Babic

2012-01-14 10:08 UTC #6 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Quoted 17 lines · Fabio Estevam

Quoted 8 lines

 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     |    7 -------
 include/configs/tam3517-common.h   |    1 -
 16 files changed, 0 insertions(+), 33 deletions(-)

Applied to u-boot-imx after rebasing on u-boot-arm/master (include/configs/da850_am18xxevm.h was dropped in a recent patch), thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Mike Frysinger

2012-01-15 01:12 UTC #7 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

Quoted 21 lines · On Saturday 14 January 2012 05:08:46 Stefano Babic wrote:

Quoted 11 lines · Fabio Estevam

CONFIG_NET_MULTI is not used anymore, so remove it from board files.

 include/configs/P1010RDB.h         |    5 -----
 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 -

Quoted 8 lines

 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     |    7 -------
 include/configs/tam3517-common.h   |    1 -
 16 files changed, 0 insertions(+), 33 deletions(-)

Quoted 2 lines

might want to drop it considering it's buggy
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120114/9e1671b3/attachment.pgp>

Stefano Babic

2012-01-15 14:13 UTC #8 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

Quoted 23 lines · Mike Frysinger

Quoted 22 lines · On Saturday 14 January 2012 05:08:46 Stefano Babic wrote:

Quoted 20 lines · Fabio Estevam

CONFIG_NET_MULTI is not used anymore, so remove it from board files.

include/configs/P1010RDB.h         |    5 ----- 
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     |    7 ------- 
include/configs/tam3517-common.h   |    1 - 16 files changed, 0

insertions(+), 33 deletions(-)

Quoted 5 lines

Right, I have not seen your comment, thanks. Dropped from u-boot-imx.

Fabio, changes for P1010RDB are buggy - can you post a new version fixing it ?

Thanks,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

Mike Frysinger

NAK

2012-01-15 00:53 UTC #9 lore raw

PATCH 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Quoted 1 line · On Wednesday 11 January 2012 07:47:31 Fabio Estevam wrote:

NAK: idea: good. actual patch: buggy :(.

include/configs/P1010RDB.h extern unsigned long get_sdram_size(void); · line 523

Quoted 11 lines

include/configs/P1010RDB.h +0 -5

 
-#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

you sure this is correct ? looks like you deleted 2 if statements but only 1 endif.

Quoted 5 lines

include/configs/p1_p2_rdb_pc.h line 644

Quoted 10 lines

include/configs/p1_p2_rdb_pc.h +0 -6

 
-#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"

same issue here
-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120114/3d46b22f/attachment.pgp>

Fabio Estevam

author

2012-01-15 15:03 UTC #10 lore raw

PATCH v2 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

CONFIG_NET_MULTI is not used anymore, so remove it from board files.

Cc Marek Vasut <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Kumar Gala <[email protected]>

Cc Sandeep Paulraj <[email protected]>

Signed-off-by Fabio Estevam <[email protected]>

---
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(-)

include/configs/P1010RDB.h +0 -4

index af4609f..2ee2619 100644
@@ -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

include/configs/PM826.h +0 -2

index f4f9305..cde0fd6 100644
@@ -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.

include/configs/PM828.h +0 -2

index 28666d6..74ced5a 100644
@@ -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.

include/configs/cam_enc_4xx.h +0 -1

index a21d448..50a967c 100644
@@ -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

include/configs/coreboot.h +0 -6

index 348a25b..2c65d74 100644
@@ -216,10 +216,4 @@
  */
 #define CONFIG_PCI
 
-/*-----------------------------------------------------------------------
- * Network device support
- */
-#define CONFIG_NET_MULTI
-
-
 #endif	/* __CONFIG_H */

include/configs/da850_am18xxevm.h +0 -1

index 9b7bf1e..6fb3920 100644
@@ -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

include/configs/ecovec.h +0 -1

index 2e2a9a7..4549a4c 100644
@@ -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)

include/configs/efikamx.h +0 -1

index 522487b..e2f0f74 100644
@@ -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

include/configs/enbw_cmc.h +0 -1

index c427dc7..5c14379 100644
@@ -146,7 +146,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT	10
-#define CONFIG_NET_MULTI
 #endif
 
 /*

include/configs/ethernut5.h +0 -1

index f878665..604d2dd 100644
@@ -179,7 +179,6 @@
 #endif
 
 /* Ethernet */
-#define CONFIG_NET_MULTI
 #define CONFIG_NET_RETRY_COUNT		20
 #define CONFIG_MACB
 #define CONFIG_RMII

include/configs/flea3.h +0 -1

index aac3930..649e272 100644
@@ -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

include/configs/m28evk.h +0 -1

index 39c841f..51eb1c1 100644
@@ -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

include/configs/omap3_evm_common.h +0 -1

index b256317..4910dda 100644
@@ -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

include/configs/omap3_mvblx.h +0 -1

index eb51ea9..0d78529 100644
@@ -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

include/configs/p1_p2_rdb_pc.h +0 -6

index 8e8fa16..b5081b0 100644
@@ -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"

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

index 817d468..6682714 100644
@@ -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

Signature · 1 line

1.7.1

Tom Rini

2012-01-15 15:06 UTC #11 lore raw

PATCH v2 1/1 configs: Remove CONFIG_NET_MULTI from board files

Quoted 7 lines · Fabio Estevam

Acked-by Tom Rini <[email protected]>

For the TI bits.

Signature · 1 line

Tom

Mike Frysinger

2012-01-15 18:38 UTC #12 lore raw

PATCH v2 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Acked-by Mike Frysinger <[email protected]>

-mike
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120115/5c1dde64/attachment.pgp>

Stefano Babic

2012-01-17 10:22 UTC #13 lore raw

PATCH v2 1/1 configs: Remove CONFIG_NET_MULTI from board files

In reply to Fabio Estevam

Quoted 8 lines · Fabio Estevam

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================