New patch to review for filo: 3ddeb64 Show coreboot version

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2324

-gerrit

commit 3ddeb64325e5f4937d47686871b44f1b2fc4b880
Author: Mathias Krause 
Date:   Thu Oct 20 14:07:31 2011 +0200

Show coreboot version

The coreboot version is now printed in the FILO header.

Change-Id: I9a8831e574f71a22a10f10e7946062019ebb0e9f
    Signed-off-by: Patrick Georgi 
---
 include/sys_info.h  | 1 +
 main/filo.c         | 1 +
 main/grub/char_io.c | 4 ++--
 x86/sys_info.c      | 8 ++++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/sys_info.h b/include/sys_info.h
index f9af89e..33fc785 100644
--- a/include/sys_info.h
+++ b/include/sys_info.h
@@ -42,6 +42,7 @@ struct sys_info {
 void collect_sys_info(struct sys_info *info);
 void collect_elfboot_info(struct sys_info *info);
 void collect_linuxbios_info(struct sys_info *info);
+const char *get_cb_version(void);

/* Our name and version. I want to see single instance of these in the image */
 extern const char *program_name, *program_version;
diff --git a/main/filo.c b/main/filo.c
index 3187165..7d83d80 100644
--- a/main/filo.c
+++ b/main/filo.c
@@ -68,6 +68,7 @@ static void init(void)
     /* Set up the consoles. */
     console_init();

+    printf("coreboot: %s\n", get_cb_version());
     printf("%s version %s\n", program_name, program_version);
     collect_sys_info(&sys_info);
     relocate();
diff --git a/main/grub/char_io.c b/main/grub/char_io.c
index f37cc23..fec3387 100644
--- a/main/grub/char_io.c
+++ b/main/grub/char_io.c
@@ -100,8 +100,8 @@ void init_page(void)
 {
    color_set(1, NULL);
    cls();
-	grub_printf("\n                                  %s %s\n",
-			PROGRAM_NAME, PROGRAM_VERSION);
+	grub_printf("\n                     %s %s, coreboot: %s\n",
+			PROGRAM_NAME, PROGRAM_VERSION, get_cb_version());
    grub_printf("                               root_dev = %s\n",
    		root_device[0] ? root_device : "unset");
 }
diff --git a/x86/sys_info.c b/x86/sys_info.c
index 8e7d14e..68450ae 100644
--- a/x86/sys_info.c
+++ b/x86/sys_info.c
@@ -32,3 +32,11 @@ void collect_sys_info(struct sys_info *info)
    debug("boot EBX = %#lx\n", info->boot_data);
    debug("boot arg = %#lx\n", info->boot_arg);
 }
+
+const char *get_cb_version()
+{
+	const char *cb_version = lib_sysinfo.cb_version ?
+		lib_sysinfo.cb_version : "<unknown version>";
+
+	return cb_version;
+}