bdinfo: m68k: ppc: Move arch-specific code from bdinfo

We don't have an easy way to share these three lines of code with two
architectures. We also want to make it clear that this code is actually
arch-specific.

So just duplicate it in each arch-specific file.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
index 09a1abfc217486c3e5186cb3ff1cd3bdde7cf687..971c47c30648c8a4e0d63464466322a003baa866 100644 (file)
--- a/arch/m68k/lib/bdinfo.c
+++ b/arch/m68k/lib/bdinfo.c
@@ -15,6 +15,11 @@ void arch_print_bdinfo(void)
 {
        bd_t *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);
 #endif

diff --git a/arch/powerpc/lib/bdinfo.c b/arch/powerpc/lib/bdinfo.c
index da09bb276f6e84ea26bd07e7ab463ffbb2cf4a5d..d8c64155f0868bb633b688f4fe3f8cd1381262dd 100644 (file)
--- a/arch/powerpc/lib/bdinfo.c
+++ b/arch/powerpc/lib/bdinfo.c
@@ -20,6 +20,11 @@ void arch_print_bdinfo(void)
 {
        bd_t *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_MPC8xx) || defined(CONFIG_E500)
        bdinfo_print_num("immr_base", bd->bi_immr_base);
 #endif

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 097a31416b0ead0b893d7385e50fbb3828523058..420423a81bd292558a429efc32cd10669fc628d6 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -101,14 +101,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 
        arch_print_bdinfo();
 
-       /* This is used by m68k and ppc */
-#if defined(CONFIG_SYS_INIT_RAM_ADDR)
-       bdinfo_print_num("sramstart", (ulong)bd->bi_sramstart);
-       bdinfo_print_num("sramsize", (ulong)bd->bi_sramsize);
-#endif
-       if (IS_ENABLED(CONFIG_PPC) || IS_ENABLED(CONFIG_M68K))
-               bdinfo_print_mhz("busfreq", bd->bi_busfreq);
-
        return 0;
 }