leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board_f: m68k: Factor out m68k-specific bdinfo setup

Browse Source 
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 <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
This commit is contained in:
Ovidiu Panait 2020-07-24 14:12:18 +03:00 committed by Tom Rini
parent 4912224216
commit ee9c3adc85
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/m68k/lib/bdinfo.c
View File

@ -11,6 +11,27 @@
DECLARE_GLOBAL_DATA_PTR; 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) void arch_print_bdinfo(void)
{ {
struct bd_info *bd = gd->bd; struct bd_info *bd = gd->bd;

19
common/board_f.c
View File

@ -618,7 +618,7 @@ int setup_bdinfo(void)
return arch_setup_bdinfo(); return arch_setup_bdinfo();
} }
#if defined(CONFIG_M68K) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \ #if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
defined(CONFIG_SH) defined(CONFIG_SH)
static int setup_board_part1(void) static int setup_board_part1(void)
{ {
@ -627,9 +627,6 @@ static int setup_board_part1(void)
#if defined(CONFIG_E500) || defined(CONFIG_MPC86xx) #if defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
bd->bi_immr_base = CONFIG_SYS_IMMR; /* base of IMMR register */ bd->bi_immr_base = CONFIG_SYS_IMMR; /* base of IMMR register */
#endif #endif
#if defined(CONFIG_M68K)
bd->bi_mbar_base = CONFIG_SYS_MBAR; /* base of internal registers */
#endif
#if defined(CONFIG_MPC83xx) #if defined(CONFIG_MPC83xx)
bd->bi_immrbar = CONFIG_SYS_IMMR; bd->bi_immrbar = CONFIG_SYS_IMMR;
#endif #endif
@ -638,7 +635,7 @@ static int setup_board_part1(void)
} }
#endif #endif
#if defined(CONFIG_PPC) || defined(CONFIG_M68K) #if defined(CONFIG_PPC)
static int setup_board_part2(void) static int setup_board_part2(void)
{ {
struct bd_info *bd = gd->bd; struct bd_info *bd = gd->bd;
@ -651,14 +648,6 @@ static int setup_board_part2(void)
bd->bi_sccfreq = gd->arch.scc_clk; bd->bi_sccfreq = gd->arch.scc_clk;
bd->bi_vco = gd->arch.vco_out; bd->bi_vco = gd->arch.vco_out;
#endif /* CONFIG_CPM2 */ #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; return 0;
} }
@ -985,11 +974,11 @@ static const init_fnc_t init_sequence_f[] = {
dram_init_banksize, dram_init_banksize,
show_dram_config, show_dram_config,
setup_bdinfo, setup_bdinfo,
#if defined(CONFIG_M68K) || defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \ #if defined(CONFIG_MIPS) || defined(CONFIG_PPC) || \
defined(CONFIG_SH) defined(CONFIG_SH)
setup_board_part1, setup_board_part1,
#endif #endif
#if defined(CONFIG_PPC) || defined(CONFIG_M68K) #if defined(CONFIG_PPC)
INIT_FUNC_WATCHDOG_RESET INIT_FUNC_WATCHDOG_RESET
setup_board_part2, setup_board_part2,
#endif #endif