sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chromeos: Add correct dependency on HAVE_ACPI_TABLES for gvns and ramoops.

Browse Source 
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
Reviewed-on: http://review.coreboot.org/9441
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Furquan Shaikh
2014-11-08 17:32:38 -08:00
committed by Aaron Durbin
parent 54af625b2a
commit aed887f3cb
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vendorcode/google/chromeos/Kconfig
View File

@ -74,7 +74,7 @@ config CHROMEOS_RAMOOPS
config CHROMEOS_RAMOOPS_DYNAMIC config CHROMEOS_RAMOOPS_DYNAMIC
bool "Allocate RAM oops buffer in cbmem" bool "Allocate RAM oops buffer in cbmem"
default n default n
depends on CHROMEOS_RAMOOPS depends on CHROMEOS_RAMOOPS && HAVE_ACPI_TABLES
config CHROMEOS_RAMOOPS_RAM_START config CHROMEOS_RAMOOPS_RAM_START
hex "Physical address of preserved RAM" hex "Physical address of preserved RAM"

2
src/vendorcode/google/chromeos/Makefile.inc
View File

@ -34,7 +34,7 @@ ramstage-$(CONFIG_CHROMEOS_VBNV_FLASH) += vbnv_flash.c
romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += vboot.c
ramstage-$(CONFIG_ELOG) += elog.c ramstage-$(CONFIG_ELOG) += elog.c
ramstage-y += gnvs.c ramstage-$(CONFIG_HAVE_ACPI_TABLES) += gnvs.c
verstage-y += fmap.c verstage-y += fmap.c
romstage-y += fmap.c romstage-y += fmap.c
ramstage-y += fmap.c ramstage-y += fmap.c

4
src/vendorcode/google/chromeos/ramoops.c
View File

@ -26,6 +26,8 @@
#include <device/device.h> #include <device/device.h>
#include "chromeos.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) static void set_ramoops(chromeos_acpi_t *chromeos, void *ram_oops, size_t size)
{ {
if (chromeos == NULL) { if (chromeos == NULL) {
@ -96,3 +98,5 @@ void chromeos_ram_oops_init(chromeos_acpi_t *chromeos)
set_global_chromeos_pointer(chromeos); set_global_chromeos_pointer(chromeos);
reserve_ram_oops_dynamic(chromeos); reserve_ram_oops_dynamic(chromeos);
} }
#endif /* CONFIG_HAVE_ACPI_TABLES */