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

util/cbmem: Re-order regex for "cbmem -1" 

In case of console dump for only the last boot, cbmem utility checks
for a list of regex in provided order. When pre-cbmem console
overflows, "Pre-CBMEM <stage> console overflowed.. " message is added
before "... <stage> starting" message. This change fixes the order of
regex in cbmem utility to match this.

Test=Verified on soraka that "cbmem -1" correctly dumps the data
starting from Pre-CBMEM romstage overflowed.

Change-Id: I9c5667bbd02ed3e93ac77a4f42e87d754a062919
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/23800
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh 2018-02-16 16:12:02 -08:00 committed by Furquan Shaikh
parent f984a05cc7
commit 35972def1d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/cbmem/cbmem.c
View File

@ -727,10 +727,10 @@ static void dump_console(int 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" #define OVERFLOW_REGEX(stage) "\n\\*\\*\\* Pre-CBMEM " stage " console overflow"
const char *regex[] = { BANNER_REGEX("bootblock"), const char *regex[] = { BANNER_REGEX("bootblock"),
BANNER_REGEX("romstage"),
OVERFLOW_REGEX("romstage"), OVERFLOW_REGEX("romstage"),
BANNER_REGEX("ramstage"), BANNER_REGEX("romstage"),
OVERFLOW_REGEX("ramstage") }; OVERFLOW_REGEX("ramstage"),
BANNER_REGEX("ramstage") };
int i; int i;
for (i = 0; !cursor && i < ARRAY_SIZE(regex); i++) { for (i = 0; !cursor && i < ARRAY_SIZE(regex); i++) {