ppc: Clean up calling of misc_init_r() during init

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

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Heiko Schocher <hs@denx.de>

diff --git a/include/configs/CCM.h b/include/configs/CCM.h
index d1c293ff0adf06b5d03a6722e3ce93f4cc7df4b1..8a944207d7f6a3c245d71a658ef78e595786dfc9 100644 (file)
--- a/include/configs/CCM.h
+++ b/include/configs/CCM.h
@@ -37,6 +37,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_8xx_CONS_SMC1    1   /* Console is on SMC1       */
 #undef  CONFIG_8xx_CONS_SMC2

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index fca6de0c6bce2fb704a06f42abbaea706301c638..d131aeaf43b23f6e1248a4d61e923b2f1e711065 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -38,6 +38,7 @@
 #define CONFIG_CPCI405         1       /* ...on a CPCI405 board        */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
+#define CONFIG_MISC_INIT_R      1      /* call misc_init_r()           */
 
 #define CONFIG_SYS_CLK_FREQ    33000000 /* external frequency to pll   */
 

diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h
index fd0456608977ffb0ebf165c7eb7c6a63f30dd463..07c4e3599557e45e402dc972b927baa31c2d29bb 100644 (file)
--- a/include/configs/CPCI4052.h
+++ b/include/configs/CPCI4052.h
@@ -40,6 +40,7 @@
 #undef  CONFIG_CPCI405_6U               /* enable this for 6U boards    */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
+#define CONFIG_MISC_INIT_R      1      /* call misc_init_r()           */
 
 #define CONFIG_SYS_CLK_FREQ    33330000 /* external frequency to pll   */
 

diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h
index d718ed40a3d8d626400477ad53e258582de5a2f5..c78552bbd420e03ce1a896de5c3886a5c1e3285e 100644 (file)
--- a/include/configs/CPCI405AB.h
+++ b/include/configs/CPCI405AB.h
@@ -40,6 +40,7 @@
 #define CONFIG_CPCI405AB       1       /* ...and special AB version    */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
+#define CONFIG_MISC_INIT_R      1      /* call misc_init_r()           */
 
 #define CONFIG_SYS_CLK_FREQ    33330000 /* external frequency to pll   */
 

diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h
index 09df47082b6424ebb95f0e6e9b21007258291842..59e0778f6a324c2b619bee081b5fdf8ec000d4a5 100644 (file)
--- a/include/configs/CPCI405DT.h
+++ b/include/configs/CPCI405DT.h
@@ -39,6 +39,7 @@
 #define CONFIG_CPCI405_VER2    1       /* ...version 2                 */
 
 #define CONFIG_BOARD_EARLY_INIT_F 1    /* call board_early_init_f()    */
+#define CONFIG_MISC_INIT_R      1      /* call misc_init_r()           */
 
 #define CONFIG_SYS_CLK_FREQ    33330000 /* external frequency to pll   */
 

diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h
index 40e4735b68123d847d3b2ffb8737e952ed1991dc..c0179150c2b6b38489de236efe73395ce9b614fc 100644 (file)
--- a/include/configs/W7OLMC.h
+++ b/include/configs/W7OLMC.h
@@ -40,6 +40,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F 1            /* Call board_early_init_f      */
 #define        CONFIG_MISC_INIT_F      1               /* and misc_init_f()            */
+#define        CONFIG_MISC_INIT_R      1               /* and misc_init_r()            */
 
 #define CONFIG_SYS_CLK_FREQ    33333333        /* external frequency to pll    */
 

diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h
index a62f1b4d5781aca02898a922bd77de07c6e43860..1d4ad13ed3bee9027596382a794ac5a4a46838a7 100644 (file)
--- a/include/configs/W7OLMG.h
+++ b/include/configs/W7OLMG.h
@@ -40,6 +40,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F 1            /* Call board_early_init_f      */
 #define        CONFIG_MISC_INIT_F      1               /* and misc_init_f()            */
+#define        CONFIG_MISC_INIT_R      1               /* and misc_init_r()            */
 
 #define CONFIG_SYS_CLK_FREQ    33333333        /* external frequency to pll    */
 

diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index c580230225dc9ff427460efcd8e1dc462871e34c..566565aad2c03e5701b455221d254c98ff42a765 100644 (file)
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -38,6 +38,7 @@
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
 #define        CONFIG_MISC_INIT_F      1       /* Use misc_init_f()            */
+#define        CONFIG_MISC_INIT_R              /* Use misc_init_r()            */
 
 /* Cogent Modular Architecture options */
 #define CONFIG_CMA282          1       /* ...on a CMA282 CPU module    */

diff --git a/include/configs/cogent_mpc8xx.h b/include/configs/cogent_mpc8xx.h
index 17bd9a027427a8cecdb64ab859b57c1eb34e82e5..750c0df0c5853491de26a95ba875787303d0cbd8 100644 (file)
--- a/include/configs/cogent_mpc8xx.h
+++ b/include/configs/cogent_mpc8xx.h
@@ -37,6 +37,7 @@
 #define CONFIG_COGENT          1       /* using Cogent Modular Architecture */
 
 #define        CONFIG_MISC_INIT_F      1       /* Use misc_init_f()            */
+#define        CONFIG_MISC_INIT_R              /* Use misc_init_r()            */
 
 /* Cogent Modular Architecture options */
 #define CONFIG_CMA286_60_OLD   1       /* ...on an old CMA286-60 CPU module */

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 8f00773216a8d70f4a904a15e3721109b99a94a7..be20d729095774717531a9bad1f6cee8de3809cf 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -47,8 +47,9 @@
 #define CONFIG_OVERWRITE_ETHADDR_ONCE   1
 #endif
 
-#define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f      */
-#define CONFIG_BOARD_POSTCLK_INIT 1    /* Call board_postclk_init      */
+#define CONFIG_BOARD_EARLY_INIT_F 1    /* Call board_early_init_f()    */
+#define CONFIG_BOARD_POSTCLK_INIT 1    /* Call board_postclk_init()    */
+#define CONFIG_MISC_INIT_R     1       /* Call misc_init_r()           */
 
 #define CONFIG_LCD             1       /* use LCD controller ...       */
 #define CONFIG_HLD1045         1       /* ... with a HLD1045 display   */

diff --git a/include/configs/pcu_e.h b/include/configs/pcu_e.h
index 651738117067f37844c4330c6aec4fd0fc11618a..11ad9ca927f928bf41c19c759dc7e5f67f85fb68 100644 (file)
--- a/include/configs/pcu_e.h
+++ b/include/configs/pcu_e.h
@@ -42,6 +42,8 @@
 #define CONFIG_MPC860T         1
 #define CONFIG_PCU_E           1       /* ...on a PCU E board          */
 
+#define CONFIG_MISC_INIT_R     1       /* Call misc_init_r()           */
+
 #define        CONFIG_8xx_CONS_SMC1    1       /* Console is on SMC1           */
 
 #define CONFIG_BAUDRATE                9600

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 7e00ab8c7100ac24707f3959a0df4f84350b834e..57637607af8d8ce617b64627875709d684695731 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -63,6 +63,7 @@
 #define CONFIG_405GP   1
 
 #define CONFIG_BOARD_EARLY_INIT_F      1
+#define CONFIG_MISC_INIT_R             1       /* Call misc_init_r() */
 
 /*
  * Define IDE_USES_ISA_EMULATION for slower IDE access in the ISA-IO address range

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index e8509ee0e8d58167f489f6a0a6048671c14655d5..c6fb6fe5592e5bd6a471f4f8d6d97c01f8bba011 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -921,17 +921,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
        /* Initialize the console (after the relocation and devices init) */
        console_init_r ();
 
-#if defined(CONFIG_CCM)                || \
-    defined(CONFIG_COGENT)     || \
-    defined(CONFIG_CPCI405)    || \
-    defined(CONFIG_EVB64260)   || \
-    defined(CONFIG_KUP4K)      || \
-    defined(CONFIG_KUP4X)      || \
-    defined(CONFIG_LWMON)      || \
-    defined(CONFIG_PCU_E)      || \
-    defined(CONFIG_SC3)                || \
-    defined(CONFIG_W7O)                || \
-    defined(CONFIG_MISC_INIT_R)
+#if defined(CONFIG_MISC_INIT_R)
        /* miscellaneous platform dependent initialisations */
        misc_init_r ();
 #endif