Change in coreboot[master]: arch/x86: Don't allow separate verstage to boot from romcc bootblock
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
arch/x86: Don't allow separate verstage to boot from romcc bootblock
This is currently unused.
Change-Id: I8f963a27f9023fd4c6ebc418059d57e00e4dfb4c Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/arch/x86/bootblock_simple.c 1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/35824/1
diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c index fc041c8..d161435 100644 --- a/src/arch/x86/bootblock_simple.c +++ b/src/arch/x86/bootblock_simple.c @@ -27,12 +27,7 @@ #endif }
-#if CONFIG(VBOOT_SEPARATE_VERSTAGE) - const char *target1 = "fallback/verstage"; -#else const char *target1 = "fallback/romstage"; -#endif - unsigned long entry; entry = findstage(target1); if (entry)
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
Patch Set 1: Code-Review+2
Ack. It depends on VBOOT_STARTS_IN_BOOTBLOCK depends on C_ENVIRONMENT_BOOTBLOCK.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
Patch Set 1:
Patch Set 1: Code-Review+2
Ack. It depends on VBOOT_STARTS_IN_BOOTBLOCK depends on C_ENVIRONMENT_BOOTBLOCK.
Heh, I forgot to even check that. I just knew that CAR setup was never linked in verstage. I'll update the commit message.
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
Patch Set 1: Code-Review+2
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35824/1/src/arch/x86/bootblock_simp... File src/arch/x86/bootblock_simple.c:
https://review.coreboot.org/c/coreboot/+/35824/1/src/arch/x86/bootblock_simp... PS1, Line 30: #if CONFIG(VBOOT_SEPARATE_VERSTAGE) Should we #error out here in this configuration? Or silently not honor the Kconfig? Or add the dependency in Kconfig?
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35824/1/src/arch/x86/bootblock_simp... File src/arch/x86/bootblock_simple.c:
https://review.coreboot.org/c/coreboot/+/35824/1/src/arch/x86/bootblock_simp... PS1, Line 30: #if CONFIG(VBOOT_SEPARATE_VERSTAGE)
Should we #error out here in this configuration? Or silently not honor the Kconfig? Or add the dependency in Kconfig?
VBOOT_SEPARATE_VERSTAGE depends on VBOOT_STARTS_IN_BOOTBLOCK which depends on C_ENVIRONMENT_BOOTBLOCK, so this is already taken care off.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/35824/1/src/arch/x86/bootblock_simp... File src/arch/x86/bootblock_simple.c:
https://review.coreboot.org/c/coreboot/+/35824/1/src/arch/x86/bootblock_simp... PS1, Line 30: #if CONFIG(VBOOT_SEPARATE_VERSTAGE)
Should we #error out here in this configuration? Or silently not honor the Kconfig? Or add the dep […]
Done
Hello Kyösti Mälkki, build bot (Jenkins), Nico Huber,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/35824
to look at the new patch set (#2).
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
arch/x86: Don't allow separate verstage to boot from romcc bootblock
CONFIG_VBOOT_SEPARATE_VERSTAGE has a dependency on C_ENVIRONMENT_BOOTBLOCK so Kconfig already guards against this.
Change-Id: I8f963a27f9023fd4c6ebc418059d57e00e4dfb4c Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/arch/x86/bootblock_simple.c 1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/35824/2
Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
Patch Set 2: Code-Review+2
Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35824 )
Change subject: arch/x86: Don't allow separate verstage to boot from romcc bootblock ......................................................................
arch/x86: Don't allow separate verstage to boot from romcc bootblock
CONFIG_VBOOT_SEPARATE_VERSTAGE has a dependency on C_ENVIRONMENT_BOOTBLOCK so Kconfig already guards against this.
Change-Id: I8f963a27f9023fd4c6ebc418059d57e00e4dfb4c Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/35824 Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/arch/x86/bootblock_simple.c 1 file changed, 0 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved Nico Huber: Looks good to me, approved Aaron Durbin: Looks good to me, approved
diff --git a/src/arch/x86/bootblock_simple.c b/src/arch/x86/bootblock_simple.c index fc041c8..d161435 100644 --- a/src/arch/x86/bootblock_simple.c +++ b/src/arch/x86/bootblock_simple.c @@ -27,12 +27,7 @@ #endif }
-#if CONFIG(VBOOT_SEPARATE_VERSTAGE) - const char *target1 = "fallback/verstage"; -#else const char *target1 = "fallback/romstage"; -#endif - unsigned long entry; entry = findstage(target1); if (entry)
-
Aaron Durbin (Code Review) -
Arthur Heymans (Code Review)
-
Kyösti Mälkki (Code Review)
-
Nico Huber (Code Review)