From 6ecefcfb6d0cfdd0c34db5d25ed58859eb266416 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait Date: Fri, 24 Jul 2020 14:12:13 +0300 Subject: cmd: bdinfo: Move sram info prints to generic code bi_sramstart and bi_sramsize are generic members of the bd_info structure, so move the m68k/powerpc-specific prints to generic code. Also, print them only if SRAM support is enabled via CONFIG_SYS_HAS_SRAM. Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- arch/m68k/lib/bdinfo.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'arch/m68k/lib/bdinfo.c') diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c index fb4d1a52fd..b7bc6a3044 100644 --- a/arch/m68k/lib/bdinfo.c +++ b/arch/m68k/lib/bdinfo.c @@ -15,10 +15,6 @@ void arch_print_bdinfo(void) { struct bd_info *bd = gd->bd; -#if defined(CONFIG_SYS_INIT_RAM_ADDR) - bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart); - bdinfo_print_num("sramsize", (ulong)bd->bi_sramsize); -#endif bdinfo_print_mhz("busfreq", bd->bi_busfreq); #if defined(CONFIG_SYS_MBAR) bdinfo_print_num("mbar", bd->bi_mbar_base); -- cgit From ee9c3adc85791ad887dc798c294c2d8756dfb0b9 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait Date: Fri, 24 Jul 2020 14:12:18 +0300 Subject: board_f: m68k: Factor out m68k-specific bdinfo setup 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. Reviewed-by: Simon Glass Signed-off-by: Ovidiu Panait --- arch/m68k/lib/bdinfo.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'arch/m68k/lib/bdinfo.c') 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; -- cgit