Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32135
Change subject: vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH ......................................................................
vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH
This option is duplicated in depthcharge: https://crrev.com/c/1545144
BUG=b:124141368, b:124192753, chromium:943150 TEST=make clean && make test-abuild CQ-DEPEND=CL:1545144 BRANCH=none
Change-Id: I48e20ad21cdcb948a23387d3e5fcf142723b0c82 Signed-off-by: Joel Kitching kitching@google.com --- M src/mainboard/google/beltino/Kconfig M src/mainboard/google/fizz/Kconfig M src/mainboard/google/jecht/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/veyron_mickey/Kconfig M src/mainboard/google/veyron_rialto/Kconfig M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/samsung/stumpy/Kconfig M src/security/vboot/Kconfig M src/security/vboot/vboot_handoff.c 10 files changed, 0 insertions(+), 16 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/32135/1
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig index 8ebabe0..872d49d 100644 --- a/src/mainboard/google/beltino/Kconfig +++ b/src/mainboard/google/beltino/Kconfig @@ -16,7 +16,6 @@ if BOARD_GOOGLE_BASEBOARD_BELTINO
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 3c8215b..acaf8a6 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -39,7 +39,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_PHYSICAL_REC_SWITCH select HAS_RECOVERY_MRC_CACHE select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index 58f3252..15ed05b 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -16,7 +16,6 @@ select CHROMEOS_RAMOOPS_DYNAMIC
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index 6164c8e..58ab300 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -108,6 +108,5 @@ select HAS_RECOVERY_MRC_CACHE select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN select VBOOT_LID_SWITCH - select VBOOT_PHYSICAL_REC_SWITCH
endif # BOARD_GOOGLE_BASEBOARD_SARIEN diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 9858479..46bc0de 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -28,7 +28,6 @@ select MAINBOARD_HAS_TPM1
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_FLASH
config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 2aea219..189f010 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -28,7 +28,6 @@ select MAINBOARD_HAS_TPM1
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_FLASH
config MAINBOARD_DIR diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 37c967f..2d1544b 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -25,7 +25,6 @@ select INTEL_INT15
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index d17dc68..a2919f9 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -21,7 +21,6 @@ select INTEL_INT15
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index ca25423..257ce98 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -191,12 +191,6 @@ bool default n
-config VBOOT_PHYSICAL_REC_SWITCH - bool - default n - help - Whether this platform has a physical recovery switch. - config VBOOT_LID_SWITCH bool default n diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c index 1f6d4ee..2f239e6 100644 --- a/src/security/vboot/vboot_handoff.c +++ b/src/security/vboot/vboot_handoff.c @@ -79,8 +79,6 @@ vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON; } /* TODO: Set these in depthcharge */ - if (!CONFIG(VBOOT_PHYSICAL_REC_SWITCH)) - vb_sd->flags |= VBSD_BOOT_REC_SWITCH_VIRTUAL; if (CONFIG(VBOOT_OPROM_MATTERS)) { vb_sd->flags |= VBSD_OPROM_MATTERS; /*
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32135 )
Change subject: vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/32135/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/32135/1//COMMIT_MSG@10 PS1, Line 10: https://crrev.com/c/1545144 Just curious, as I don't really know vboot / deptcharge interactions..
Are the cases where we want to keep vboot without depthcharge? If some feature is duplictaed (aka redundant) would it not make more sense to keep it in vboot?
Simon Glass has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32135 )
Change subject: vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH ......................................................................
Patch Set 1: Code-Review+1
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32135 )
Change subject: vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/#/c/32135/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/32135/1//COMMIT_MSG@10 PS1, Line 10: https://crrev.com/c/1545144
Just curious, as I don't really know vboot / deptcharge interactions.. […]
This isn't removing the feature from vboot, it's just changing which code tells vboot to enable the feature. vboot has two stages (firmware verification and kernel verification) that run at different times (coreboot only ever runs the firmware verification part and depthcharge runs the kernel verification part). This flag only affects kernel verification, so it really belongs in depthcharge (or in whatever other bootloader links vboot to run that part). The fact that this flag has been set in coreboot for now is a historical oddity that grew out of how vboot developed over the years... it makes more sense to set it where it is actually used, so that's what we're fixing here.
Joel Kitching has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32135 )
Change subject: vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/#/c/32135/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/32135/1//COMMIT_MSG@10 PS1, Line 10: https://crrev.com/c/1545144
This isn't removing the feature from vboot, it's just changing which code tells vboot to enable the […]
Thanks for adding the clarifications, Julius. Kyösti, if you have any other questions about coreboot / vboot / depthcharge interactions, please let me know.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32135 )
Change subject: vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH ......................................................................
Patch Set 1: Code-Review+1
Maybe add Julius comment to the commit message?
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32135 )
Change subject: vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH ......................................................................
vboot: remove Kconfig option VBOOT_PHYSICAL_REC_SWITCH
This option is duplicated in depthcharge: https://crrev.com/c/1545144
BUG=b:124141368, b:124192753, chromium:943150 TEST=make clean && make test-abuild CQ-DEPEND=CL:1545144 BRANCH=none
Change-Id: I48e20ad21cdcb948a23387d3e5fcf142723b0c82 Signed-off-by: Joel Kitching kitching@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32135 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Simon Glass sjg@chromium.org Reviewed-by: Julius Werner jwerner@chromium.org Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net --- M src/mainboard/google/beltino/Kconfig M src/mainboard/google/fizz/Kconfig M src/mainboard/google/jecht/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/veyron_mickey/Kconfig M src/mainboard/google/veyron_rialto/Kconfig M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/samsung/stumpy/Kconfig M src/security/vboot/Kconfig M src/security/vboot/vboot_handoff.c 10 files changed, 0 insertions(+), 16 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Julius Werner: Looks good to me, approved Simon Glass: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig index 8ebabe0..872d49d 100644 --- a/src/mainboard/google/beltino/Kconfig +++ b/src/mainboard/google/beltino/Kconfig @@ -16,7 +16,6 @@ if BOARD_GOOGLE_BASEBOARD_BELTINO
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/google/fizz/Kconfig b/src/mainboard/google/fizz/Kconfig index 3c8215b..acaf8a6 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -39,7 +39,6 @@
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_PHYSICAL_REC_SWITCH select HAS_RECOVERY_MRC_CACHE select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index 58f3252..15ed05b 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -16,7 +16,6 @@ select CHROMEOS_RAMOOPS_DYNAMIC
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index 6164c8e..58ab300 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -108,6 +108,5 @@ select HAS_RECOVERY_MRC_CACHE select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN select VBOOT_LID_SWITCH - select VBOOT_PHYSICAL_REC_SWITCH
endif # BOARD_GOOGLE_BASEBOARD_SARIEN diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 9858479..46bc0de 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -28,7 +28,6 @@ select MAINBOARD_HAS_TPM1
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_FLASH
config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 2aea219..189f010 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -28,7 +28,6 @@ select MAINBOARD_HAS_TPM1
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_FLASH
config MAINBOARD_DIR diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 37c967f..2d1544b 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -25,7 +25,6 @@ select INTEL_INT15
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index d17dc68..a2919f9 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -21,7 +21,6 @@ select INTEL_INT15
config VBOOT - select VBOOT_PHYSICAL_REC_SWITCH select VBOOT_VBNV_CMOS
config MAINBOARD_DIR diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index a0cfca5..4815cb1 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -192,12 +192,6 @@ bool default n
-config VBOOT_PHYSICAL_REC_SWITCH - bool - default n - help - Whether this platform has a physical recovery switch. - config VBOOT_LID_SWITCH bool default n diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c index 1f6d4ee..2f239e6 100644 --- a/src/security/vboot/vboot_handoff.c +++ b/src/security/vboot/vboot_handoff.c @@ -79,8 +79,6 @@ vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON; } /* TODO: Set these in depthcharge */ - if (!CONFIG(VBOOT_PHYSICAL_REC_SWITCH)) - vb_sd->flags |= VBSD_BOOT_REC_SWITCH_VIRTUAL; if (CONFIG(VBOOT_OPROM_MATTERS)) { vb_sd->flags |= VBSD_OPROM_MATTERS; /*
-
Joel Kitching (Code Review) -
Julius Werner (Code Review)
-
Kyösti Mälkki (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)
-
Simon Glass (Code Review)