@@ -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;
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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
@@ -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"
@@ -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
@@ -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
@@ -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
@@ -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
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(-)