From d46a4a137898d17c736d13bbe405b479aeb4483a Mon Sep 17 00:00:00 2001 From: York Sun Date: Fri, 18 Nov 2016 11:47:35 -0800 Subject: powerpc: B4860QDS: Remove macro CONFIG_B4860QDS Use CONFIG_TARGET_B4860QDS instead. Signed-off-by: York Sun --- drivers/net/fm/b4860.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index eb058c9c3d6..5aeeb872824 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; -- cgit v1.2.3