From 740eee5eec2a978192e8b74327cb96b735b7d0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 29 Mar 2022 00:44:51 +0300 Subject: ChromeOS: Drop filling ECFW_RW/RO state in CNVS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This field was never meant to be filled out by coreboot, because it can't know what the right value for this will be by the time the OS is running, so anything coreboot could fill in here is premature. This field is only read by the chromeos-specific `crossystem` utility, not by kernel code, so if one does not run through depthcharge there'll be many more broken assumptions in CNVS anyway. Change-Id: Ia56b3a3fc82f1b8247a6ee512fe960e9d3d87585 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/63290 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Tim Wawrzynczak --- src/vendorcode/google/chromeos/gnvs.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/vendorcode/google') diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c index b1090a44e9..33389b4ebf 100644 --- a/src/vendorcode/google/chromeos/gnvs.c +++ b/src/vendorcode/google/chromeos/gnvs.c @@ -32,8 +32,6 @@ static size_t chromeos_vpd_region(const char *region, uintptr_t *base) return region_device_sz(&vpd); } -__weak bool mainboard_ec_running_ro(void) { return true; } - void chromeos_init_chromeos_acpi(void) { size_t vpd_size; @@ -58,17 +56,6 @@ void chromeos_init_chromeos_acpi(void) chromeos_acpi->vpd_rw_base = vpd_base; chromeos_acpi->vpd_rw_size = vpd_size; } - - /* EC can override to ECFW_RW. */ - chromeos_acpi->vbt2 = ACTIVE_ECFW_RO; - - if (CONFIG(EC_GOOGLE_CHROMEEC)) { - if (!google_ec_running_ro()) - chromeos_acpi->vbt2 = ACTIVE_ECFW_RW; - } else { - if (!mainboard_ec_running_ro()) - chromeos_acpi->vbt2 = ACTIVE_ECFW_RW; - } } void chromeos_set_me_hash(u32 *hash, int len) -- cgit v1.2.3