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

bdinfo: ppc: Move PPC-specific info into its own file

Browse Source 
We don't really want to have PPC-specific code in a generic file. Create
a new arch-specific function to hold it, and move it into that.

Make the function weak so that any arch can implement it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Simon Glass 2020-05-10 14:16:57 -06:00 committed by Tom Rini
parent 59b0d7d839
commit 79d074d301
3 changed files with 43 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/lib/Makefile
View File

@ -15,6 +15,8 @@ MINIMAL=y
endif endif
endif endif
obj-y += bdinfo.o
ifdef MINIMAL ifdef MINIMAL
obj-y += cache.o time.o obj-y += cache.o time.o
ifndef CONFIG_TIMER ifndef CONFIG_TIMER

41
arch/powerpc/lib/bdinfo.c Normal file
View File

@ -0,0 +1,41 @@
// SPDX-License-Identifier: GPL-2.0+
/*
* PPC-specific information for the 'bd' command
*
* (C) Copyright 2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
#include <common.h>
#include <init.h>
DECLARE_GLOBAL_DATA_PTR;
void __weak board_detail(void)
{
/* Please define board_detail() for your PPC platform */
}
void arch_print_bdinfo(void)
{
bd_t *bd = gd->bd;
#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500)
bdinfo_print_num("immr_base", bd->bi_immr_base);
#endif
bdinfo_print_num("bootflags", bd->bi_bootflags);
bdinfo_print_mhz("intfreq", bd->bi_intfreq);
#ifdef CONFIG_ENABLE_36BIT_PHYS
if (IS_ENABLED(CONFIG_PHYS_64BIT))
puts("addressing = 36-bit\n");
else
puts("addressing = 32-bit\n");
#endif
board_detail();
#if defined(CONFIG_CPM2)
bdinfo_print_mhz("cpmfreq", bd->bi_cpmfreq);
bdinfo_print_mhz("vco", bd->bi_vco);
bdinfo_print_mhz("sccfreq", bd->bi_sccfreq);
bdinfo_print_mhz("brgfreq", bd->bi_brgfreq);
#endif
}

27
cmd/bdinfo.c
View File

@ -62,11 +62,6 @@ static void print_bi_dram(const bd_t *bd)
#endif #endif
} }
void __weak board_detail(void)
{
/* Please define board_detail() for your PPC platform */
}
__weak void arch_print_bdinfo(void) __weak void arch_print_bdinfo(void)
{ {
} }
@ -106,28 +101,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
arch_print_bdinfo(); arch_print_bdinfo();
/* This section is used only by ppc */
#if defined(CONFIG_MPC8xx) || defined(CONFIG_E500)
bdinfo_print_num("immr_base", bd->bi_immr_base);
#endif
if (IS_ENABLED(CONFIG_PPC)) {
bdinfo_print_num("bootflags", bd->bi_bootflags);
bdinfo_print_mhz("intfreq", bd->bi_intfreq);
#ifdef CONFIG_ENABLE_36BIT_PHYS
if (IS_ENABLED(CONFIG_PHYS_64BIT))
puts("addressing = 36-bit\n");
else
puts("addressing = 32-bit\n");
#endif
board_detail();
}
#if defined(CONFIG_CPM2)
bdinfo_print_mhz("cpmfreq", bd->bi_cpmfreq);
bdinfo_print_mhz("vco", bd->bi_vco);
bdinfo_print_mhz("sccfreq", bd->bi_sccfreq);
bdinfo_print_mhz("brgfreq", bd->bi_brgfreq);
#endif
/* This is used by m68k and ppc */ /* This is used by m68k and ppc */
#if defined(CONFIG_SYS_INIT_RAM_ADDR) #if defined(CONFIG_SYS_INIT_RAM_ADDR)
bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart); bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);