diff options
Diffstat (limited to 'drivers/net/fm')
| -rw-r--r-- | drivers/net/fm/Makefile | 34 | ||||
| -rw-r--r-- | drivers/net/fm/b4860.c | 7 | ||||
| -rw-r--r-- | drivers/net/fm/fm.h | 2 |
3 files changed, 21 insertions, 22 deletions
diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile index 316fef485d..08b3f27601 100644 --- a/drivers/net/fm/Makefile +++ b/drivers/net/fm/Makefile @@ -17,26 +17,24 @@ obj-$(CONFIG_SYS_FMAN_V3) += memac_phy.o obj-$(CONFIG_SYS_FMAN_V3) += memac.o # SoC specific SERDES support -obj-$(CONFIG_P1017) += p1023.o -obj-$(CONFIG_P1023) += p1023.o +obj-$(CONFIG_ARCH_P1023) += p1023.o # The P204x, P304x, and P5020 are the same -obj-$(CONFIG_PPC_P2041) += p5020.o -obj-$(CONFIG_PPC_P3041) += p5020.o -obj-$(CONFIG_PPC_P4080) += p4080.o -obj-$(CONFIG_PPC_P5020) += p5020.o -obj-$(CONFIG_PPC_P5040) += p5040.o -obj-$(CONFIG_PPC_T1040) += t1040.o -obj-$(CONFIG_PPC_T1042) += t1040.o +obj-$(CONFIG_ARCH_P2041) += p5020.o +obj-$(CONFIG_ARCH_P3041) += p5020.o +obj-$(CONFIG_ARCH_P4080) += p4080.o +obj-$(CONFIG_ARCH_P5020) += p5020.o +obj-$(CONFIG_ARCH_P5040) += p5040.o +obj-$(CONFIG_ARCH_T1040) += t1040.o +obj-$(CONFIG_ARCH_T1042) += t1040.o obj-$(CONFIG_PPC_T1020) += t1040.o obj-$(CONFIG_PPC_T1022) += t1040.o -obj-$(CONFIG_PPC_T1023) += t1024.o -obj-$(CONFIG_PPC_T1024) += t1024.o -obj-$(CONFIG_PPC_T2080) += t2080.o -obj-$(CONFIG_PPC_T2081) += t2080.o -obj-$(CONFIG_PPC_T4240) += t4240.o -obj-$(CONFIG_PPC_T4160) += t4240.o -obj-$(CONFIG_PPC_T4080) += t4240.o -obj-$(CONFIG_PPC_B4420) += b4860.o -obj-$(CONFIG_PPC_B4860) += b4860.o +obj-$(CONFIG_ARCH_T1023) += t1024.o +obj-$(CONFIG_ARCH_T1024) += t1024.o +obj-$(CONFIG_ARCH_T2080) += t2080.o +obj-$(CONFIG_ARCH_T2081) += t2080.o +obj-$(CONFIG_ARCH_T4240) += t4240.o +obj-$(CONFIG_ARCH_T4160) += t4240.o +obj-$(CONFIG_ARCH_B4420) += b4860.o +obj-$(CONFIG_ARCH_B4860) += b4860.o obj-$(CONFIG_LS1043A) += ls1043.o obj-$(CONFIG_ARCH_LS1046A) += ls1046.o diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index eb058c9c3d..5aeeb87282 100644 --- a/drivers/net/fm/b4860.c +++ b/drivers/net/fm/b4860.c @@ -47,7 +47,7 @@ void fman_enable_port(enum fm_port port) phy_interface_t fman_port_enet_if(enum fm_port port) { -#if defined(CONFIG_B4860QDS) +#if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS) u32 serdes2_prtcl; char buffer[HWCONFIG_BUFFER_SIZE]; char *buf = NULL; @@ -60,7 +60,8 @@ phy_interface_t fman_port_enet_if(enum fm_port port) /*B4860 has two 10Gig Mac*/ if ((port == FM1_10GEC1 || port == FM1_10GEC2) && ((is_serdes_configured(XAUI_FM1_MAC9)) || - #if !defined(CONFIG_B4860QDS) + #if (!defined(CONFIG_TARGET_B4860QDS) && \ + !defined(CONFIG_TARGET_B4R420QDS)) (is_serdes_configured(XFI_FM1_MAC9)) || (is_serdes_configured(XFI_FM1_MAC10)) || #endif @@ -68,7 +69,7 @@ phy_interface_t fman_port_enet_if(enum fm_port port) )) return PHY_INTERFACE_MODE_XGMII; -#if defined(CONFIG_B4860QDS) +#if defined(CONFIG_TARGET_B4860QDS) || defined(CONFIG_TARGET_B4420QDS) serdes2_prtcl = in_be32(&gur->rcwsr[4]) & FSL_CORENET2_RCWSR4_SRDS2_PRTCL; diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h index fa9bc9f42d..64cc9718d0 100644 --- a/drivers/net/fm/fm.h +++ b/drivers/net/fm/fm.h @@ -88,7 +88,7 @@ struct fm_port_global_pram { #define PRAM_MODE_GLOBAL 0x20000000 #define PRAM_MODE_GRACEFUL_STOP 0x00800000 -#if defined(CONFIG_P1017) || defined(CONFIG_P1023) +#if defined(CONFIG_ARCH_P1023) #define FM_FREE_POOL_SIZE 0x2000 /* 8K bytes */ #else #define FM_FREE_POOL_SIZE 0x20000 /* 128K bytes */ |