Change in coreboot[master]: [WIP] security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE
Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35408 )
Change subject: [WIP] security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
[WIP] security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE
Fix regression after commit 21160a7 Add definition for ENV_ROMSTAGE_OR_BEFORE to <rules.h>
Builds with VBOOT_STARTS_IN_ROMSTAGE=y would evaluate ENV_ROMSTAGE_OR_BEFORE incorrectly for verstage-class.
Follow-up changes for CBMEM console and timestamps, where defined(__PRE_RAM__) tests are replaced, are likely to have caused regressions such that VBOOT console and timestamps are missing.
Change-Id: Idc274409c495efea95eeecd0538b2f8b847970ad Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/include/rules.h 1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/35408/1
diff --git a/src/include/rules.h b/src/include/rules.h index dc4210a..a9569c1 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -267,7 +267,8 @@ #endif
#define ENV_ROMSTAGE_OR_BEFORE \ - (ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_VERSTAGE || ENV_ROMSTAGE) + (ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_ROMSTAGE || \ + (ENV_VERSTAGE && !CONFIG(VBOOT_STARTS_IN_ROMSTAGE)))
#if CONFIG(ARCH_X86) /* Indicates memory layout is determined with arch/x86/car.ld. */
Hello Aaron Durbin, Julius Werner, Frans Hendriks, Patrick Rudolph, Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35408
to look at the new patch set (#2).
Change subject: [WIP] security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
[WIP] security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE
Fix regression after commit 21160a7 Add definition for ENV_ROMSTAGE_OR_BEFORE to <rules.h>
Builds with VBOOT_STARTS_IN_ROMSTAGE=y would evaluate ENV_ROMSTAGE_OR_BEFORE incorrectly for verstage-class.
Follow-up changes for CBMEM console and timestamps, where defined(__PRE_RAM__) tests are replaced, are likely to have caused regressions such that VBOOT console and timestamps are missing.
Change-Id: Idc274409c495efea95eeecd0538b2f8b847970ad Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/include/rules.h 1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/35408/2
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35408 )
Change subject: [WIP] security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
Patch Set 2: Code-Review+1
(2 comments)
https://review.coreboot.org/c/coreboot/+/35408/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35408/2//COMMIT_MSG@7 PS2, Line 7: [WIP] remove the [wip]?
https://review.coreboot.org/c/coreboot/+/35408/2/src/include/rules.h File src/include/rules.h:
https://review.coreboot.org/c/coreboot/+/35408/2/src/include/rules.h@271 PS2, Line 271: ROMSTAGE Make this positive logic by using the BOOTBLOCK Kconfig option?
Hello Aaron Durbin, Julius Werner, Frans Hendriks, Patrick Rudolph, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35408
to look at the new patch set (#3).
Change subject: security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE
Fix regression after commit 21160a7 Add definition for ENV_ROMSTAGE_OR_BEFORE to <rules.h>
Builds with VBOOT_STARTS_IN_ROMSTAGE=y would evaluate ENV_ROMSTAGE_OR_BEFORE incorrectly for verstage-class.
Follow-up changes for CBMEM console and timestamps, where defined(__PRE_RAM__) tests are replaced, are likely to have caused regressions such that VBOOT console and timestamps are missing.
Change-Id: Idc274409c495efea95eeecd0538b2f8b847970ad Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/include/rules.h 1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/35408/3
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35408 )
Change subject: security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
Patch Set 3:
(2 comments)
https://review.coreboot.org/c/coreboot/+/35408/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/35408/2//COMMIT_MSG@7 PS2, Line 7: [WIP]
remove the [wip]?
Done
https://review.coreboot.org/c/coreboot/+/35408/2/src/include/rules.h File src/include/rules.h:
https://review.coreboot.org/c/coreboot/+/35408/2/src/include/rules.h@271 PS2, Line 271: ROMSTAGE
Make this positive logic by using the BOOTBLOCK Kconfig option?
Done
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35408 )
Change subject: security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
Patch Set 3: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35408 )
Change subject: security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
Patch Set 3: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35408 )
Change subject: security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE ......................................................................
security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE
Fix regression after commit 21160a7 Add definition for ENV_ROMSTAGE_OR_BEFORE to <rules.h>
Builds with VBOOT_STARTS_IN_ROMSTAGE=y would evaluate ENV_ROMSTAGE_OR_BEFORE incorrectly for verstage-class.
Follow-up changes for CBMEM console and timestamps, where defined(__PRE_RAM__) tests are replaced, are likely to have caused regressions such that VBOOT console and timestamps are missing.
Change-Id: Idc274409c495efea95eeecd0538b2f8b847970ad Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/35408 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/include/rules.h 1 file changed, 2 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved Furquan Shaikh: Looks good to me, approved
diff --git a/src/include/rules.h b/src/include/rules.h index dc4210a..0436198 100644 --- a/src/include/rules.h +++ b/src/include/rules.h @@ -267,7 +267,8 @@ #endif
#define ENV_ROMSTAGE_OR_BEFORE \ - (ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_VERSTAGE || ENV_ROMSTAGE) + (ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_ROMSTAGE || \ + (ENV_VERSTAGE && CONFIG(VBOOT_STARTS_IN_BOOTBLOCK)))
#if CONFIG(ARCH_X86) /* Indicates memory layout is determined with arch/x86/car.ld. */
-
Aaron Durbin (Code Review) -
Furquan Shaikh (Code Review)
-
Kyösti Mälkki (Code Review)
-
Patrick Georgi (Code Review)