x86: Add a few more items to bdinfo

Add the timer and vendor/model information.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/lib/bdinfo.c b/arch/x86/lib/bdinfo.c
index 0cb79b01bd3567237f450c754e5e5402f3b5ed8a..15390070fe85765f3bc93f0f9f2f11ca3d09e8ce 100644 (file)
--- a/arch/x86/lib/bdinfo.c
+++ b/arch/x86/lib/bdinfo.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <efi.h>
 #include <init.h>
+#include <asm/cpu.h>
 #include <asm/efi.h>
 #include <asm/global_data.h>
 
@@ -16,6 +17,11 @@ DECLARE_GLOBAL_DATA_PTR;
 void arch_print_bdinfo(void)
 {
        bdinfo_print_num_l("prev table", gd->arch.table);
+       bdinfo_print_num_l("clock_rate", gd->arch.clock_rate);
+       bdinfo_print_num_l("tsc_base", gd->arch.tsc_base);
+       bdinfo_print_num_l("vendor", gd->arch.x86_vendor);
+       bdinfo_print_str(" name", cpu_vendor_name(gd->arch.x86_vendor));
+       bdinfo_print_num_l("model", gd->arch.x86_model);
 
        if (IS_ENABLED(CONFIG_EFI_STUB))
                efi_show_bdinfo();

diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index bf002f84475df6e282350ea10be981e8d717efa0..8ae7fb35fe9a630678126eee734b7777afb59950 100644 (file)
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -26,6 +26,11 @@ void bdinfo_print_size(const char *name, uint64_t size)
        print_size(size, "\n");
 }
 
+void bdinfo_print_str(const char *name, const char *str)
+{
+       printf("%-12s= %s\n", name, str);
+}
+
 void bdinfo_print_num_l(const char *name, ulong value)
 {
        printf("%-12s= 0x%0*lx\n", name, 2 * (int)sizeof(value), value);

diff --git a/include/init.h b/include/init.h
index 699dc2482c08698bf088aa8aa48269226329aab1..88730816851c5c1a7cfeaa49f0e49299ea6e6121 100644 (file)
--- a/include/init.h
+++ b/include/init.h
@@ -353,6 +353,9 @@ void relocate_code(ulong start_addr_sp, struct global_data *new_gd,
 void bdinfo_print_num_l(const char *name, ulong value);
 void bdinfo_print_num_ll(const char *name, unsigned long long value);
 
+/* Print a string value (for use in arch_print_bdinfo()) */
+void bdinfo_print_str(const char *name, const char *str);
+
 /* Print a clock speed in MHz */
 void bdinfo_print_mhz(const char *name, unsigned long hz);