board_f: ppc: Factor out ppc-specific bdinfo setup

Factor out ppc-specific bdinfo setup from generic init sequence to
arch_setup_bdinfo in arch/powerpc/lib/bdinfo.c.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>

diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index 07f823e..36c9c99 100644 (file)
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -11,6 +11,31 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+int arch_setup_bdinfo(void)
+{
+       struct bd_info *bd = gd->bd;
+
+#if defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
+       bd->bi_immr_base = CONFIG_SYS_IMMR;     /* base  of IMMR register     */
+#endif
+
+#if defined(CONFIG_MPC83xx)
+       bd->bi_immrbar = CONFIG_SYS_IMMR;
+#endif
+
+       bd->bi_intfreq = gd->cpu_clk;   /* Internal Freq, in Hz */
+       bd->bi_busfreq = gd->bus_clk;   /* Bus Freq,      in Hz */
+
+#if defined(CONFIG_CPM2)
+       bd->bi_cpmfreq = gd->arch.cpm_clk;
+       bd->bi_brgfreq = gd->arch.brg_clk;
+       bd->bi_sccfreq = gd->arch.scc_clk;
+       bd->bi_vco = gd->arch.vco_out;
+#endif /* CONFIG_CPM2 */
+
+       return 0;
+}
+
 void __weak board_detail(void)
 {
        /* Please define board_detail() for your PPC platform */

diff --git a/common/board_f.c b/common/board_f.c
index 0c20f3f..e670155 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -618,37 +618,9 @@ int setup_bdinfo(void)
        return arch_setup_bdinfo();
 }
 
-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
-       defined(CONFIG_SH)
+#if defined(CONFIG_MIPS) || defined(CONFIG_SH)
 static int setup_board_part1(void)
 {
-       struct bd_info *bd = gd->bd;
-
-#if defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
-       bd->bi_immr_base = CONFIG_SYS_IMMR;     /* base  of IMMR register     */
-#endif
-#if defined(CONFIG_MPC83xx)
-       bd->bi_immrbar = CONFIG_SYS_IMMR;
-#endif
-
-       return 0;
-}
-#endif
-
-#if defined(CONFIG_PPC)
-static int setup_board_part2(void)
-{
-       struct bd_info *bd = gd->bd;
-
-       bd->bi_intfreq = gd->cpu_clk;   /* Internal Freq, in Hz */
-       bd->bi_busfreq = gd->bus_clk;   /* Bus Freq,      in Hz */
-#if defined(CONFIG_CPM2)
-       bd->bi_cpmfreq = gd->arch.cpm_clk;
-       bd->bi_brgfreq = gd->arch.brg_clk;
-       bd->bi_sccfreq = gd->arch.scc_clk;
-       bd->bi_vco = gd->arch.vco_out;
-#endif /* CONFIG_CPM2 */
-
        return 0;
 }
 #endif
@@ -974,14 +946,10 @@ static const init_fnc_t init_sequence_f[] = {
        dram_init_banksize,
        show_dram_config,
        setup_bdinfo,
-#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
-       defined(CONFIG_SH)
+#if defined(CONFIG_MIPS) || defined(CONFIG_SH)
        setup_board_part1,
 #endif
-#if defined(CONFIG_PPC)
        INIT_FUNC_WATCHDOG_RESET
-       setup_board_part2,
-#endif
        display_new_sp,
 #ifdef CONFIG_OF_BOARD_FIXUP
        fix_fdt,