From e6aa03752ba8c22b303f3fa590cbc9cf938872ef Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Sat, 8 Nov 2014 17:32:38 -0800 Subject: [PATCH] chromeos: Add correct dependency on HAVE_ACPI_TABLES for gvns and ramoops. CQ-DEPEND=CL:228856 BUG=chrome-os-partner:33676 BRANCH=None TEST=Compiles successfully for samus, link, rush_ryu. Change-Id: I8499cab5dd08981a558688964b99b65d78bde476 Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/228743 Reviewed-by: Furquan Shaikh Commit-Queue: Furquan Shaikh Tested-by: Furquan Shaikh --- src/vendorcode/google/chromeos/Kconfig | 2 +- src/vendorcode/google/chromeos/Makefile.inc | 2 +- src/vendorcode/google/chromeos/ramoops.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 64c3f38a29..37016e7e63 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -66,7 +66,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 1147e4c2f2..2e194d78b9 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 500bc907bc..e0f851c345 100644 --- a/src/vendorcode/google/chromeos/ramoops.c +++ b/src/vendorcode/google/chromeos/ramoops.c @@ -26,6 +26,8 @@ #include #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) { @@ -97,3 +99,4 @@ void chromeos_ram_oops_init(chromeos_acpi_t *chromeos) reserve_ram_oops_dynamic(chromeos); } +#endif