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>
This commit is contained in:
parent
b80ae90b6e
commit
e556f716e4
10 changed files with 0 additions and 16 deletions
|
@ -16,7 +16,6 @@ config BOARD_GOOGLE_BASEBOARD_BELTINO
|
||||||
if BOARD_GOOGLE_BASEBOARD_BELTINO
|
if BOARD_GOOGLE_BASEBOARD_BELTINO
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -39,7 +39,6 @@ config OVERRIDE_DEVICETREE
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select EC_GOOGLE_CHROMEEC_SWITCHES
|
select EC_GOOGLE_CHROMEEC_SWITCHES
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
select HAS_RECOVERY_MRC_CACHE
|
select HAS_RECOVERY_MRC_CACHE
|
||||||
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
|
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,6 @@ config CHROMEOS
|
||||||
select CHROMEOS_RAMOOPS_DYNAMIC
|
select CHROMEOS_RAMOOPS_DYNAMIC
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -108,6 +108,5 @@ config VBOOT
|
||||||
select HAS_RECOVERY_MRC_CACHE
|
select HAS_RECOVERY_MRC_CACHE
|
||||||
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
|
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
|
||||||
select VBOOT_LID_SWITCH
|
select VBOOT_LID_SWITCH
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
|
|
||||||
endif # BOARD_GOOGLE_BASEBOARD_SARIEN
|
endif # BOARD_GOOGLE_BASEBOARD_SARIEN
|
||||||
|
|
|
@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select MAINBOARD_HAS_TPM1
|
select MAINBOARD_HAS_TPM1
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
select VBOOT_VBNV_FLASH
|
select VBOOT_VBNV_FLASH
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select MAINBOARD_HAS_TPM1
|
select MAINBOARD_HAS_TPM1
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
select VBOOT_VBNV_FLASH
|
select VBOOT_VBNV_FLASH
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select INTEL_INT15
|
select INTEL_INT15
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select INTEL_INT15
|
select INTEL_INT15
|
||||||
|
|
||||||
config VBOOT
|
config VBOOT
|
||||||
select VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
select VBOOT_VBNV_CMOS
|
select VBOOT_VBNV_CMOS
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
|
|
|
@ -192,12 +192,6 @@ config VBOOT_SOFT_REBOOT_WORKAROUND
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
||||||
config VBOOT_PHYSICAL_REC_SWITCH
|
|
||||||
bool
|
|
||||||
default n
|
|
||||||
help
|
|
||||||
Whether this platform has a physical recovery switch.
|
|
||||||
|
|
||||||
config VBOOT_LID_SWITCH
|
config VBOOT_LID_SWITCH
|
||||||
bool
|
bool
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -79,8 +79,6 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff,
|
||||||
vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON;
|
vb_sd->flags |= VBSD_LF_DEV_SWITCH_ON;
|
||||||
}
|
}
|
||||||
/* TODO: Set these in depthcharge */
|
/* TODO: Set these in depthcharge */
|
||||||
if (!CONFIG(VBOOT_PHYSICAL_REC_SWITCH))
|
|
||||||
vb_sd->flags |= VBSD_BOOT_REC_SWITCH_VIRTUAL;
|
|
||||||
if (CONFIG(VBOOT_OPROM_MATTERS)) {
|
if (CONFIG(VBOOT_OPROM_MATTERS)) {
|
||||||
vb_sd->flags |= VBSD_OPROM_MATTERS;
|
vb_sd->flags |= VBSD_OPROM_MATTERS;
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue