Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/23800
Change subject: util/cbmem: Re-order regex for "cbmem -1" ......................................................................
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 --- M util/cbmem/cbmem.c 1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/23800/1
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c index 09957ba..eae5da3 100644 --- a/util/cbmem/cbmem.c +++ b/util/cbmem/cbmem.c @@ -727,10 +727,10 @@ #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"), - BANNER_REGEX("romstage"), OVERFLOW_REGEX("romstage"), - BANNER_REGEX("ramstage"), - OVERFLOW_REGEX("ramstage") }; + BANNER_REGEX("romstage"), + OVERFLOW_REGEX("ramstage"), + BANNER_REGEX("ramstage") }; int i;
for (i = 0; !cursor && i < ARRAY_SIZE(regex); i++) {