ppc: Clean up calling of phy_reset() during init

Remove board-specific #ifdefs for calling phy_reset() during
initializtion

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index 8a944207d7f6a3c245d71a658ef78e595786dfc9..3f4a2c103e38c7cc6c708bb5754160be30b9e48e 100644 (file)
--- 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 ff58ea92237a5e22f860bda1d1676d0b50ae5b33..0f56302003beb947371833689feecd152cf2a5ee 100644 (file)
--- 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 125aa6c80259516f1657709651df0064798065aa..be63ea5736b1d22357274e99894c58ae606effd9 100644 (file)
--- 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 cd100df05776e4159b17b49694c5d795d4ca447c..1a4924e1e6d98a7d1e43575f17733e3f1b23a1ca 100644 (file)
--- 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 125cb4b20379b470e66e48e277cfc30df2ee1290..256cabd036868a055cdf4b3122b718e1227d2286 100644 (file)
--- 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 677a1439c753cc2330f87cbb989ccdb129dbebe4..39b8b8fce4fd565a662a5b2ec4f69c81d3f1f6bc 100644 (file)
--- 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 4fd86d3923f4a2350bca9b4a4fef0b09de830a93..b0162c3971b240abf7c7b4d75e9760cd028c6bee 100644 (file)
--- 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 c1a1a6d923eda6018aaa96dd282604247969b7db..8ddce5c699d40b235469610a3a831a6f77278084 100644 (file)
--- 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 e97ef9565adb3ded31482362bbed1fc372b60545..da962f3b9377d1d51f6336ce08fa2f4e58da8b19 100644 (file)
--- 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 7239f8409de5db4b3555eb6fad0704e09338f750..272b5dd56cb8527b726b946b92311564531c3917 100644 (file)
--- 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 4181a400e881bdf6b80d7b340d961a6e0c7c87aa..fa77882cfd1a1f41e9c3cba26fca6fe0f0d015d3 100644 (file)
--- 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 11ad9ca927f928bf41c19c759dc7e5f67f85fb68..3aee206ad76f8865ce1ce9b2f4d6da62c9d6882d 100644 (file)
--- 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 4fa501da5ebe88bffda14cc99035ecbdb736b947..46c94bf16be70a6cb56b746979502c078e66d89c 100644 (file)
--- 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 0424e2978e34e64b9cf19aff3d8d417f13019617..86b231ca8eec75ceec761d8431ec0e9b14d81f87 100644 (file)
--- 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 c6fb6fe5592e5bd6a471f4f8d6d97c01f8bba011..f9dbdb9a86e05d8592e06281be2239252d5041c5 100644 (file)
--- 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 ();