bdinfo: arm: Move ARM-specific info into its own file

We don't really want to have ARM-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>

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index b839aa7a50967b622c6a126db02c274fbb460b22..27b12e7f2bb97685306b3aa7f3f78afe05550694 100644 (file)
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMSET) += memset.o
 obj-$(CONFIG_$(SPL_TPL_)USE_ARCH_MEMCPY) += memcpy.o
 obj-$(CONFIG_SEMIHOSTING) += semihosting.o
 
+obj-y  += bdinfo.o
 obj-y  += sections.o
 obj-y  += stack.o
 ifdef CONFIG_CPU_V7M

diff --git a/arch/arm/lib/bdinfo.c b/arch/arm/lib/bdinfo.c
new file mode 100644 (file)
index 0000000..81c9291
--- /dev/null
+++ b/arch/arm/lib/bdinfo.c
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * ARM-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;
+
+       bdinfo_print_num("arch_number", bd->bi_arch_number);
+#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
+       if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) {
+               bdinfo_print_num("Secure ram",
+                                gd->arch.secure_ram &
+                                MEM_RESERVE_SECURE_ADDR_MASK);
+       }
+#endif
+#ifdef CONFIG_RESV_RAM
+       if (gd->arch.resv_ram)
+               bdinfo_print_num("Reserved ram", gd->arch.resv_ram);
+#endif
+#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
+       bdinfo_print_num("TLB addr", gd->arch.tlb_addr);
+#endif
+       bdinfo_print_num("irq_sp", gd->irq_sp); /* irq stack pointer */
+       bdinfo_print_num("sp start ", gd->start_addr_sp);
+       /*
+        * TODO: Currently only support for davinci SOC's is added.
+        * Remove this check once all the board implement this.
+        */
+#ifdef CONFIG_CLOCKS
+       printf("ARM frequency = %ld MHz\n", bd->bi_arm_freq);
+       printf("DSP frequency = %ld MHz\n", bd->bi_dsp_freq);
+       printf("DDR frequency = %ld MHz\n", bd->bi_ddr_freq);
+#endif
+#ifdef CONFIG_BOARD_TYPES
+       printf("Board Type  = %ld\n", gd->board_type);
+#endif
+#if CONFIG_VAL(SYS_MALLOC_F_LEN)
+       printf("Early malloc usage: %lx / %x\n", gd->malloc_ptr,
+              CONFIG_VAL(SYS_MALLOC_F_LEN));
+#endif
+}

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 4fadfd2ac7d8ee0abc94f30032e6ea1723fd407e..6aa23e6a438557a9bb015999298c66ebfdba7d7c 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -67,6 +67,10 @@ void __weak board_detail(void)
        /* Please define board_detail() for your PPC platform */
 }
 
+__weak void arch_print_bdinfo(void)
+{
+}
+
 int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        bd_t *bd = gd->bd;
@@ -74,8 +78,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 #ifdef DEBUG
        bdinfo_print_num("bd address", (ulong)bd);
 #endif
-       if (IS_ENABLED(CONFIG_ARM))
-               bdinfo_print_num("arch_number", bd->bi_arch_number);
        bdinfo_print_num("boot_params", (ulong)bd->bi_boot_params);
        print_bi_dram(bd);
        bdinfo_print_num("memstart", (ulong)bd->bi_memstart);
@@ -98,44 +100,11 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 #if defined(CONFIG_LCD) || defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)
        bdinfo_print_num("FB base  ", gd->fb_base);
 #endif
-
-       /* This section is used only by ARM */
-#ifdef CONFIG_ARM
-#ifdef CONFIG_SYS_MEM_RESERVE_SECURE
-       if (gd->arch.secure_ram & MEM_RESERVE_SECURE_SECURED) {
-               bdinfo_print_num("Secure ram",
-                         gd->arch.secure_ram & MEM_RESERVE_SECURE_ADDR_MASK);
-       }
-#endif
-#ifdef CONFIG_RESV_RAM
-       if (gd->arch.resv_ram)
-               bdinfo_print_num("Reserved ram", gd->arch.resv_ram);
-#endif
-#if !(CONFIG_IS_ENABLED(SYS_ICACHE_OFF) && CONFIG_IS_ENABLED(SYS_DCACHE_OFF))
-       bdinfo_print_num("TLB addr", gd->arch.tlb_addr);
-#endif
-       bdinfo_print_num("irq_sp", gd->irq_sp); /* irq stack pointer */
-       bdinfo_print_num("sp start ", gd->start_addr_sp);
-       /*
-        * TODO: Currently only support for davinci SOC's is added.
-        * Remove this check once all the board implement this.
-        */
-#ifdef CONFIG_CLOCKS
-       printf("ARM frequency = %ld MHz\n", gd->bd->bi_arm_freq);
-       printf("DSP frequency = %ld MHz\n", gd->bd->bi_dsp_freq);
-       printf("DDR frequency = %ld MHz\n", gd->bd->bi_ddr_freq);
-#endif
-#ifdef CONFIG_BOARD_TYPES
-       printf("Board Type  = %ld\n", gd->board_type);
-#endif
-#if CONFIG_VAL(SYS_MALLOC_F_LEN)
-       printf("Early malloc usage: %lx / %x\n", gd->malloc_ptr,
-              CONFIG_VAL(SYS_MALLOC_F_LEN));
-#endif
 #if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
        bdinfo_print_num("multi_dtb_fit", (ulong)gd->multi_dtb_fit);
 #endif
-#endif /* CONFIG_ARM */
+
+       arch_print_bdinfo();
 
        /* This section is used only by ppc */
 #if defined(CONFIG_MPC8xx) || defined(CONFIG_E500)
@@ -170,7 +139,7 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        /* The rest are used only by m68k */
 #ifdef CONFIG_M68K
 #if defined(CONFIG_SYS_MBAR)
-       print_num("mbar", bd->bi_mbar_base);
+       bdinfo_print_num("mbar", bd->bi_mbar_base);
 #endif
        bdinfo_print_mhz("cpufreq", bd->bi_intfreq);
        if (IS_ENABLED(CONFIG_PCI))

diff --git a/include/init.h b/include/init.h
index af4deed566dd4c3d678d13ae5770b75e1d853b04..e727031514c1c63a8818d1b93ea871d5d0477560 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -267,6 +267,9 @@ void bdinfo_print_num(const char *name, ulong value);
 /* Print a clock speed in MHz */
 void bdinfo_print_mhz(const char *name, unsigned long hz);
 
+/* Show arch-specific information for the 'bd' command */
+void arch_print_bdinfo(void);
+
 #endif /* __ASSEMBLY__ */
 /* Put only stuff here that the assembler can digest */