From 6b0d0851645cf369e2fd08a2d11ffc441df7f7aa Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Wed, 8 Jun 2022 10:23:32 +0800 Subject: security/vboot: Deprecate VBOOT_VBNV_EC Boards using VBOOT_VBNV_EC (nyan, daisy, veyron, peach_pit) are all ChromeOS devices and they've reached the end of life since Feb 2022. Therefore, remove VBOOT_VBNV_EC for them, each with different replacement. - nyan (nyan, nyan_big, nyan_blaze): Add RW_NVRAM to their FMAP (by reducing the size of RW_VPD), and replace VBOOT_VBNV_EC with VBOOT_VBNV_FLASH. - veyron: Add RW_NVRAM to their FMAP (by reducing the size of SHARED_DATA), and replace VBOOT_VBNV_EC with VBOOT_VBNV_FLASH. Also enlarge the OVERLAP_VERSTAGE_ROMSTAGE section for rk3288 (by reducing the size of PRERAM_CBMEM_CONSOLE), so that verstage won't exceed its allotted size. - daisy: Because BOOT_DEVICE_SPI_FLASH is not set, which is required for VBOOT_VBNV_FLASH, disable MAINBOARD_HAS_CHROMEOS and VBOOT configs. - peach_pit: As VBOOT is not set, simply remove the unused VBOOT_VBNV_EC option. Remove the VBOOT_VBNV_EC Kconfig option as well as related code, leaving VBOOT_VBNV_FLASH and VBOOT_VBNV_CMOS as the only two backend options for vboot nvdata (VBNV). Also add a check in read_vbnv() and save_vbnv() for VBNV options. BUG=b:178689388 TEST=util/abuild/abuild -t GOOGLE_NYAN -x -a TEST=util/abuild/abuild -t GOOGLE_VEYRON_JAQ -x -a TEST=util/abuild/abuild -t GOOGLE_DAISY -a TEST=util/abuild/abuild -t GOOGLE_PEACH_PIT -a BRANCH=none Change-Id: Ic67d69e694cff3176dbee12d4c6311bc85295863 Signed-off-by: Yu-Ping Wu Reviewed-on: https://review.coreboot.org/c/coreboot/+/65012 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/security/vboot/Kconfig | 6 ------ src/security/vboot/Makefile.inc | 5 ----- src/security/vboot/vbnv.c | 9 +++++---- src/security/vboot/vbnv_ec.c | 17 ----------------- 4 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 src/security/vboot/vbnv_ec.c (limited to 'src/security') diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index 04770c94eb..06f9e93485 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -58,12 +58,6 @@ config VBOOT_VBNV_CMOS_BACKUP_TO_FLASH Vboot non-volatile storage data will be backed up from CMOS to flash and restored from flash if the CMOS is invalid due to power loss. -config VBOOT_VBNV_EC - bool - default n - help - VBNV is stored in EC - config VBOOT_VBNV_FLASH bool default n diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 52f374ec82..2caeb17434 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -72,11 +72,6 @@ verstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c romstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c ramstage-$(CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH) += vbnv_flash.c -bootblock-$(CONFIG_VBOOT_VBNV_EC) += vbnv_ec.c -verstage-$(CONFIG_VBOOT_VBNV_EC) += vbnv_ec.c -romstage-$(CONFIG_VBOOT_VBNV_EC) += vbnv_ec.c -ramstage-$(CONFIG_VBOOT_VBNV_EC) += vbnv_ec.c - bootblock-$(CONFIG_VBOOT_VBNV_FLASH) += vbnv_flash.c verstage-$(CONFIG_VBOOT_VBNV_FLASH) += vbnv_flash.c romstage-$(CONFIG_VBOOT_VBNV_FLASH) += vbnv_flash.c diff --git a/src/security/vboot/vbnv.c b/src/security/vboot/vbnv.c index 7e92401e55..26946fd335 100644 --- a/src/security/vboot/vbnv.c +++ b/src/security/vboot/vbnv.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ +#include #include #include #include @@ -61,10 +62,10 @@ void read_vbnv(uint8_t *vbnv_copy) { if (CONFIG(VBOOT_VBNV_CMOS)) read_vbnv_cmos(vbnv_copy); - else if (CONFIG(VBOOT_VBNV_EC)) - read_vbnv_ec(vbnv_copy); else if (CONFIG(VBOOT_VBNV_FLASH)) read_vbnv_flash(vbnv_copy); + else + dead_code(); /* Check data for consistency */ if (!verify_vbnv(vbnv_copy)) @@ -79,10 +80,10 @@ void save_vbnv(const uint8_t *vbnv_copy) { if (CONFIG(VBOOT_VBNV_CMOS)) save_vbnv_cmos(vbnv_copy); - else if (CONFIG(VBOOT_VBNV_EC)) - save_vbnv_ec(vbnv_copy); else if (CONFIG(VBOOT_VBNV_FLASH)) save_vbnv_flash(vbnv_copy); + else + dead_code(); /* Clear initialized flag to force cached data to be updated */ vbnv_initialized = 0; diff --git a/src/security/vboot/vbnv_ec.c b/src/security/vboot/vbnv_ec.c deleted file mode 100644 index fcae37a910..0000000000 --- a/src/security/vboot/vbnv_ec.c +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include - -void read_vbnv_ec(uint8_t *vbnv_copy) -{ - google_chromeec_vbnv_context(1, vbnv_copy, VBOOT_VBNV_BLOCK_SIZE); -} - -void save_vbnv_ec(const uint8_t *vbnv_copy) -{ - google_chromeec_vbnv_context(0, (uint8_t *)vbnv_copy, - VBOOT_VBNV_BLOCK_SIZE); -} -- cgit v1.2.3