summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/lib/board.c2
-rw-r--r--arch/avr32/lib/board.c2
-rw-r--r--arch/m68k/lib/board.c2
-rw-r--r--arch/mips/lib/board.c2
-rw-r--r--arch/nios2/lib/board.c2
-rw-r--r--arch/powerpc/cpu/mpc8220/fec.c3
-rw-r--r--arch/powerpc/cpu/mpc8260/ether_fcc.c3
-rw-r--r--arch/powerpc/cpu/mpc8260/ether_scc.c4
-rw-r--r--arch/powerpc/cpu/mpc85xx/ether_fcc.c3
-rw-r--r--arch/powerpc/cpu/ppc4xx/miiphy.c7
-rw-r--r--arch/powerpc/include/asm/ppc4xx-emac.h1
-rw-r--r--arch/powerpc/lib/board.c2
-rw-r--r--arch/sparc/lib/board.c2
-rw-r--r--arch/x86/lib/board.c2
14 files changed, 6 insertions, 31 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 0efea66ba8..705d4d2f69 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -588,9 +588,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
puts("Net: ");
-#endif
eth_initialize(gd->bd);
#if defined(CONFIG_RESET_PHY_R)
debug("Reset Ethernet PHY\n");
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 65473a107b..3e1cc0d6c9 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -330,9 +330,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
s = getenv("bootfile");
if (s)
copy_filename(BootFile, s, sizeof(BootFile));
-#if defined(CONFIG_NET_MULTI)
puts("Net: ");
-#endif
eth_initialize(gd->bd);
#endif
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 1df50f1fe5..b9ccb64059 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -606,11 +606,9 @@ void board_init_r (gd_t *id, ulong dest_addr)
#if defined(FEC_ENET)
eth_init(bd);
#endif
-#if defined(CONFIG_NET_MULTI)
puts ("Net: ");
eth_initialize (bd);
#endif
-#endif
#ifdef CONFIG_POST
post_run (NULL, POST_RAM | post_bootmode_get(0));
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index 4f85bbdab2..cc75d3ffa1 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -372,9 +372,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
puts ("Net: ");
-#endif
eth_initialize(gd->bd);
#endif
diff --git a/arch/nios2/lib/board.c b/arch/nios2/lib/board.c
index f6c6bc166b..65de26e5c9 100644
--- a/arch/nios2/lib/board.c
+++ b/arch/nios2/lib/board.c
@@ -158,9 +158,7 @@ void board_init (void)
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
puts ("Net: ");
-#endif
eth_initialize (bd);
#endif
diff --git a/arch/powerpc/cpu/mpc8220/fec.c b/arch/powerpc/cpu/mpc8220/fec.c
index 00879dff5c..bcda8a2b27 100644
--- a/arch/powerpc/cpu/mpc8220/fec.c
+++ b/arch/powerpc/cpu/mpc8220/fec.c
@@ -15,8 +15,7 @@
#include "fec.h"
#undef DEBUG
-#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
- defined(CONFIG_MPC8220_FEC)
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_MPC8220_FEC)
#if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII))
#error "CONFIG_MII has to be defined!"
diff --git a/arch/powerpc/cpu/mpc8260/ether_fcc.c b/arch/powerpc/cpu/mpc8260/ether_fcc.c
index b05f5762e5..879ec0ea23 100644
--- a/arch/powerpc/cpu/mpc8260/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_fcc.c
@@ -53,8 +53,7 @@
DECLARE_GLOBAL_DATA_PTR;
-#if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET) && \
- defined(CONFIG_NET_MULTI)
+#if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET)
static struct ether_fcc_info_s
{
diff --git a/arch/powerpc/cpu/mpc8260/ether_scc.c b/arch/powerpc/cpu/mpc8260/ether_scc.c
index 2870a9cf94..1c040f0f5b 100644
--- a/arch/powerpc/cpu/mpc8260/ether_scc.c
+++ b/arch/powerpc/cpu/mpc8260/ether_scc.c
@@ -43,10 +43,6 @@
#include <command.h>
#include <config.h>
-#ifndef CONFIG_NET_MULTI
-#error "CONFIG_NET_MULTI must be defined."
-#endif
-
#if (CONFIG_ETHER_INDEX == 1)
# define PROFF_ENET PROFF_SCC1
# define CPM_CR_ENET_PAGE CPM_CR_SCC1_PAGE
diff --git a/arch/powerpc/cpu/mpc85xx/ether_fcc.c b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
index f69b2e649f..41c3c84ae5 100644
--- a/arch/powerpc/cpu/mpc85xx/ether_fcc.c
+++ b/arch/powerpc/cpu/mpc85xx/ether_fcc.c
@@ -52,8 +52,7 @@
#include <miiphy.h>
#endif
-#if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET) && \
- defined(CONFIG_NET_MULTI)
+#if defined(CONFIG_ETHER_ON_FCC) && defined(CONFIG_CMD_NET)
static struct ether_fcc_info_s
{
diff --git a/arch/powerpc/cpu/ppc4xx/miiphy.c b/arch/powerpc/cpu/ppc4xx/miiphy.c
index 9f8f8fa18c..297155fdaf 100644
--- a/arch/powerpc/cpu/ppc4xx/miiphy.c
+++ b/arch/powerpc/cpu/ppc4xx/miiphy.c
@@ -187,10 +187,9 @@ int phy_setup_aneg (char *devname, unsigned char addr)
*/
unsigned int miiphy_getemac_offset(u8 addr)
{
-#if (defined(CONFIG_440) && \
+#if defined(CONFIG_440) && \
!defined(CONFIG_440SP) && !defined(CONFIG_440SPE) && \
- !defined(CONFIG_460EX) && !defined(CONFIG_460GT)) && \
- defined(CONFIG_NET_MULTI)
+ !defined(CONFIG_460EX) && !defined(CONFIG_460GT)
unsigned long zmii;
unsigned long eoffset;
@@ -228,7 +227,7 @@ unsigned int miiphy_getemac_offset(u8 addr)
return (eoffset);
#else
-#if defined(CONFIG_NET_MULTI) && defined(CONFIG_405EX)
+#if defined(CONFIG_405EX)
unsigned long rgmii;
int devnum = 1;
diff --git a/arch/powerpc/include/asm/ppc4xx-emac.h b/arch/powerpc/include/asm/ppc4xx-emac.h
index 25a0512b74..a219fa97fa 100644
--- a/arch/powerpc/include/asm/ppc4xx-emac.h
+++ b/arch/powerpc/include/asm/ppc4xx-emac.h
@@ -136,7 +136,6 @@ typedef struct emac_4xx_hw_st {
#if defined(CONFIG_440GX) || defined(CONFIG_460GT)
#define EMAC_NUM_DEV 4
#elif (defined(CONFIG_440) || defined(CONFIG_405EP)) && \
- defined(CONFIG_NET_MULTI) && \
!defined(CONFIG_440SP) && !defined(CONFIG_440SPE)
#define EMAC_NUM_DEV 2
#else
diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 9885b143ac..4fd0149805 100644
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -960,10 +960,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
WATCHDOG_RESET ();
puts ("Net: ");
-#endif
eth_initialize (bd);
#endif
diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c
index 6b705e5319..af4f0356a4 100644
--- a/arch/sparc/lib/board.c
+++ b/arch/sparc/lib/board.c
@@ -387,10 +387,8 @@ void board_init_f(ulong bootflag)
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
WATCHDOG_RESET();
puts("Net: ");
-#endif
eth_initialize(bd);
#endif
diff --git a/arch/x86/lib/board.c b/arch/x86/lib/board.c
index b1b8680ec7..2309e00be1 100644
--- a/arch/x86/lib/board.c
+++ b/arch/x86/lib/board.c
@@ -393,10 +393,8 @@ void board_init_r(gd_t *id, ulong dest_addr)
bb_miiphy_init();
#endif
#if defined(CONFIG_CMD_NET)
-#if defined(CONFIG_NET_MULTI)
WATCHDOG_RESET();
puts("Net: ");
-#endif
eth_initialize(gd->bd);
#endif
OpenPOWER on IntegriCloud