bdinfo: m68k: Move m68k-specific info into its own file

We don't really want to have m68k-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>
Tested-by: Angelo Dureghello <angelo.dureghello@timesys.com>
Tested-by: Angelo Dureghello <angelo.dureghello@timesys.com>

diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index a040f40eb8792d232f0163e81b42dd385b8af822..b66d66afd2923f7932ef7cccf13f6affbcb0ad1c 100644 (file)
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -7,6 +7,7 @@
 ## if the user asked for it
 lib-$(CONFIG_USE_PRIVATE_LIBGCC) += lshrdi3.o muldi3.o ashldi3.o
 
+obj-y  += bdinfo.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += cache.o
 obj-y  += interrupts.o

diff --git a/arch/m68k/lib/bdinfo.c b/arch/m68k/lib/bdinfo.c
new file mode 100644 (file)
index 0000000..09a1abf
--- /dev/null
+++ b/arch/m68k/lib/bdinfo.c
@@ -0,0 +1,29 @@
+// 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 arch_print_bdinfo(void)
+{
+       bd_t *bd = gd->bd;
+
+#if defined(CONFIG_SYS_MBAR)
+       bdinfo_print_num("mbar", bd->bi_mbar_base);
+#endif
+       bdinfo_print_mhz("cpufreq", bd->bi_intfreq);
+       if (IS_ENABLED(CONFIG_PCI))
+               bdinfo_print_mhz("pcifreq", bd->bi_pcifreq);
+#ifdef CONFIG_EXTRA_CLOCK
+       bdinfo_print_mhz("flbfreq", bd->bi_flbfreq);
+       bdinfo_print_mhz("inpfreq", bd->bi_inpfreq);
+       bdinfo_print_mhz("vcofreq", bd->bi_vcofreq);
+#endif
+}

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 524677edd2fdfbf66e0a8b4c10ee284029d382e9..097a31416b0ead0b893d7385e50fbb3828523058 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -109,21 +109,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        if (IS_ENABLED(CONFIG_PPC) || IS_ENABLED(CONFIG_M68K))
                bdinfo_print_mhz("busfreq", bd->bi_busfreq);
 
-       /* The rest are used only by m68k */
-#ifdef CONFIG_M68K
-#if defined(CONFIG_SYS_MBAR)
-       bdinfo_print_num("mbar", bd->bi_mbar_base);
-#endif
-       bdinfo_print_mhz("cpufreq", bd->bi_intfreq);
-       if (IS_ENABLED(CONFIG_PCI))
-               bdinfo_print_mhz("pcifreq", bd->bi_pcifreq);
-#ifdef CONFIG_EXTRA_CLOCK
-       bdinfo_print_mhz("flbfreq", bd->bi_flbfreq);
-       bdinfo_print_mhz("inpfreq", bd->bi_inpfreq);
-       bdinfo_print_mhz("vcofreq", bd->bi_vcofreq);
-#endif
-#endif
-
        return 0;
 }