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 <[e-mail]>
---
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"),

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 1
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-MessageType: newchange

[Yu-ping吳宇平 (Code Review)]

Yu-ping吳宇平 has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33779 )

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


Patch Set 1: Code-Review+1


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 1
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Hung-Te Lin <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Yu-ping吳宇平 <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Tue, 25 Jun 2019 08:59:39 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33779 )

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


Patch Set 1:

(1 comment)

Thanks! One nitpick, then it looks good.

https://review.coreboot.org/#/c/33779/1/util/cbmem/cbmem.c 
File util/cbmem/cbmem.c:

https://review.coreboot.org/#/c/33779/1/util/cbmem/cbmem.c@804 
PS1, Line 804: 					OVERFLOW_REGEX("verstage"),
This doesn't belong here, that line can only happen for romstage and ramstage.



-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 1
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Hung-Te Lin <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Yu-ping吳宇平 <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Tue, 25 Jun 2019 22:58:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[You-Cheng Syu (Code Review)]

Hello Yu-ping吳宇平, Julius Werner, Hung-Te Lin, build bot (Jenkins), 

I'd like you to reexamine a change. Please visit

    https://review.coreboot.org/c/coreboot/+/33779

to look at the new patch set (#2).

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 <[e-mail]>
---
M util/cbmem/cbmem.c
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/33779/2
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 2
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Hung-Te Lin <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Yu-ping吳宇平 <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-MessageType: newpatchset

[You-Cheng Syu (Code Review)]

You-Cheng Syu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33779 )

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


Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/33779/1/util/cbmem/cbmem.c 
File util/cbmem/cbmem.c:

https://review.coreboot.org/#/c/33779/1/util/cbmem/cbmem.c@804 
PS1, Line 804: 					OVERFLOW_REGEX("verstage"),
> This doesn't belong here, that line can only happen for romstage and ramstage.
> Done

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33779 )

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


Patch Set 2: Code-Review+2


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 2
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Hung-Te Lin <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Yu-Ping Wu <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Fri, 28 Jun 2019 02:51:08 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33779 )

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


Patch Set 2: Code-Review+1

(1 comment)

Thank you.

https://review.coreboot.org/#/c/33779/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33779/2//COMMIT_MSG@10 
PS2, Line 10: (https://review.coreboot.org/30935). We should update our regular
Please use commit hashes (with commit message summary) and/or Change-Ids.



-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 2
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Hung-Te Lin <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Yu-Ping Wu <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Fri, 28 Jun 2019 16:32:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Julius Werner (Code Review)]

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33779 )

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


Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/33779/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33779/2//COMMIT_MSG@10 
PS2, Line 10: (https://review.coreboot.org/30935). We should update our regular
> Please use commit hashes (with commit message summary) and/or Change-Ids.
> You can also do CB:30935

[You-Cheng Syu (Code Review)]

Hello Yu-Ping Wu, Julius Werner, Paul Menzel, Hung-Te Lin, build bot (Jenkins), 

I'd like you to reexamine a change. Please visit

    https://review.coreboot.org/c/coreboot/+/33779

to look at the new patch set (#3).

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

util/cbmem: Update banner string regular expression

Banner string format has been changed (CB: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 <[e-mail]>
---
M util/cbmem/cbmem.c
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/79/33779/3
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 3
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Hung-Te Lin <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Yu-Ping Wu <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-MessageType: newpatchset

[You-Cheng Syu (Code Review)]

You-Cheng Syu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33779 )

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


Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/33779/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33779/2//COMMIT_MSG@10 
PS2, Line 10: (https://review.coreboot.org/30935). We should update our regular
> You can also do CB:30935
> Done

[Julius Werner (Code Review)]

Julius Werner has submitted this change and it was merged. ( 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 (CB: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 <[e-mail]>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33779
Tested-by: build bot (Jenkins) <[e-mail]>
Reviewed-by: Julius Werner <[e-mail]>
Reviewed-by: Paul Menzel <[e-mail]>
---
M util/cbmem/cbmem.c
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Julius Werner: Looks good to me, approved



diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 52fdc9b..9d2a643 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -797,9 +797,11 @@
 	   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"),
+					BANNER_REGEX("verstage"),
 					OVERFLOW_REGEX("romstage"),
 					BANNER_REGEX("romstage"),
 					OVERFLOW_REGEX("ramstage"),

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/33779
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I16eba3ac5e203e80b0bfd42a4294401dbccd4463
Gerrit-Change-Number: 33779
Gerrit-PatchSet: 4
Gerrit-Owner: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Hung-Te Lin <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: You-Cheng Syu <[e-mail]>
Gerrit-Reviewer: Yu-Ping Wu <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-MessageType: merged