Remove board-specific #ifdefs for calling phy_reset() during
initializtion
Signed-off-by: Peter Tyser <pty...@xes-inc.com>
---
include/configs/CCM.h | 1 +
include/configs/ELPT860.h | 1 +
include/configs/IP860.h | 1 +
include/configs/IVML24.h | 2 ++
include/configs/IVMS8.h | 2 ++
include/configs/MPC8260ADS.h | 1 +
include/configs/MPC8266ADS.h | 1 +
include/configs/MPC8560ADS.h | 1 +
include/configs/RPXsuper.h | 1 +
include/configs/SBC8540.h | 1 +
include/configs/SPD823TS.h | 2 ++
include/configs/pcu_e.h | 1 +
include/configs/sbc8560.h | 1 +
include/configs/stxgp3.h | 1 +
lib_ppc/board.c | 17 +----------------
15 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index 8a94420..3f4a2c1 100644
--- a/include/configs/CCM.h
+++ b/include/configs/CCM.h
@@ -38,6 +38,7 @@
#define CONFIG_MPC860 1 /* This is a MPC860 CPU ... */
#define CONFIG_CCM 1 /* on a Card Controller Module */
#define CONFIG_MISC_INIT_R /* Call misc_init_r() */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
#define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */
#undef CONFIG_8xx_CONS_SMC2
diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index ff58ea9..0f56302 100644
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -57,6 +57,7 @@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
/* BOOT arguments */
#define CONFIG_PREBOOT \
diff --git a/include/configs/IP860.h b/include/configs/IP860.h
index 125aa6c..be63ea5 100644
--- a/include/configs/IP860.h
+++ b/include/configs/IP860.h
@@ -36,6 +36,7 @@
#define CONFIG_MPC860 1 /* This is a MPC860 CPU */
#define CONFIG_IP860 1 /* ...on a IP860 board */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
#define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1
*/
#define CONFIG_BAUDRATE 9600
diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index cd100df..1a4924e 100644
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -52,6 +52,8 @@
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in
MHz */
#define CONFIG_8xx_GCLK_FREQ 50331648
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
+
#define CONFIG_SHOW_BOOT_PROGRESS 1 /* Show boot progress on LEDs
*/
#if 0
diff --git a/include/configs/IVMS8.h b/include/configs/IVMS8.h
index 125cb4b..256cabd 100644
--- a/include/configs/IVMS8.h
+++ b/include/configs/IVMS8.h
@@ -49,6 +49,8 @@
#undef CONFIG_8xx_CONS_NONE
#define CONFIG_BAUDRATE 115200
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
+
#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in
MHz */
#define CONFIG_8xx_GCLK_FREQ 50331648
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index 942a4cc..52dd4e7 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -81,6 +81,7 @@
#endif /* CONFIG_ADSTYPE == CONFIG_SYS_8272ADS */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
/* allow serial and ethaddr to be overwritten */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 4fd86d3..b0162c3 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -54,6 +54,7 @@
#define CONFIG_CPM2 1 /* Has a CPM2 */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
/* allow serial and ethaddr to be overwritten */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index c1a1a6d..8ddce5c 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -48,6 +48,7 @@
#undef CONFIG_ETHER_ON_FCC /* cpm FCC ethernet support */
#define CONFIG_ENV_OVERWRITE
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
/*
* sysclk for MPC85xx
diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index e97ef95..da962f3 100644
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -189,6 +189,7 @@
#define CONFIG_CPM2 1 /* Has a CPM2 */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
/*
* Miscellaneous configurable options
diff --git a/include/configs/SBC8540.h b/include/configs/SBC8540.h
index 7239f84..272b5dd 100644
--- a/include/configs/SBC8540.h
+++ b/include/configs/SBC8540.h
@@ -77,6 +77,7 @@
#undef CONFIG_BTB /* toggle branch predition */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time
*/
#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest region */
diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h
index 4181a40..fa77882 100644
--- a/include/configs/SPD823TS.h
+++ b/include/configs/SPD823TS.h
@@ -36,6 +36,8 @@
#define CONFIG_MPC823 1 /* This is a MPC823 CPU */
#define CONFIG_SPD823TS 1 /* ...on a SPD823TS board
*/
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
+
#define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1 */
#undef CONFIG_8xx_CONS_SMC2
#undef CONFIG_8xx_CONS_NONE
diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h
index 11ad9ca..3aee206 100644
--- a/include/configs/pcu_e.h
+++ b/include/configs/pcu_e.h
@@ -43,6 +43,7 @@
#define CONFIG_PCU_E 1 /* ...on a PCU E board */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r() */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
#define CONFIG_8xx_CONS_SMC1 1 /* Console is on SMC1
*/
diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index 4fa501d..46c94bf 100644
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -71,6 +71,7 @@
#undef CONFIG_BTB /* toggle branch predition */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time
*/
#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest region */
diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h
index 0424e29..86b231c 100644
--- a/include/configs/stxgp3.h
+++ b/include/configs/stxgp3.h
@@ -66,6 +66,7 @@
#define CONFIG_BTB /* toggle branch predition */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_pre_init */
+#define CONFIG_RESET_PHY_R 1 /* Call reset_phy() */
#undef CONFIG_SYS_DRAM_TEST /* memory test, takes time
*/
#define CONFIG_SYS_MEMTEST_START 0x00200000 /* memtest region */
diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index c6fb6fe..f9dbdb9 100644
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -1000,22 +1000,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
eth_initialize (bd);
#endif
-#if defined(CONFIG_CMD_NET) && ( \
- defined(CONFIG_CCM) || \
- defined(CONFIG_ELPT860) || \
- defined(CONFIG_EP8260) || \
- defined(CONFIG_IP860) || \
- defined(CONFIG_IVML24) || \
- defined(CONFIG_IVMS8) || \
- defined(CONFIG_MPC8260ADS) || \
- defined(CONFIG_MPC8266ADS) || \
- defined(CONFIG_MPC8560ADS) || \
- defined(CONFIG_PCU_E) || \
- defined(CONFIG_RPXSUPER) || \
- defined(CONFIG_STXGP3) || \
- defined(CONFIG_SPD823TS) || \
- defined(CONFIG_RESET_PHY_R) )
-
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
WATCHDOG_RESET ();
debug ("Reset Ethernet PHY\n");
reset_phy ();
--
1.6.2.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
