diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 11:56:57 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:12 -0800 |
| commit | b41f192b6763948f878e1948770c7305211a2348 (patch) | |
| tree | 6db6a872deb63dd33bd5822725e75887a66beb08 /board/freescale | |
| parent | d46a4a137898d17c736d13bbe405b479aeb4483a (diff) | |
powerpc: B4420: Remove macro CONFIG_PPC_B4420
Replace CONFIG_PPC_B4420 with ARCH_B4420 in Kconfig and clean up
existing macros.
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/b4860qds/b4860qds.c | 6 | ||||
| -rw-r--r-- | board/freescale/b4860qds/b4860qds_crossbar_con.h | 4 | ||||
| -rw-r--r-- | board/freescale/b4860qds/eth_b4860qds.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index c2ceb8014e..83a70153e8 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -437,7 +437,7 @@ int configure_vsc3316_3308(void) } break; -#ifdef CONFIG_PPC_B4420 +#ifdef CONFIG_ARCH_B4420 case 0x17: case 0x18: /* @@ -496,7 +496,7 @@ int configure_vsc3316_3308(void) /* Configure VSC3308 crossbar switch */ ret = select_i2c_ch_pca(I2C_CH_VSC3308); switch (serdes2_prtcl) { -#ifdef CONFIG_PPC_B4420 +#ifdef CONFIG_ARCH_B4420 case 0x9d: #endif case 0x9E: @@ -929,7 +929,7 @@ int config_serdes2_refclks(void) * For this SerDes2's Refclk1 need to be set to 100MHz */ switch (serdes2_prtcl) { -#ifdef CONFIG_PPC_B4420 +#ifdef CONFIG_ARCH_B4420 case 0x9d: #endif case 0x9E: diff --git a/board/freescale/b4860qds/b4860qds_crossbar_con.h b/board/freescale/b4860qds/b4860qds_crossbar_con.h index fcccb8f9b3..901f8b0039 100644 --- a/board/freescale/b4860qds/b4860qds_crossbar_con.h +++ b/board/freescale/b4860qds/b4860qds_crossbar_con.h @@ -28,7 +28,7 @@ static int8_t vsc16_tx_sfp_sgmii_aurora[8][2] = { {15, 7}, {0, 1}, {7, 8}, {9, 0}, {5, 14}, {4, 15}, {2, 12}, {12, 13} }; -#ifdef CONFIG_PPC_B4420 +#ifdef CONFIG_ARCH_B4420 static int8_t vsc16_tx_sgmii_lane_cd[8][2] = { {5, 14}, {4, 15}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1} }; #endif @@ -54,7 +54,7 @@ static int8_t vsc16_rx_sfp_sgmii_aurora[8][2] = { {8, 15}, {0, 1}, {7, 8}, {1, 9}, {14, 11}, {15, 10}, {13, 3}, {12, 12} }; -#ifdef CONFIG_PPC_B4420 +#ifdef CONFIG_ARCH_B4420 static int8_t vsc16_rx_sgmii_lane_cd[8][2] = { {14, 11}, {15, 10}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1} }; #endif diff --git a/board/freescale/b4860qds/eth_b4860qds.c b/board/freescale/b4860qds/eth_b4860qds.c index 164ec0a47b..89a1883782 100644 --- a/board/freescale/b4860qds/eth_b4860qds.c +++ b/board/freescale/b4860qds/eth_b4860qds.c @@ -213,7 +213,7 @@ int board_eth_init(bd_t *bis) fm_info_set_phy_address(FM1_DTSEC6, CONFIG_SYS_FM1_ONBOARD_PHY2_ADDR); break; -#ifdef CONFIG_PPC_B4420 +#ifdef CONFIG_ARCH_B4420 case 0x17: case 0x18: /* Serdes 1: A-D SGMII, Configuring on board dual SGMII Phy */ |