summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <festevam@gmail.com>2012-01-15 05:03:08 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-02-12 10:11:26 +0100
commitdb917fbfed5ab26d0b86d567a9729ed14c26cc99 (patch)
tree243bec5035ca41e6022828df144f9a1a52953372
parentfa47a28661719ec73479c96b12823fd4e7373314 (diff)
downloadu-boot-imx-db917fbfed5ab26d0b86d567a9729ed14c26cc99.zip
u-boot-imx-db917fbfed5ab26d0b86d567a9729ed14c26cc99.tar.gz
u-boot-imx-db917fbfed5ab26d0b86d567a9729ed14c26cc99.tar.bz2
configs: Remove CONFIG_NET_MULTI from board files
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> Acked-by: Mike Frysinger <vapier@gentoo.org> Acked-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Stefano Babic <sbabic@denx.de> Tested-by: Marek Vasut <marek.vasut@gmail.com> Tested-by: Heiko Schocher <hs@denx.de>
Diffstat
-rw-r--r--include/configs/P1010RDB.h4
-rw-r--r--include/configs/PM826.h2
-rw-r--r--include/configs/PM828.h2
-rw-r--r--include/configs/cam_enc_4xx.h1
-rw-r--r--include/configs/coreboot.h6
-rw-r--r--include/configs/ecovec.h1
-rw-r--r--include/configs/efikamx.h1
-rw-r--r--include/configs/enbw_cmc.h1
-rw-r--r--include/configs/ethernut5.h1
-rw-r--r--include/configs/flea3.h1
-rw-r--r--include/configs/m28evk.h1
-rw-r--r--include/configs/omap3_evm_common.h1
-rw-r--r--include/configs/omap3_mvblx.h1
-rw-r--r--include/configs/p1_p2_rdb_pc.h6
-rw-r--r--include/configs/tam3517-common.h1
15 files changed, 0 insertions, 30 deletions
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 5edd1aa..f2d3366 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 bd94cf3..14368df 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/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 83aec79..01390b1 100644
--- a/include/configs/enbw_cmc.h
+++ b/include/configs/enbw_cmc.h
@@ -145,7 +145,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 4efff09..4d59153 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -187,7 +187,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 a5746d1..b819d21 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -269,7 +269,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 778a4f9..3098c5a 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 f4963ac..afe1fff 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
generated by cgit v1.1 at 2024-11-27 07:52:08 +0000