Change in coreboot[master]: vboot: fix up some includes

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Joel Kitching (Code Review)

14 Feb 2020 14 Feb '20

5:20 a.m.

Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/38884 )

Change subject: vboot: fix up some includes ......................................................................

vboot: fix up some includes

These header files need to make use of vb2_shared_data. Remove the last vestiges of vboot1 in coreboot.

BUG=b:124141368, chromium:1038260 TEST=Build locally with CL:2054269 TEST=make clean && make test-abuild BRANCH=none

Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Signed-off-by: Joel Kitching kitching@google.com --- M src/security/vboot/misc.h M src/security/vboot/vboot_common.h 2 files changed, 2 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/38884/1

diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h index 2d5b084..324af5c 100644 --- a/src/security/vboot/misc.h +++ b/src/security/vboot/misc.h @@ -18,9 +18,7 @@

#include <assert.h> #include <security/vboot/vboot_common.h> - -struct vb2_context; -struct vb2_shared_data; +#include <vb2_api.h>

/* * Source: security/vboot/common.c diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h index 976c26a..57f3475 100644 --- a/src/security/vboot/vboot_common.h +++ b/src/security/vboot/vboot_common.h @@ -17,8 +17,7 @@

#include <commonlib/region.h> #include <stdint.h> -#include <vboot_api.h> -#include <vboot_struct.h> +#include <vb2_api.h>

/* * Function to check if there is a request to enter recovery mode. Returns

Attachments:

attachment.htm (text/html — 3.4 KB)

Show replies by date

Hung-Te Lin (Code Review)

14 Feb 14 Feb

6:45 a.m.

Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38884 )

Change subject: vboot: fix up some includes ......................................................................

Patch Set 1:

src/security/vboot/ec_sync.c:424:16: error: unknown type name 'VbScreenData'

-- To view, visit https://review.coreboot.org/c/coreboot/+/38884 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Gerrit-Change-Number: 38884 Gerrit-PatchSet: 1 Gerrit-Owner: Joel Kitching kitching@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Hung-Te Lin hungte@chromium.org Gerrit-Reviewer: Joel Kitching kitching@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Fri, 14 Feb 2020 06:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

Joel Kitching (Code Review)

6:47 a.m.

Hello Aaron Durbin, Julius Werner, Hung-Te Lin, build bot (Jenkins),

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

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

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

Change subject: vboot: fix up some includes ......................................................................

vboot: fix up some includes

These header files need to make use of vb2_shared_data. Remove the last vestiges of vboot1 data structures in coreboot.

BUG=b:124141368, chromium:1038260 TEST=Build locally with CL:2054269 TEST=make clean && make test-abuild BRANCH=none

Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Signed-off-by: Joel Kitching kitching@google.com --- M src/security/vboot/ec_sync.c M src/security/vboot/misc.h M src/security/vboot/vboot_common.h 3 files changed, 3 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/38884/2

-- To view, visit https://review.coreboot.org/c/coreboot/+/38884 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Gerrit-Change-Number: 38884 Gerrit-PatchSet: 2 Gerrit-Owner: Joel Kitching kitching@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Hung-Te Lin hungte@chromium.org Gerrit-Reviewer: Joel Kitching kitching@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Hung-Te Lin (Code Review)

6:51 a.m.

Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38884 )

Change subject: vboot: fix up some includes ......................................................................

Patch Set 2: Code-Review+2

LGTM if build success.

-- To view, visit https://review.coreboot.org/c/coreboot/+/38884 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Gerrit-Change-Number: 38884 Gerrit-PatchSet: 2 Gerrit-Owner: Joel Kitching kitching@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Hung-Te Lin hungte@chromium.org Gerrit-Reviewer: Joel Kitching kitching@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Fri, 14 Feb 2020 06:51:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Patrick Georgi (Code Review)

7:21 a.m.

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38884 )

Change subject: vboot: fix up some includes ......................................................................

Patch Set 2: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/38884 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Gerrit-Change-Number: 38884 Gerrit-PatchSet: 2 Gerrit-Owner: Joel Kitching kitching@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Hung-Te Lin hungte@chromium.org Gerrit-Reviewer: Joel Kitching kitching@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Fri, 14 Feb 2020 07:21:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Patrick Georgi (Code Review)

7:21 a.m.

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/38884 )

Change subject: vboot: fix up some includes ......................................................................

vboot: fix up some includes

These header files need to make use of vb2_shared_data. Remove the last vestiges of vboot1 data structures in coreboot.

BUG=b:124141368, chromium:1038260 TEST=Build locally with CL:2054269 TEST=make clean && make test-abuild BRANCH=none

Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Signed-off-by: Joel Kitching kitching@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/38884 Reviewed-by: Hung-Te Lin hungte@chromium.org Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/security/vboot/ec_sync.c M src/security/vboot/misc.h M src/security/vboot/vboot_common.h 3 files changed, 3 insertions(+), 5 deletions(-)

Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Hung-Te Lin: Looks good to me, approved

diff --git a/src/security/vboot/ec_sync.c b/src/security/vboot/ec_sync.c index ecceff5..f4f9c23 100644 --- a/src/security/vboot/ec_sync.c +++ b/src/security/vboot/ec_sync.c @@ -23,6 +23,7 @@ #include <timer.h> #include <timestamp.h> #include <vb2_api.h> +#include <vboot_api.h>

#define _EC_FILENAME(select, suffix) \ (select == VB_SELECT_FIRMWARE_READONLY ? "ecro" suffix : "ecrw" suffix) diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h index 2d5b084..324af5c 100644 --- a/src/security/vboot/misc.h +++ b/src/security/vboot/misc.h @@ -18,9 +18,7 @@

#include <assert.h> #include <security/vboot/vboot_common.h> - -struct vb2_context; -struct vb2_shared_data; +#include <vb2_api.h>

#include <commonlib/region.h> #include <stdint.h> -#include <vboot_api.h> -#include <vboot_struct.h> +#include <vb2_api.h>

/* * Function to check if there is a request to enter recovery mode. Returns

-- To view, visit https://review.coreboot.org/c/coreboot/+/38884 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Gerrit-Change-Number: 38884 Gerrit-PatchSet: 3 Gerrit-Owner: Joel Kitching kitching@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Hung-Te Lin hungte@chromium.org Gerrit-Reviewer: Joel Kitching kitching@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: merged

9elements QA (Code Review)

7:40 a.m.

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/38884 )

Change subject: vboot: fix up some includes ......................................................................

Patch Set 3:

Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/592 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/591 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/590

Please note: This test is under development and might not be accurate at all!

-- To view, visit https://review.coreboot.org/c/coreboot/+/38884 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61b27e33751c11aac9f8af261a75d83b003b5f92 Gerrit-Change-Number: 38884 Gerrit-PatchSet: 3 Gerrit-Owner: Joel Kitching kitching@google.com Gerrit-Reviewer: Aaron Durbin adurbin@chromium.org Gerrit-Reviewer: Hung-Te Lin hungte@chromium.org Gerrit-Reviewer: Joel Kitching kitching@google.com Gerrit-Reviewer: Julius Werner jwerner@chromium.org Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: 9elements QA hardwaretestrobot@gmail.com Gerrit-Comment-Date: Fri, 14 Feb 2020 07:40:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1559

days inactive

1559

days old

coreboot-gerrit@coreboot.org

6 comments

4 participants

tags (0)

participants (4)

9elements QA (Code Review)
Hung-Te Lin (Code Review)
Joel Kitching (Code Review)
Patrick Georgi (Code Review)