diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-15 13:04:48 +0300 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2020-06-18 12:51:09 +0000 |
| commit | 000d91af00af762b4ddc52f574a25e18c7aa1a0b (patch) | |
| tree | 1d8109a70e7460f457489402f5aeb56f47d52aba /src/soc/intel/broadwell/acpi.c | |
| parent | 7ac76ecf9127d2b58467a49746b9fc112dd4ef4c (diff) | |
| download | coreboot-000d91af00af762b4ddc52f574a25e18c7aa1a0b.tar.xz | |
soc/intel,chromeos: Fix EC RO/RW status in GNVS
For baytrail and braswell, explicitly initialise
it to ACTIVE_ECFW_RO without ChromeEC.
For broadwell and skylake, fix it to report actual
google_ec_running_ro() status.
Change-Id: I30236c41c9261fd9f8565e1c5fdbfe6f46114e28
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42389
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/broadwell/acpi.c')
| -rw-r--r-- | src/soc/intel/broadwell/acpi.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c index fce2e45ed8..0d83c01882 100644 --- a/src/soc/intel/broadwell/acpi.c +++ b/src/soc/intel/broadwell/acpi.c @@ -161,15 +161,16 @@ void acpi_init_gnvs(global_nvs_t *gnvs) gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE); #endif -#if CONFIG(CHROMEOS) - /* Initialize Verified Boot data */ - chromeos_init_chromeos_acpi(&(gnvs->chromeos)); -#if CONFIG(EC_GOOGLE_CHROMEEC) - gnvs->chromeos.vbt2 = google_ec_running_ro() ? - ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; -#endif - gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; -#endif + if (CONFIG(CHROMEOS)) { + /* Initialize Verified Boot data */ + chromeos_init_chromeos_acpi(&(gnvs->chromeos)); + if (CONFIG(EC_GOOGLE_CHROMEEC)) { + gnvs->chromeos.vbt2 = google_ec_running_ro() ? + ACTIVE_ECFW_RO : ACTIVE_ECFW_RW; + } else { + gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; + } + } } unsigned long acpi_fill_mcfg(unsigned long current) |