From 3dc1792f1df9a9cd982bb63d3b29cc16c08bd7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Tue, 16 Mar 2021 19:01:48 +0200
Subject: ChromeOS: Separate NVS from global GNVS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/lib/hardwaremain.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/lib')

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();
 
-- 
cgit v1.2.3