diff options
| author | Joel Kitching <kitching@google.com> | 2019-03-15 14:19:04 +0800 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-03-25 18:04:06 +0000 |
| commit | a7a23874564ec35b6bd76039439e65a7b8149e54 (patch) | |
| tree | 77722248f833f5de5ef255f46f648312d9935049 | |
| parent | 4e11bff0cfee7e7bd3367099b6daf61f6179043d (diff) | |
| download | coreboot-a7a23874564ec35b6bd76039439e65a7b8149e54.tar.xz | |
vboot: remove VBOOT_EC_SLOW_UPDATE Kconfig option
This option has been relocated to depthcharge:
https://crrev.com/c/1524806
BUG=b:124141368, b:124192753
TEST=Build and deploy to eve
TEST=util/lint/checkpatch.pl -g origin/master..HEAD
TEST=util/abuild/abuild -B -e -y -c 50 -p none -x
TEST=make clean && make test-abuild
CQ-DEPEND=CL:1524806
BRANCH=none
Change-Id: Ib4a83af2ba143577a064fc0d72c9bc318db56adc
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31909
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/google/kahlee/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/oak/Kconfig | 1 | ||||
| -rw-r--r-- | src/security/vboot/Kconfig | 8 | ||||
| -rw-r--r-- | src/security/vboot/vboot_handoff.c | 5 | ||||
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 1 |
5 files changed, 1 insertions, 15 deletions
diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index 921f1be69a..3398902b38 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -101,7 +101,6 @@ config ONBOARD_VGA_IS_PRIMARY config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES select VBOOT_LID_SWITCH - select VBOOT_EC_SLOW_UPDATE if VBOOT_EC_SOFTWARE_SYNC config VBOOT_VBNV_OFFSET hex diff --git a/src/mainboard/google/oak/Kconfig b/src/mainboard/google/oak/Kconfig index 9d6fa0e2fb..b770944a36 100644 --- a/src/mainboard/google/oak/Kconfig +++ b/src/mainboard/google/oak/Kconfig @@ -47,7 +47,6 @@ config BOARD_SPECIFIC_OPTIONS config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES - select VBOOT_EC_SLOW_UPDATE select VBOOT_VBNV_FLASH config MAINBOARD_DIR diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index de0ee6d991..004113b34f 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -200,14 +200,6 @@ config VBOOT_EC_SOFTWARE_SYNC firmware similar to how vboot verifies the main system firmware. This option selects whether vboot should support EC software sync. -config VBOOT_EC_SLOW_UPDATE - bool - default n - depends on VBOOT_EC_SOFTWARE_SYNC - help - Whether the EC (or PD) is slow to update and needs to display a - screen that informs the user the update is happening. - config VBOOT_PHYSICAL_DEV_SWITCH bool default n diff --git a/src/security/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c index 27d89d0fa2..f009440abd 100644 --- a/src/security/vboot/vboot_handoff.c +++ b/src/security/vboot/vboot_handoff.c @@ -81,11 +81,8 @@ static void fill_vboot_handoff(struct vboot_handoff *vboot_handoff, /* TODO: Set these in depthcharge */ if (!CONFIG(VBOOT_PHYSICAL_DEV_SWITCH)) vb_sd->flags |= VBSD_HONOR_VIRT_DEV_SWITCH; - if (CONFIG(VBOOT_EC_SOFTWARE_SYNC)) { + if (CONFIG(VBOOT_EC_SOFTWARE_SYNC)) vb_sd->flags |= VBSD_EC_SOFTWARE_SYNC; - if (CONFIG(VBOOT_EC_SLOW_UPDATE)) - vb_sd->flags |= VBSD_EC_SLOW_UPDATE; - } if (!CONFIG(VBOOT_PHYSICAL_REC_SWITCH)) vb_sd->flags |= VBSD_BOOT_REC_SWITCH_VIRTUAL; if (CONFIG(VBOOT_OPROM_MATTERS)) { diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 53094b19e8..75d2d628d6 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -104,7 +104,6 @@ config CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC config VBOOT - select VBOOT_EC_SLOW_UPDATE if VBOOT_EC_SOFTWARE_SYNC select VBOOT_SEPARATE_VERSTAGE select VBOOT_OPROM_MATTERS select VBOOT_SAVE_RECOVERY_REASON_ON_REBOOT |