From e2a53458a7ab375233048e922c4adf494866a78f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 2 Oct 2011 10:01:27 +0000 Subject: net: drop !NET_MULTI code 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 --- 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 -- 7 files changed, 6 insertions(+), 17 deletions(-) (limited to 'arch/powerpc') 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 #include -#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 #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 -- cgit v1.2.1