diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig
index 39c0152e28..3c88a8459b 100644
--- a/src/soc/nvidia/tegra210/Kconfig
+++ b/src/soc/nvidia/tegra210/Kconfig
@@ -18,7 +18,6 @@ config SOC_NVIDIA_TEGRA210
 if SOC_NVIDIA_TEGRA210
 
 config CHROMEOS
-	select CHROMEOS_RAMOOPS_NON_ACPI
 	select VBOOT_OPROM_MATTERS
 
 config MAINBOARD_DO_DSI_INIT
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index c3f909487f..4858630703 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -47,7 +47,7 @@ config CHROMEOS_RAMOOPS_DYNAMIC
 
 config CHROMEOS_RAMOOPS_NON_ACPI
 	bool "Allocate RAM oops buffer in cbmem passed through cb tables to payload"
-	default n
+	default y if !HAVE_ACPI_TABLES
 	depends on CHROMEOS_RAMOOPS && !HAVE_ACPI_TABLES
 
 config CHROMEOS_RAMOOPS_RAM_START