summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2018-02-16 16:12:02 -0800
committerFurquan Shaikh <furquan@google.com>2018-02-19 22:00:16 +0000
commit35972def1d448b515dd7582d5e93474e7b443981 (patch)
treeb6ff7285108b0c2f44d67831202ce84eb1a4658d
parentf984a05cc79e3f87f474b5470a28e51a105ba309 (diff)
downloadcoreboot-35972def1d448b515dd7582d5e93474e7b443981.tar.xz
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>
-rw-r--r--util/cbmem/cbmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 09957baf24..eae5da3390 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -727,10 +727,10 @@ 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"),
- 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++) {