diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-29 19:42:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-29 19:42:48 -0500 |
| commit | 6b29a395b62965eef6b5065d3a526a8588a92038 (patch) | |
| tree | d9404d155aa96dd58ff9d02cdb2a30e7136405da /arch/powerpc/cpu/mpc85xx/t4240_serdes.c | |
| parent | dbd5df89d65172f94dec78af809f1e50dbd61fe6 (diff) | |
| parent | e8a390f0189c5868f2fa305004821bcfcd71d32c (diff) | |
| download | u-boot-imx-6b29a395b62965eef6b5065d3a526a8588a92038.zip u-boot-imx-6b29a395b62965eef6b5065d3a526a8588a92038.tar.gz u-boot-imx-6b29a395b62965eef6b5065d3a526a8588a92038.tar.bz2 | |
Merge git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/t4240_serdes.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c index 7b43b28..3fc527d 100644 --- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c @@ -15,7 +15,7 @@ struct serdes_config { u8 lanes[SRDS_MAX_LANES]; }; -#ifdef CONFIG_PPC_T4240 +#ifdef CONFIG_ARCH_T4240 static const struct serdes_config serdes1_cfg_tbl[] = { /* SerDes 1 */ {1, {XAUI_FM1_MAC9, XAUI_FM1_MAC9, @@ -263,7 +263,7 @@ static const struct serdes_config serdes4_cfg_tbl[] = { {18, {PCIE3, PCIE3, PCIE3, PCIE3, AURORA, AURORA, AURORA, AURORA}}, {} }; -#elif defined(CONFIG_PPC_T4160) || defined(CONFIG_PPC_T4080) +#elif defined(CONFIG_ARCH_T4160) static const struct serdes_config serdes1_cfg_tbl[] = { /* SerDes 1 */ {1, {NONE, NONE, NONE, NONE, |