GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add stage information to coreboot banner 

As a convenience, print the actual stage name when entering a stage.
Also unify the banner between bootblock / romstage and ramstage. No
reason for two different occurences.

Instead of this:

coreboot-4.0 Tue May 13 14:13:37 PDT 2014 starting...
[..]
coreboot-4.0 Tue May 13 14:13:37 PDT 2014 starting...
[..]
coreboot-4.0 Tue May 13 14:13:37 PDT 2014 booting...

you will see this:

coreboot-4.0 Tue May 13 14:13:37 PDT 2014 bootblock starting...
[..]
coreboot-4.0 Tue May 13 14:13:37 PDT 2014 romstage starting...
[..]
coreboot-4.0 Tue May 13 14:13:37 PDT 2014 ramstage starting...

Roughly based on: https://chromium-review.googlesource.com/199671

Change-Id: Id5894535e0551d113c80e4ff0514287391be1bef
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://review.coreboot.org/8578
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
This commit is contained in:
Stefan Reinauer 2015-03-04 01:11:18 +01:00
parent 8ddc1f328a
commit 73307e0917
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/x86/lib/romcc_console.c
View File

@ -73,7 +73,7 @@ void console_init(void)
COREBOOT_EXTRA_VERSION COREBOOT_EXTRA_VERSION
" " " "
COREBOOT_BUILD COREBOOT_BUILD
" starting...\n"; " romstage starting...\n";
console_hw_init(); console_hw_init();

12
src/console/init.c
View File

@ -47,8 +47,14 @@ void console_init(void)
console_hw_init(); console_hw_init();
#if defined(__PRE_RAM__) printk(BIOS_INFO, "\n\ncoreboot-%s%s %s %s starting...\n",
printk(BIOS_INFO, "\n\ncoreboot-%s%s %s starting...\n", coreboot_version, coreboot_extra_version, coreboot_build,
coreboot_version, coreboot_extra_version, coreboot_build); #if defined(__BOOT_BLOCK__)
"bootblock"
#elif defined(__PRE_RAM__)
"romstage"
#else
"ramstage"
#endif #endif
);
} }

5
src/lib/hardwaremain.c
View File

@ -460,11 +460,6 @@ void main(void)
post_code(POST_CONSOLE_READY); post_code(POST_CONSOLE_READY);
printk(BIOS_NOTICE, "coreboot-%s%s %s booting...\n",
coreboot_version, coreboot_extra_version, coreboot_build);
post_code(POST_CONSOLE_BOOT_MSG);
/* Handoff sleep type from romstage. */ /* Handoff sleep type from romstage. */
#if CONFIG_HAVE_ACPI_RESUME #if CONFIG_HAVE_ACPI_RESUME
acpi_is_wakeup(); acpi_is_wakeup();