diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 11:47:35 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:12 -0800 |
| commit | d46a4a137898d17c736d13bbe405b479aeb4483a (patch) | |
| tree | 32c2dbde5c7585dde8f1375b44ba00471fdb70b5 /drivers/net | |
| parent | 3006ebc37e232e68464cbb196e0de222ebe7b238 (diff) | |
| download | u-boot-imx-d46a4a137898d17c736d13bbe405b479aeb4483a.zip u-boot-imx-d46a4a137898d17c736d13bbe405b479aeb4483a.tar.gz u-boot-imx-d46a4a137898d17c736d13bbe405b479aeb4483a.tar.bz2 | |
powerpc: B4860QDS: Remove macro CONFIG_B4860QDS
Use CONFIG_TARGET_B4860QDS instead.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fm/b4860.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/fm/b4860.c b/drivers/net/fm/b4860.c index eb058c9..5aeeb87 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; |