From a7a23874564ec35b6bd76039439e65a7b8149e54 Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Fri, 15 Mar 2019 14:19:04 +0800 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/31909 Reviewed-by: Julius Werner Reviewed-by: Furquan Shaikh Tested-by: build bot (Jenkins) --- src/security/vboot/Kconfig | 8 -------- src/security/vboot/vboot_handoff.c | 5 +---- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'src/security') 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)) { -- cgit v1.2.3