diff options
| author | Joel Kitching <kitching@google.com> | 2019-04-01 21:49:59 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-04-04 10:33:38 +0000 |
| commit | e556f716e43daac7a8f553213eadbe352e19a79b (patch) | |
| tree | 991ea0645604c39a1e77d0f9e85ddd405d1a4708 | |
| parent | b80ae90b6e2a4a1185ada2f64e982cd1b01702ad (diff) | |
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>
| -rw-r--r-- | src/mainboard/google/beltino/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/fizz/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/jecht/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/sarien/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_mickey/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_rialto/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/samsung/lumpy/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/samsung/stumpy/Kconfig | 1 | ||||
| -rw-r--r-- | src/security/vboot/Kconfig | 6 | ||||
| -rw-r--r-- | src/security/vboot/vboot_handoff.c | 2 |
10 files changed, 0 insertions, 16 deletions
diff --git a/src/mainboard/google/beltino/Kconfig b/src/mainboard/google/beltino/Kconfig index 8ebabe0ba2..872d49ddee 100644 --- a/src/mainboard/google/beltino/Kconfig +++ b/src/mainboard/google/beltino/Kconfig @@ -16,7 +16,6 @@ config BOARD_GOOGLE_BASEBOARD_BELTINO 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 3c8215be15..acaf8a6dc2 100644 --- a/src/mainboard/google/fizz/Kconfig +++ b/src/mainboard/google/fizz/Kconfig @@ -39,7 +39,6 @@ config OVERRIDE_DEVICETREE 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 58f3252d12..15ed05b04b 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -16,7 +16,6 @@ config CHROMEOS 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 6164c8e146..58ab300249 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -108,6 +108,5 @@ config VBOOT 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 9858479363..46bc0de7e6 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS 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 2aea21975a..189f010a96 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS 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 37c967f804..2d1544b12a 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS 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 d17dc6842f..a2919f94e0 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS 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 a0cfca5a68..4815cb10f9 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -192,12 +192,6 @@ config VBOOT_SOFT_REBOOT_WORKAROUND 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 1f6d4ee354..2f239e639a 100644 --- a/src/security/vboot/vboot_handoff.c +++ b/src/security/vboot/vboot_handoff.c @@ -79,8 +79,6 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, 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; /* |