summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorKangheui Won <khwon@chromium.org>2020-10-07 14:29:38 +1100
committerEdward O'Callaghan <quasisec@chromium.org>2020-10-08 01:22:20 +0000
commit4b5c8b554154f290d509b6db3c44f850134581b7 (patch)
treeda7363cc2c12c9604b6e5764d147f14a52704144 /util
parent0f3ef704bb8744f12d6c34b57ad7b0270070197a (diff)
downloadcoreboot-4b5c8b554154f290d509b6db3c44f850134581b7.tar.xz
rules.h: change verstage name if it 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. Change ENV_STRING for verstage to "verstage-before-bootblock" in the case and add regex in cbmem utility to grab it. BUG=b:159220781 TEST=flash and boot, check `cbmem -1` BRANCH=zork Signed-off-by: Kangheui Won <khwon@chromium.org> Change-Id: Ica38f6bfeb05605caadac208e790fd072b352732 Reviewed-on: https://review.coreboot.org/c/coreboot/+/46060 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin Roth <martinroth@google.com> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Diffstat (limited to 'util')
-rw-r--r--util/cbmem/cbmem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 34e79d368d..3a94f3e672 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -782,7 +782,8 @@ static void dump_console(int one_boot_only)
#define BANNER_REGEX(stage) \
"\n\ncoreboot-[^\n]* " stage " starting.*\\.\\.\\.\n"
#define OVERFLOW_REGEX(stage) "\n\\*\\*\\* Pre-CBMEM " stage " console overflow"
- const char *regex[] = { BANNER_REGEX("bootblock"),
+ const char *regex[] = { BANNER_REGEX("verstage-before-bootblock"),
+ BANNER_REGEX("bootblock"),
BANNER_REGEX("verstage"),
OVERFLOW_REGEX("romstage"),
BANNER_REGEX("romstage"),