This is long over due. All but two net drivers have been converted, but
those have now been dropped.
The only thing left to do is actually delete all references to NET_MULTI
and code that is compiled when that is not defined. So here we scrub the
core code.
Signed-off-by: Mike Frysinger vap...@gentoo.org
---
README |8 ++---
api/api_net.c |4 --
arch/arm/lib/board.c |2 -
arch/avr32/lib/board.c |2 -
arch/m68k/lib/board.c |2 -
arch/mips/lib/board.c |2 -
arch/nios2/lib/board.c |2 -
arch/powerpc/cpu/mpc8220/fec.c |3 +-
arch/powerpc/cpu/mpc8260/ether_fcc.c |3 +-
arch/powerpc/cpu/mpc8260/ether_scc.c |4 --
arch/powerpc/cpu/mpc85xx/ether_fcc.c |3 +-
arch/powerpc/cpu/ppc4xx/miiphy.c |7 ++--
arch/powerpc/include/asm/ppc4xx-emac.h |1 -
arch/powerpc/lib/board.c |2 -
arch/sparc/lib/board.c |2 -
arch/x86/lib/board.c |2 -
board/BuS/eb_cpux9k2/cpux9k2.c |2 -
board/cm-bf537e/cm-bf537e.c|2 -
board/cm-bf537u/cm-bf537u.c|2 -
board/evb64260/eth.c |2 +-
board/tcm-bf537/tcm-bf537.c|2 -
doc/README.m53017evb |1 -
doc/README.m5373evb|1 -
doc/README.m54455evb |1 -
doc/README.m5475evb|1 -
doc/README.usb |1 -
doc/feature-removal-schedule.txt | 19
drivers/net/4xx_enet.c |4 --
drivers/net/mcfmii.c |4 +-
drivers/net/mpc512x_fec.c |5 ---
include/net.h | 40 --
net/eth.c | 49 +++
net/net.c | 30 ---
net/nfs.c |2 -
net/tftp.c |4 --
35 files changed, 23 insertions(+), 198 deletions(-)
diff --git a/README b/README
index a43da97..c3717be 100644
--- a/README
+++ b/README
@@ -3460,12 +3460,10 @@ List of environment variables (most likely not
complete):
bootstopkey - see CONFIG_AUTOBOOT_STOP_STR
- ethprime - When CONFIG_NET_MULTI is enabled controls which
- interface is used first.
+ ethprime - controls which interface is used first.
- ethact - When CONFIG_NET_MULTI is enabled controls which
- interface is currently active. For example you
- can do the following
+ ethact - controls which interface is currently active.
+ For example you can do the following
= setenv ethact FEC
= ping 192.168.0.1 # traffic sent on FEC
diff --git a/api/api_net.c b/api/api_net.c
index afe072e..cd80ea5 100644
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -34,10 +34,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define DEBUG
#undef DEBUG
-#if !defined(CONFIG_NET_MULTI)
-#error API/net is currently only available for platforms with
CONFIG_NET_MULTI
-#endif
-
#ifdef DEBUG
#define debugf(fmt, args...) do { printf(%s(): , __func__); printf(fmt,
##args); } while (0)
#else
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 85320bc..85d86ee 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -586,9 +586,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 65473a1..3e1cc0d 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 1df50f1..b9ccb64 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 4f85bbd..cc75d3f 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)
