Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9441
-gerrit
commit a485b1ba3ca9dda9096eaac21768e494ebc0edde Author: Furquan Shaikh furquan@google.com Date: Sat Nov 8 17:32:38 2014 -0800
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.
Original-Change-Id: I8499cab5dd08981a558688964b99b65d78bde476 Original-Signed-off-by: Furquan Shaikh furquan@google.com Original-Reviewed-on: https://chromium-review.googlesource.com/228743 Original-Reviewed-by: Furquan Shaikh furquan@chromium.org Original-Commit-Queue: Furquan Shaikh furquan@chromium.org Original-Tested-by: Furquan Shaikh furquan@chromium.org
(cherry picked from commit e6aa03752ba8c22b303f3fa590cbc9cf938872ef) Signed-off-by: Aaron Durbin adurbin@chromium.org
Change-Id: Ib229756d8dece6f5670460702413f74bc2c692df --- src/vendorcode/google/chromeos/Kconfig | 2 +- src/vendorcode/google/chromeos/Makefile.inc | 2 +- src/vendorcode/google/chromeos/ramoops.c | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 62a415b..a0ab55d 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 2e98664..0908b45 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 31ef683..f7177e5 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 */