Signed-off-by: Tom Rini trini@konsulko.com --- board/freescale/common/pixis.c | 2 +- board/freescale/mpc8548cds/mpc8548cds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- drivers/net/tsec.c | 2 +- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/ls1021aqds.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 4 ++-- include/configs/socrates.h | 4 ++-- scripts/config_whitelist.txt | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index 87deb4538a22..ce60ec2c10f6 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -308,7 +308,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, switch_mask = PIXIS_VCFGEN1_TSEC2SER; break; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 case 3: mask = PIXIS_VSPEED2_TSEC3SER; switch_mask = PIXIS_VCFGEN1_TSEC3SER; diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 7ef204763eaa..cbe8e0ddca99 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -216,7 +216,7 @@ int board_eth_init(struct bd_info *bis) SET_STD_TSEC_INFO(tsec_info[num], 2); num++; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 /* initialize TSEC3 only if Carrier is 1.3 or above on CDS */ if (get_board_version() >= 0x13) { SET_STD_TSEC_INFO(tsec_info[num], 3); diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index e7ba90a8d1a3..4f98d7a5e2c6 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -497,7 +497,7 @@ int board_eth_init(struct bd_info *bis) SET_STD_TSEC_INFO(tsec_info[num], 2); num++; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 /* P1014 and it's derivatives do not support eTSEC3 */ if (cpu->soc_ver != SVR_P1014) { SET_STD_TSEC_INFO(tsec_info[num], 3); diff --git a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c index 5dac8fcce2cb..b9f519aba6e9 100644 --- a/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c +++ b/board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c @@ -385,7 +385,7 @@ int board_eth_init(struct bd_info *bis) } num++; #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 SET_STD_TSEC_INFO(tsec_info[num], 3); num++; #endif diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 7287c6ad4cbb..985cde092bca 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -41,7 +41,7 @@ static struct tsec_info_struct tsec_info[] = { .mii_devname = DEFAULT_MII_NAME }, /* FEC */ #endif -#ifdef CONFIG_TSEC3 +#ifdef CFG_TSEC3 STD_TSEC_INFO(3), /* TSEC3 */ #endif #ifdef CONFIG_TSEC4 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 35154630add0..7bc8f238e05b 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -289,8 +289,8 @@ #define CFG_TSEC1_NAME "eTSEC0" #define CFG_TSEC2 1 #define CFG_TSEC2_NAME "eTSEC1" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC2" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC2" #define CONFIG_TSEC4 #define CONFIG_TSEC4_NAME "eTSEC3" #undef CONFIG_MPC85XX_FEC diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index b01b3b019662..dd8dd42b54d5 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -355,8 +355,8 @@ extern unsigned long get_sdram_size(void); #define CFG_TSEC1_NAME "eTSEC1" #define CFG_TSEC2 1 #define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC3"
#define TSEC1_PHY_ADDR 1 #define TSEC2_PHY_ADDR 0 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 8747ef260b89..c3c526d8558e 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -257,8 +257,8 @@ #define CFG_TSEC1_NAME "eTSEC1" #define CFG_TSEC2 1 #define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "eTSEC3"
#define TSEC1_PHY_ADDR 1 #define TSEC2_PHY_ADDR 2 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index dfb2679883a9..4560a432bed6 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -371,8 +371,8 @@ #define CFG_TSEC1_NAME "eTSEC1" #define CFG_TSEC2 #define CFG_TSEC2_NAME "eTSEC2" -#define CONFIG_TSEC3 -#define CONFIG_TSEC3_NAME "eTSEC3" +#define CFG_TSEC3 +#define CFG_TSEC3_NAME "eTSEC3"
#define TSEC1_PHY_ADDR 2 #define TSEC2_PHY_ADDR 0 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index bfba9782405f..3796d3464def 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -113,8 +113,8 @@
#define CFG_TSEC1 1 #define CFG_TSEC1_NAME "TSEC0" -#define CONFIG_TSEC3 1 -#define CONFIG_TSEC3_NAME "TSEC1" +#define CFG_TSEC3 1 +#define CFG_TSEC3_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC
#define TSEC1_PHY_ADDR 0 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c4e7fdfa27fe..a44112ccd25e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -225,8 +225,8 @@ CFG_TSEC1 CFG_TSEC1_NAME CFG_TSEC2 CFG_TSEC2_NAME -CONFIG_TSEC3 -CONFIG_TSEC3_NAME +CFG_TSEC3 +CFG_TSEC3_NAME CONFIG_TSEC4 CONFIG_TSEC4_NAME CONFIG_TSECV2