From 652a7bbd87d322c49ffe138b98563dc6c8cd2885 Mon Sep 17 00:00:00 2001 From: York Sun Date: Mon, 21 Nov 2016 13:31:34 -0800 Subject: powerpc: T4160: Remove macro CONFIG_PPC_T4160 Use CONFIG_ARCH_T4160 instead. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/powerpc/cpu/mpc85xx/t4240_serdes.c') diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c index 7b43b28..4b73e76 100644 --- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c @@ -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) || defined(CONFIG_PPC_T4080) static const struct serdes_config serdes1_cfg_tbl[] = { /* SerDes 1 */ {1, {NONE, NONE, NONE, NONE, -- cgit v1.1 From 26bc57da0ac1ed5769e53b0ef561fd4f08c020c7 Mon Sep 17 00:00:00 2001 From: York Sun Date: Mon, 21 Nov 2016 13:35:41 -0800 Subject: powerpc: T4240: Remove macro CONFIG_PPC_T4240 Use CONFIG_ARCH_T4240 from Kconfig instead. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/powerpc/cpu/mpc85xx/t4240_serdes.c') diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c index 4b73e76..1a5bcb1 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, -- cgit v1.1 From cdb72c5212c54dba2275c132b14e0df77d2040a9 Mon Sep 17 00:00:00 2001 From: York Sun Date: Mon, 21 Nov 2016 13:41:30 -0800 Subject: powerpc: T4080: Drop configuration for T4080 There is no T4080 target. Drop related macros. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/t4240_serdes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/powerpc/cpu/mpc85xx/t4240_serdes.c') diff --git a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c index 1a5bcb1..3fc527d 100644 --- a/arch/powerpc/cpu/mpc85xx/t4240_serdes.c +++ b/arch/powerpc/cpu/mpc85xx/t4240_serdes.c @@ -263,7 +263,7 @@ static const struct serdes_config serdes4_cfg_tbl[] = { {18, {PCIE3, PCIE3, PCIE3, PCIE3, AURORA, AURORA, AURORA, AURORA}}, {} }; -#elif defined(CONFIG_ARCH_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, -- cgit v1.1