Kangheui Won has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46060 )
Change subject: console: change header when vboot starts before bootblock ......................................................................
console: change header when vboot starts before bootblock
VBOOT_STARTS_VEFORE_BOOTBLOCK indicates that verstage starts before bootblock. However "cbmem -1" will first try to match "bootblock starting" to find out the beginning of console for current boot.
In case "cbmem -1" cannot find "bootblock starting", it will fall back to find "verstage starting". Replace "bootblock starting" to "bootblock-after-verstage starting" in header to let cbmem utility find for "verstage starting" for beginning of console.
BUG=b:159220781 TEST=flash and boot, check `cbmem -1` BRANCH=zork
Signed-off-by: Kangheui Won khwon@chromium.org Change-Id: Ica38f6bfeb05605caadac208e790fd072b352732 --- M src/console/init.c 1 file changed, 13 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/60/46060/1
diff --git a/src/console/init.c b/src/console/init.c index 1dba9ad..adf6239 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -74,7 +74,17 @@
console_inited = 1;
- printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING " starting (log level: %i)...\n", - coreboot_version, coreboot_extra_version, coreboot_build, - get_log_level()); + printk(BIOS_NOTICE, "\n\ncoreboot-%s%s %s " ENV_STRING, + coreboot_version, coreboot_extra_version, coreboot_build); + + /* + * if verstage runs before bootblock and we're in bootblock, + * append something to ENV_STRING not to be matched against + * "bootblock starting". This will let cbmem utility to + * look for "verstage starting" for start of the log. + */ + if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK) && ENV_BOOTBLOCK) + printk(BIOS_NOTICE, "-after-verstage"); + + printk(BIOS_NOTICE, " starting (log level: %i)...\n", get_log_level()); }