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>
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 90c910a..1bda525 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 @@
 	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();