[coreboot-gerrit] Patch set updated for coreboot: dcda16e Fix builds with disabled ChromeOS

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4291

-gerrit

commit dcda16edee46693a9824b448dd6dca9640628e37
Author: Kyösti Mälkki 
Date:   Sun Aug 18 18:08:40 2013 +0300

Fix builds with disabled ChromeOS

Change-Id: I1a59405499deceed7df01a03834be72830e6578f
    Signed-off-by: Kyösti Mälkki 
---
 src/mainboard/samsung/lumpy/acpi_tables.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 13e9e0f..4aeccbc 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -30,7 +30,9 @@
 #include <device/pci_ids.h>
 #include <cpu/x86/msr.h>
 #include <ec/acpi/ec.h>
+#if CONFIG_CHROMEOS
 #include <vendorcode/google/chromeos/gnvs.h>
+#endif

extern const unsigned char AmlCode[];
 #if CONFIG_HAVE_ACPI_SLIC
@@ -98,9 +100,10 @@ static void acpi_create_gnvs(global_nvs_t *gnvs)
    gnvs->did[3] = 0x80000410;
    gnvs->did[4] = 0x00000005;

+#if CONFIG_CHROMEOS
    // TODO(reinauer) this could move elsewhere?
    chromeos_init_vboot(&(gnvs->chromeos));
-
+#endif
    acpi_update_thermal_table(gnvs);

gnvs->chromeos.vbt2 = ec_read(0xcb) ? ACTIVE_ECFW_RW : ACTIVE_ECFW_RO;