[coreboot-gerrit] Change in ...coreboot[master]: util/cbmem: Update banner string regular expression

[You-Cheng Syu (Code Review)]

You-Cheng Syu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33779

Change subject: util/cbmem: Update banner string regular expression
......................................................................

util/cbmem: Update banner string regular expression

Banner string format has been changed
(https://review.coreboot.org/30935). We should update our regular
expression correspondingly.

Also add "verstage" into the stage search list since some boards (e.g.,
Kukui) might start console initialization at verstage.

Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Signed-off-by: You-Cheng Syu 
---
M util/cbmem/cbmem.c
1 file changed, 4 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/33779/1

diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 52fdc9b..6f8216a 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -797,9 +797,12 @@
       a banner, store the last match for that stage in cursor and stop. */
    cursor = 0;
    if (one_boot_only) {
-#define BANNER_REGEX(stage) "\n\ncoreboot-[^\n]* " stage " starting\.\.\.\n"
+#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"),
+					OVERFLOW_REGEX("verstage"),
+					BANNER_REGEX("verstage"),
    				OVERFLOW_REGEX("romstage"),
    				BANNER_REGEX("romstage"),
    				OVERFLOW_REGEX("ramstage"),