summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2021-03-16 19:01:48 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2021-06-14 19:44:08 +0000
commit3dc1792f1df9a9cd982bb63d3b29cc16c08bd7f6 (patch)
treeca58c0c5d8ace4df40fa68adf9bf22c55b00a522 /src/lib
parent5c124a97aaea675bdff1d690993e17bcbd901a2f (diff)
ChromeOS: Separate NVS from global GNVS
Allocate chromeos_acpi in CBMEM separately from GNVS. Change-Id: Ide55964ed53ea1d5b3c1c4e3ebd67286b7d568e4 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/51638 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/hardwaremain.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 90c910a320..1bda525c7e 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -24,6 +24,7 @@
#include <timer.h>
#include <timestamp.h>
#include <thread.h>
+#include <vendorcode/google/chromeos/gnvs.h>
static boot_state_t bs_pre_device(void *arg);
static boot_state_t bs_dev_init_chips(void *arg);
@@ -461,6 +462,9 @@ void main(void)
if (CONFIG(ACPI_SOC_NVS))
acpi_create_gnvs();
+ if (CONFIG(CHROMEOS_NVS))
+ chromeos_init_chromeos_acpi();
+
/* Schedule the static boot state entries. */
boot_state_schedule_static_entries();