* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
@ 2012-01-11 12:47 Fabio Estevam
2012-01-11 12:49 ` Marek Vasut
` (7 more replies)
0 siblings, 8 replies; 14+ messages in thread
From: Fabio Estevam @ 2012-01-11 12:47 UTC (permalink / raw)
To: u-boot
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>
---
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(-)
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index af4609f..a9251b4 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -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
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..9297dd0 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
@@ -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"
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
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
@ 2012-01-11 12:49 ` Marek Vasut
2012-01-11 13:38 ` Heiko Schocher
` (6 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Marek Vasut @ 2012-01-11 12:49 UTC (permalink / raw)
To: u-boot
> 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: Marek Vasut <marek.vasut@gmail.com>
For efikamx:
Tested-by: Marek Vasut <marek.vasut@gmail.com>
> ---
> 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(-)
>
> diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
> index af4609f..a9251b4 100644
> --- a/include/configs/P1010RDB.h
> +++ b/include/configs/P1010RDB.h
> @@ -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
> 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..9297dd0 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
> @@ -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"
> 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
2012-01-11 12:49 ` Marek Vasut
@ 2012-01-11 13:38 ` Heiko Schocher
2012-01-11 14:06 ` Kumar Gala
` (5 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Heiko Schocher @ 2012-01-11 13:38 UTC (permalink / raw)
To: u-boot
Hello Fabio,
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>
> ---
> 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(-)
Acked-by: Heiko Schocher <hs@denx.de>
Tested on the enbw_cmc and cam_enc_4xx board, so:
Tested-by: Heiko Schocher <hs@denx.de>
Thanks!
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
2012-01-11 12:49 ` Marek Vasut
2012-01-11 13:38 ` Heiko Schocher
@ 2012-01-11 14:06 ` Kumar Gala
2012-01-11 14:06 ` Stefano Babic
` (4 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Kumar Gala @ 2012-01-11 14:06 UTC (permalink / raw)
To: u-boot
On Jan 11, 2012, at 6:47 AM, 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>
> ---
> 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(-)
Acked-by: Kumar Gala <galak@kernel.crashing.org>
For P1010RDB & p1_p2_rdb_pc.h
- k
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
` (2 preceding siblings ...)
2012-01-11 14:06 ` Kumar Gala
@ 2012-01-11 14:06 ` Stefano Babic
2012-01-11 16:19 ` Tom Rini
` (3 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Stefano Babic @ 2012-01-11 14:06 UTC (permalink / raw)
To: u-boot
On 11/01/2012 13:47, 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>
> ---
> 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(-)
>
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
` (3 preceding siblings ...)
2012-01-11 14:06 ` Stefano Babic
@ 2012-01-11 16:19 ` Tom Rini
2012-01-14 10:08 ` Stefano Babic
` (2 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2012-01-11 16:19 UTC (permalink / raw)
To: u-boot
On Wed, Jan 11, 2012 at 5:47 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>
> ---
> ?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(-)
Acked-by: Tom Rini <trini@ti.com>
For the TI parts.
--
Tom
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
` (4 preceding siblings ...)
2012-01-11 16:19 ` Tom Rini
@ 2012-01-14 10:08 ` Stefano Babic
2012-01-15 1:12 ` Mike Frysinger
2012-01-15 0:53 ` Mike Frysinger
2012-01-15 15:03 ` [U-Boot] [PATCH v2] " Fabio Estevam
7 siblings, 1 reply; 14+ messages in thread
From: Stefano Babic @ 2012-01-14 10:08 UTC (permalink / raw)
To: u-boot
On 11/01/2012 13:47, 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>
> ---
> 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(-)
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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
` (5 preceding siblings ...)
2012-01-14 10:08 ` Stefano Babic
@ 2012-01-15 0:53 ` Mike Frysinger
2012-01-15 15:03 ` [U-Boot] [PATCH v2] " Fabio Estevam
7 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2012-01-15 0:53 UTC (permalink / raw)
To: u-boot
On Wednesday 11 January 2012 07:47:31 Fabio Estevam wrote:
> CONFIG_NET_MULTI is not used anymore, so remove it from board files.
NAK: idea: good. actual patch: buggy :(.
> --- a/include/configs/P1010RDB.h
> +++ b/include/configs/P1010RDB.h
>
> -#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.
> --- a/include/configs/p1_p2_rdb_pc.h
> +++ b/include/configs/p1_p2_rdb_pc.h
>
> #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"
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>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-14 10:08 ` Stefano Babic
@ 2012-01-15 1:12 ` Mike Frysinger
2012-01-15 14:13 ` Stefano Babic
0 siblings, 1 reply; 14+ messages in thread
From: Mike Frysinger @ 2012-01-15 1:12 UTC (permalink / raw)
To: u-boot
On Saturday 14 January 2012 05:08:46 Stefano Babic wrote:
> On 11/01/2012 13:47, Fabio Estevam wrote:
> > 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(-)
>
> Applied to u-boot-imx after rebasing on u-boot-arm/master
> (include/configs/da850_am18xxevm.h was dropped in a recent patch), thanks.
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>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files
2012-01-15 1:12 ` Mike Frysinger
@ 2012-01-15 14:13 ` Stefano Babic
0 siblings, 0 replies; 14+ messages in thread
From: Stefano Babic @ 2012-01-15 14:13 UTC (permalink / raw)
To: u-boot
On 15/01/2012 02:12, Mike Frysinger wrote:
> On Saturday 14 January 2012 05:08:46 Stefano Babic wrote:
>> On 11/01/2012 13:47, Fabio Estevam wrote:
>>> 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(-)
>>
>> Applied to u-boot-imx after rebasing on u-boot-arm/master
>> (include/configs/da850_am18xxevm.h was dropped in a recent
>> patch), thanks.
>
> might want to drop it considering it's buggy
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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] configs: Remove CONFIG_NET_MULTI from board files
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
` (6 preceding siblings ...)
2012-01-15 0:53 ` Mike Frysinger
@ 2012-01-15 15:03 ` Fabio Estevam
2012-01-15 15:06 ` Tom Rini
` (2 more replies)
7 siblings, 3 replies; 14+ messages in thread
From: Fabio Estevam @ 2012-01-15 15:03 UTC (permalink / raw)
To: u-boot
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(-)
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
--
1.7.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] configs: Remove CONFIG_NET_MULTI from board files
2012-01-15 15:03 ` [U-Boot] [PATCH v2] " Fabio Estevam
@ 2012-01-15 15:06 ` Tom Rini
2012-01-15 18:38 ` Mike Frysinger
2012-01-17 10:22 ` Stefano Babic
2 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2012-01-15 15:06 UTC (permalink / raw)
To: u-boot
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.
--
Tom
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] configs: Remove CONFIG_NET_MULTI from board files
2012-01-15 15:03 ` [U-Boot] [PATCH v2] " Fabio Estevam
2012-01-15 15:06 ` Tom Rini
@ 2012-01-15 18:38 ` Mike Frysinger
2012-01-17 10:22 ` Stefano Babic
2 siblings, 0 replies; 14+ messages in thread
From: Mike Frysinger @ 2012-01-15 18:38 UTC (permalink / raw)
To: u-boot
Acked-by: Mike Frysinger <vapier@gentoo.org>
-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>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [PATCH v2] configs: Remove CONFIG_NET_MULTI from board files
2012-01-15 15:03 ` [U-Boot] [PATCH v2] " Fabio Estevam
2012-01-15 15:06 ` Tom Rini
2012-01-15 18:38 ` Mike Frysinger
@ 2012-01-17 10:22 ` Stefano Babic
2 siblings, 0 replies; 14+ messages in thread
From: Stefano Babic @ 2012-01-17 10:22 UTC (permalink / raw)
To: u-boot
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
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2012-01-17 10:22 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-11 12:47 [U-Boot] [PATCH] configs: Remove CONFIG_NET_MULTI from board files Fabio Estevam
2012-01-11 12:49 ` Marek Vasut
2012-01-11 13:38 ` Heiko Schocher
2012-01-11 14:06 ` Kumar Gala
2012-01-11 14:06 ` Stefano Babic
2012-01-11 16:19 ` Tom Rini
2012-01-14 10:08 ` Stefano Babic
2012-01-15 1:12 ` Mike Frysinger
2012-01-15 14:13 ` Stefano Babic
2012-01-15 0:53 ` Mike Frysinger
2012-01-15 15:03 ` [U-Boot] [PATCH v2] " Fabio Estevam
2012-01-15 15:06 ` Tom Rini
2012-01-15 18:38 ` Mike Frysinger
2012-01-17 10:22 ` Stefano Babic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox