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/MPC837XERDB.h | 6 +++--- include/configs/MPC8548CDS.h | 4 ++-- include/configs/P1010RDB.h | 4 ++-- include/configs/ls1021aiot.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 ++-- 13 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/board/freescale/common/pixis.c b/board/freescale/common/pixis.c index 6fdb11039e54..37d502f7ff4b 100644 --- a/board/freescale/common/pixis.c +++ b/board/freescale/common/pixis.c @@ -296,7 +296,7 @@ static int pixis_set_sgmii(struct cmd_tbl *cmdtp, int flag, int argc, which_tsec = simple_strtoul(argv[1], NULL, 0);
switch (which_tsec) { -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 case 1: mask = PIXIS_VSPEED2_TSEC1SER; switch_mask = PIXIS_VCFGEN1_TSEC1SER; diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 73e024eaa011..4c10b1075e53 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -208,7 +208,7 @@ int board_eth_init(struct bd_info *bis) struct tsec_info_struct tsec_info[4]; int num = 0;
-#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif diff --git a/board/freescale/p1010rdb/p1010rdb.c b/board/freescale/p1010rdb/p1010rdb.c index 0f014823c935..a527d44d6865 100644 --- a/board/freescale/p1010rdb/p1010rdb.c +++ b/board/freescale/p1010rdb/p1010rdb.c @@ -489,7 +489,7 @@ int board_eth_init(struct bd_info *bis)
cpu = gd->arch.cpu;
-#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif 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 9e26c201b7a8..7d2b8ec12d9f 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 @@ -373,7 +373,7 @@ int board_eth_init(struct bd_info *bis) (void *)(CFG_SYS_MPC85xx_GUTS_ADDR); int num = 0;
-#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 SET_STD_TSEC_INFO(tsec_info[num], 1); num++; #endif diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 8b6f034ea165..ad2c68e2a73d 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -26,7 +26,7 @@ /* Default initializations for TSEC controllers. */
static struct tsec_info_struct tsec_info[] = { -#ifdef CONFIG_TSEC1 +#ifdef CFG_TSEC1 STD_TSEC_INFO(1), /* TSEC1 */ #endif #ifdef CONFIG_TSEC2 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2ca7862147de..82101ced5323 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -185,10 +185,10 @@
#define CFG_GMII /* MII PHY management */
-#define CONFIG_TSEC1 +#define CFG_TSEC1
-#ifdef CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "TSEC0" +#ifdef CFG_TSEC1 +#define CFG_TSEC1_NAME "TSEC0" #define CFG_SYS_TSEC1_OFFSET 0x24000 #define TSEC1_PHY_ADDR 2 #define TSEC1_FLAGS (TSEC_GIGABIT | TSEC_REDUCED) diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index d47378e19352..53639db0b9dd 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -285,8 +285,8 @@
#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC0" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC0" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC1" #define CONFIG_TSEC3 1 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 04f270e11806..88865aac01eb 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -351,8 +351,8 @@ extern unsigned long get_sdram_size(void);
#if defined(CONFIG_TSEC_ENET) #define CFG_MII_DEFAULT_TSEC 1 /* Allow unregistered phys */ -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 1 diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 08532dc3e0aa..fff4e816ecc1 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -72,8 +72,8 @@
#ifdef CONFIG_TSEC_ENET #define CFG_MII_DEFAULT_TSEC 1 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC2"
diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 498c89c3cf21..eab8ade5c9ef 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -253,8 +253,8 @@
#ifdef CONFIG_TSEC_ENET #define CFG_MII_DEFAULT_TSEC 3 -#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 1 #define CONFIG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 1 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 4ab2efd528d1..fa446c725c88 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -367,8 +367,8 @@ #endif /* CONFIG_PCI */
#if defined(CONFIG_TSEC_ENET) -#define CONFIG_TSEC1 -#define CONFIG_TSEC1_NAME "eTSEC1" +#define CFG_TSEC1 +#define CFG_TSEC1_NAME "eTSEC1" #define CONFIG_TSEC2 #define CONFIG_TSEC2_NAME "eTSEC2" #define CONFIG_TSEC3 diff --git a/include/configs/socrates.h b/include/configs/socrates.h index ddbd257d08a5..bfba9782405f 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -111,8 +111,8 @@ #define CFG_SYS_PCI1_MEM_PHYS 0x80000000 #define CFG_SYS_PCI1_IO_PHYS 0xE2000000
-#define CONFIG_TSEC1 1 -#define CONFIG_TSEC1_NAME "TSEC0" +#define CFG_TSEC1 1 +#define CFG_TSEC1_NAME "TSEC0" #define CONFIG_TSEC3 1 #define CONFIG_TSEC3_NAME "TSEC1" #undef CONFIG_MPC85XX_FEC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 34a34a2f0776..310ac53d91a1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -221,8 +221,8 @@ CFG_TESTPIN_MASK CFG_TESTPIN_REG CFG_THOR_RESET_OFF CFG_TPM_TIS_BASE_ADDRESS -CONFIG_TSEC1 -CONFIG_TSEC1_NAME +CFG_TSEC1 +CFG_TSEC1_NAME CONFIG_TSEC2 CONFIG_TSEC2_NAME CONFIG_TSEC3