Patrick Georgi merged this change.
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(-)
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;
/*
To view, visit change 32135. To unsubscribe, or for help writing mail filters, visit settings.