3 files changed, 6 insertions, 2 deletions
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index 62a415b813..a0ab55d596 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -74,7 +74,7 @@ config CHROMEOS_RAMOOPS
 config CHROMEOS_RAMOOPS_DYNAMIC
 	bool "Allocate RAM oops buffer in cbmem"
 	default n
-	depends on CHROMEOS_RAMOOPS
+	depends on CHROMEOS_RAMOOPS && HAVE_ACPI_TABLES
 
 config CHROMEOS_RAMOOPS_RAM_START
 	hex "Physical address of preserved RAM"
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index ef36056b33..69fc49314d 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -34,7 +34,7 @@ ramstage-$(CONFIG_CHROMEOS_VBNV_FLASH) += vbnv_flash.c
 
 romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
 ramstage-$(CONFIG_ELOG) += elog.c
-ramstage-y += gnvs.c
+ramstage-$(CONFIG_HAVE_ACPI_TABLES) += gnvs.c
 verstage-y += fmap.c
 romstage-y += fmap.c
 ramstage-y += fmap.c
diff --git a/src/vendorcode/google/chromeos/ramoops.c b/src/vendorcode/google/chromeos/ramoops.c
index 31ef6839f8..f7177e5397 100644
--- a/src/vendorcode/google/chromeos/ramoops.c
+++ b/src/vendorcode/google/chromeos/ramoops.c
@@ -26,6 +26,8 @@
 #include <device/device.h>
 #include "chromeos.h"
 
+#if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
+
 static void set_ramoops(chromeos_acpi_t *chromeos, void *ram_oops, size_t size)
 {
 	if (chromeos == NULL) {
@@ -96,3 +98,5 @@ void chromeos_ram_oops_init(chromeos_acpi_t *chromeos)
 	set_global_chromeos_pointer(chromeos);
 	reserve_ram_oops_dynamic(chromeos);
 }
+
+#endif /* CONFIG_HAVE_ACPI_TABLES */