Paul Menzel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
3rdparty/vboot: Update submodule pointer to upstream master
Building depthcharge master currently fails as depthcharge commit 74ca8ae5 (depthcharge: Hide dev mode timeout description) changed the function signature according to vboot commit 59fd331b (vboot/ui: pass timer_disabled to vb2ex_display_ui()), which is not yet present in the vboot checkout:
$ make […] CC drivers/ec/vboot_auxfw.depthcharge.o src/drivers/ec/vboot_auxfw.c: In function 'display_firmware_sync_screen': src/drivers/ec/vboot_auxfw.c:117:5: error: too many arguments to function 'vb2ex_display_ui' vb2ex_display_ui(VB2_SCREEN_FIRMWARE_SYNC, ^~~~~~~~~~~~~~~~ In file included from /dev/shm/coreboot-1/3rdparty/vboot/firmware/include/vb2_api.h:18, from src/drivers/ec/vboot_auxfw.c:17: /dev/shm/coreboot-1/3rdparty/vboot/firmware/include/../2lib/include/2api.h:1262:13: note: declared here vb2_error_t vb2ex_display_ui(enum vb2_screen screen, ^~~~~~~~~~~~~~~~
So update the submodule pointer from commit 68de90c7 (Allow building for non-CrOS environments) to commit ed23c084 (Reset EC when transitioning to dev mode).
This brings in 7 new commits.
Change-Id: Icd5408fb824fc5da470774b7f493b916dff17832 Signed-off-by: Paul Menzel pmenzel@molgen.mpg.de --- M 3rdparty/vboot 1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/43517/1
diff --git a/3rdparty/vboot b/3rdparty/vboot index 68de90c..ed23c08 160000 --- a/3rdparty/vboot +++ b/3rdparty/vboot @@ -1 +1 @@ -Subproject commit 68de90c7e2f4a27d3a76489199176d2ab8f56de1 +Subproject commit ed23c08440dae6657d026a30b504578e03e0426f
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1: Code-Review+1
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5 Not sure if it's worth mentioning all of this, since depthcharge ToT is not expected to compile with coreboot upstream ToT (=
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
Not sure if it's worth mentioning all of this, since depthcharge ToT is not expected to compile with […]
What depthcharge version is expected to work?
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
What depthcharge version is expected to work?
I'd like to get CL:2318026 in, it fixes building google/sarien
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
I'd like to get CL:2318026 in, it fixes building google/sarien
depthcharge ToT should always compile against CrOS coreboot and vboot_reference ToT. In other words, the firmware repos in CrOS world should always be consistent.
Upstream coreboot is usually a few commits ahead of CrOS coreboot, and upstream coreboot/3rdparty/vboot is usually a few commits behind CrOS vboot_reference.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
depthcharge ToT should always compile against CrOS coreboot and vboot_reference ToT. […]
Right, but building google/sarien with the current vboot tag is not possible because of a linker error (fixed in the change I linked above). I wonder why the builders didn't catch that.
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
Right, but building google/sarien with the current vboot tag is not possible because of a linker err […]
Oh, sorry for misunderstanding. Yeah, if there's a coreboot compile error for google/sarien with the current vboot tag, then definitely let's get this in ASAP.
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
Oh, sorry for misunderstanding. […]
Resolve the comment.
Joel Kitching has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
3rdparty/vboot: Update submodule pointer to upstream master
Building depthcharge master currently fails as depthcharge commit 74ca8ae5 (depthcharge: Hide dev mode timeout description) changed the function signature according to vboot commit 59fd331b (vboot/ui: pass timer_disabled to vb2ex_display_ui()), which is not yet present in the vboot checkout:
$ make […] CC drivers/ec/vboot_auxfw.depthcharge.o src/drivers/ec/vboot_auxfw.c: In function 'display_firmware_sync_screen': src/drivers/ec/vboot_auxfw.c:117:5: error: too many arguments to function 'vb2ex_display_ui' vb2ex_display_ui(VB2_SCREEN_FIRMWARE_SYNC, ^~~~~~~~~~~~~~~~ In file included from /dev/shm/coreboot-1/3rdparty/vboot/firmware/include/vb2_api.h:18, from src/drivers/ec/vboot_auxfw.c:17: /dev/shm/coreboot-1/3rdparty/vboot/firmware/include/../2lib/include/2api.h:1262:13: note: declared here vb2_error_t vb2ex_display_ui(enum vb2_screen screen, ^~~~~~~~~~~~~~~~
So update the submodule pointer from commit 68de90c7 (Allow building for non-CrOS environments) to commit ed23c084 (Reset EC when transitioning to dev mode).
This brings in 7 new commits.
Change-Id: Icd5408fb824fc5da470774b7f493b916dff17832 Signed-off-by: Paul Menzel pmenzel@molgen.mpg.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/43517 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Yu-Ping Wu yupingso@google.com Reviewed-by: Joel Kitching kitching@google.com --- M 3rdparty/vboot 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Joel Kitching: Looks good to me, approved Yu-Ping Wu: Looks good to me, but someone else must approve
diff --git a/3rdparty/vboot b/3rdparty/vboot index 68de90c..ed23c08 160000 --- a/3rdparty/vboot +++ b/3rdparty/vboot @@ -1 +1 @@ -Subproject commit 68de90c7e2f4a27d3a76489199176d2ab8f56de1 +Subproject commit ed23c08440dae6657d026a30b504578e03e0426f
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
Resolve the comment.
Um, but CL:2318026 hasn't been submitted yet. It's there, waiting for someone to run it in the CQ (I can't do it, I'm not a Googler and the CQ yells at me if I try to invoke it)
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
Um, but CL:2318026 hasn't been submitted yet. […]
So just to clarify, the google/sarien issue is separate from the one that Paul posted, and we'll need to update the vboot tag again once CL:2318026 merges. Is that correct?
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43517 )
Change subject: 3rdparty/vboot: Update submodule pointer to upstream master ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/43517/1//COMMIT_MSG@9 PS1, Line 9: Building depthcharge master currently fails as depthcharge commit 74ca8ae5
So just to clarify, the google/sarien issue is separate from the one that Paul posted, and we'll nee […]
Yes, exactly. Sorry if I didn't explain myself clearly before.
-
Angel Pons (Code Review) -
Joel Kitching (Code Review)
-
Paul Menzel (Code Review)
-
Yu-Ping Wu (Code Review)