diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-02-10 17:53:34 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-04-21 09:27:31 +0000 |
| commit | 84d10cc5d38d706ffecd0cd60f6e1f9d90064f96 (patch) | |
| tree | f5497cb6cb0c236cbb0b1ab002e75d8e73e5efe4 /src/mainboard | |
| parent | 307be997d1acd604a573e2ab895ef10570454fc4 (diff) | |
| download | coreboot-84d10cc5d38d706ffecd0cd60f6e1f9d90064f96.tar.xz | |
ChromeOS: Use CHROMEOS_NVS guard
Replace CONFIG(CHROMEOS) with CONFIG(CHROMEOS_NVS) for cases where
the conditional and dependency are clearly about the presence of
an ACPI NVS table specified by vendorcode. For couple locations also
CONFIG(HAVE_ACPI_TABLES) changes to CONFIG(CHROMEOS_NVS).
This also helps find some of the CONFIG(CHROMEOS) cases that might
be more FMAP and VPD related and not about ChromeOS per-se, as
suggested by followup works.
Change-Id: Ife888ae43093949bb2d3e397565033037396f434
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50611
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Lance Zhao
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/butterfly/acpi_tables.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/parrot/acpi_tables.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/stout/acpi_tables.c | 2 | ||||
| -rw-r--r-- | src/mainboard/samsung/lumpy/acpi_tables.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c index 29faea3fd0..c3324aac5e 100644 --- a/src/mainboard/google/butterfly/acpi_tables.c +++ b/src/mainboard/google/butterfly/acpi_tables.c @@ -18,7 +18,7 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) // The firmware read/write status is a "virtual" switch and // will be handled elsewhere. Until then hard-code to // read/write instead of read-only for developer mode. - if (CONFIG(CHROMEOS)) + if (CONFIG(CHROMEOS_NVS)) gnvs_set_ecfw_rw(); // the lid is open by default. diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c index 1cb45975c4..535edb8d36 100644 --- a/src/mainboard/google/parrot/acpi_tables.c +++ b/src/mainboard/google/parrot/acpi_tables.c @@ -21,7 +21,7 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->s5u0 = 0; gnvs->s5u1 = 0; - if (CONFIG(CHROMEOS) && !parrot_ec_running_ro()) + if (CONFIG(CHROMEOS_NVS) && !parrot_ec_running_ro()) gnvs_set_ecfw_rw(); /* EC handles all active thermal and fan control on Parrot. */ diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c index fe12e30ccd..19549afa25 100644 --- a/src/mainboard/google/stout/acpi_tables.c +++ b/src/mainboard/google/stout/acpi_tables.c @@ -22,7 +22,7 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->s5u0 = 0; gnvs->s5u1 = 0; - if (CONFIG(CHROMEOS) && !get_recovery_mode_switch()) + if (CONFIG(CHROMEOS_NVS) && !get_recovery_mode_switch()) gnvs_set_ecfw_rw(); /* EC handles all thermal and fan control on Stout. */ diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c index c6974573d8..282ba34c6a 100644 --- a/src/mainboard/samsung/lumpy/acpi_tables.c +++ b/src/mainboard/samsung/lumpy/acpi_tables.c @@ -44,6 +44,6 @@ void mainboard_fill_gnvs(struct global_nvs *gnvs) gnvs->tmax = MAX_TEMPERATURE; gnvs->flvl = 5; - if (CONFIG(CHROMEOS) && ec_read(0xcb)) + if (CONFIG(CHROMEOS_NVS) && ec_read(0xcb)) gnvs_set_ecfw_rw(); } |