Re: [PATCH v3 10/17] board_f: m68k: Factor out m68k-specific bdinfo setup

[Simon Glass]

On Mon, 20 Jul 2020 at 08:20, Ovidiu Panait  wrote:
>
> Factor out m68k-specific bdinfo setup to arch_setup_bdinfo in
> arch/m68k/lib/bdinfo.c. Also, use if(IS_ENABLED()) instead of #ifdef where
> possible.
>
> Signed-off-by: Ovidiu Panait 
> ---
>
>  arch/m68k/lib/bdinfo.c | 21 +
>  common/board_f.c   | 19 ---
>  2 files changed, 25 insertions(+), 15 deletions(-)

Reviewed-by: Simon Glass 

[PATCH v3 10/17] board_f: m68k: Factor out m68k-specific bdinfo setup

[Ovidiu Panait]

Factor out m68k-specific bdinfo setup to arch_setup_bdinfo in
arch/m68k/lib/bdinfo.c. Also, use if(IS_ENABLED()) instead of #ifdef where
possible.

Signed-off-by: Ovidiu Panait 
---

 arch/m68k/lib/bdinfo.c | 21 +
 common/board_f.c   | 19 ---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index b7bc6a3044..404e5f19ed 100644
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -11,6 +11,27 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+int arch_setup_bdinfo(void)
+{
+   struct bd_info *bd = gd->bd;
+
+   bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */
+
+   bd->bi_intfreq = gd->cpu_clk;   /* Internal Freq, in Hz */
+   bd->bi_busfreq = gd->bus_clk;   /* Bus Freq,  in Hz */
+
+   if (IS_ENABLED(CONFIG_PCI))
+   bd->bi_pcifreq = gd->pci_clk;
+
+#if defined(CONFIG_EXTRA_CLOCK)
+   bd->bi_inpfreq = gd->arch.inp_clk;  /* input Freq in Hz */
+   bd->bi_vcofreq = gd->arch.vco_clk;  /* vco Freq in Hz */
+   bd->bi_flbfreq = gd->arch.flb_clk;  /* flexbus Freq in Hz */
+#endif
+
+   return 0;
+}
+
 void arch_print_bdinfo(void)
 {
struct bd_info *bd = gd->bd;
diff --git a/common/board_f.c b/common/board_f.c
index 1befab5446..8ab76a5c7a 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -630,7 +630,7 @@ int setup_bdinfo(void)
return arch_setup_bdinfo();
 }
 
-#if defined(CONFIG_M68K) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
+#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
defined(CONFIG_SH)
 static int setup_board_part1(void)
 {
@@ -639,9 +639,6 @@ static int setup_board_part1(void)
 #if defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
bd->bi_immr_base = CONFIG_SYS_IMMR; /* base  of IMMR register */
 #endif
-#if defined(CONFIG_M68K)
-   bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */
-#endif
 #if defined(CONFIG_MPC83xx)
bd->bi_immrbar = CONFIG_SYS_IMMR;
 #endif
@@ -650,7 +647,7 @@ static int setup_board_part1(void)
 }
 #endif
 
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC)
 static int setup_board_part2(void)
 {
struct bd_info *bd = gd->bd;
@@ -663,14 +660,6 @@ static int setup_board_part2(void)
bd->bi_sccfreq = gd->arch.scc_clk;
bd->bi_vco = gd->arch.vco_out;
 #endif /* CONFIG_CPM2 */
-#if defined(CONFIG_M68K) && defined(CONFIG_PCI)
-   bd->bi_pcifreq = gd->pci_clk;
-#endif
-#if defined(CONFIG_EXTRA_CLOCK)
-   bd->bi_inpfreq = gd->arch.inp_clk;  /* input Freq in Hz */
-   bd->bi_vcofreq = gd->arch.vco_clk;  /* vco Freq in Hz */
-   bd->bi_flbfreq = gd->arch.flb_clk;  /* flexbus Freq in Hz */
-#endif
 
return 0;
 }
@@ -997,11 +986,11 @@ static const init_fnc_t init_sequence_f[] = {
dram_init_banksize,
show_dram_config,
setup_bdinfo,
-#if defined(CONFIG_M68K) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
+#if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
defined(CONFIG_SH)
setup_board_part1,
 #endif
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC)
INIT_FUNC_WATCHDOG_RESET
setup_board_part2,
 #endif
-- 
2.17.1