summaryrefslogtreecommitdiff
path: root/src/acpi/gnvs.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-02-12 18:43:36 +0200
committerPatrick Georgi <pgeorgi@google.com>2021-04-30 06:46:07 +0000
commit8a1fcf475401f32208c48376205a443a3acbf5c1 (patch)
tree53f94d48a2d0fd877171ad69209255592207875f /src/acpi/gnvs.c
parent715cdc370c6dcfd47f247de9ff8ccd24f0a2fa03 (diff)
vc/google/chromeos: Refactor GNVS init
Move the support code for filling ChromeOS GNVS from acpi/chromeos-gnvs.c to vc/google/chromeos/gnvs.c. Change-Id: I7e92206561812eb3dc69739df49b6c3a93853858 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50612 Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Lance Zhao Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/acpi/gnvs.c')
-rw-r--r--src/acpi/gnvs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/acpi/gnvs.c b/src/acpi/gnvs.c
index 3decebbcb0..fc1a70db06 100644
--- a/src/acpi/gnvs.c
+++ b/src/acpi/gnvs.c
@@ -38,8 +38,10 @@ void acpi_create_gnvs(void)
if (CONFIG(CONSOLE_CBMEM))
gnvs->cbmc = (uintptr_t)cbmem_find(CBMEM_ID_CONSOLE);
- if (CONFIG(CHROMEOS_NVS))
- gnvs_assign_chromeos((u8 *)gnvs + GNVS_CHROMEOS_ACPI_OFFSET);
+ if (CONFIG(CHROMEOS_NVS)) {
+ chromeos_acpi_t *init = (void *)((u8 *)gnvs + GNVS_CHROMEOS_ACPI_OFFSET);
+ chromeos_init_chromeos_acpi(init);
+ }
}
void *acpi_get_gnvs(void)