summaryrefslogtreecommitdiffstats
path: root/3rdparty/vboot
diff options
context:
space:
mode:
authorPaul Menzel <pmenzel@molgen.mpg.de>2020-07-16 17:46:43 +0200
committerJoel Kitching <kitching@google.com>2020-07-27 13:18:15 +0000
commit12baa811f0152667894c1cad8086bd6c7df318c3 (patch)
treea57bb557f0a222e793fb8c814815892a74e4ab85 /3rdparty/vboot
parentb7107864b7e082d673f306bd0da7ba5472690446 (diff)
downloadcoreboot-12baa811f0152667894c1cad8086bd6c7df318c3.tar.gz
coreboot-12baa811f0152667894c1cad8086bd6c7df318c3.tar.bz2
coreboot-12baa811f0152667894c1cad8086bd6c7df318c3.zip
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>
Diffstat (limited to '3rdparty/vboot')
m---------3rdparty/vboot0
1 files changed, 0 insertions, 0 deletions
diff --git a/3rdparty/vboot b/3rdparty/vboot
-Subproject 68de90c7e2f4a27d3a76489199176d2ab8f56de
+Subproject ed23c08440dae6657d026a30b504578e03e0426