[coreboot-gerrit] Patch set updated for coreboot: 7386b42 intel/broadwell: guard CHROMEOS support better

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9954

-gerrit

commit 7386b42b9a67da50480ce1009174f55dbc07e87a
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Wed Apr 22 13:32:13 2015 +0200

    intel/broadwell: guard CHROMEOS support better
    
    Since CHROMEOS_VBNV_* are selected by mainboards, they
    may be active without CHROMEOS being selected. In this
    case, they should be a no-op.
    
    Change-Id: I3b84e2a919ffaa809d713e72e5e4df7a7575e6b9
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 src/soc/intel/broadwell/lpc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index 9a4c65c..6cc1116 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -178,7 +178,7 @@ static void pch_power_options(device_t dev)
 	enable_alt_smi(config->alt_gp_smi_en);
 }
 
-#if IS_ENABLED(CONFIG_CHROMEOS_VBNV_CMOS)
+#if IS_ENABLED(CONFIG_CHROMEOS) && IS_ENABLED(CONFIG_CHROMEOS_VBNV_CMOS)
 /*
  * Preserve Vboot NV data when clearing CMOS as it will
  * have been re-initialized already by Vboot firmware init.
@@ -210,7 +210,7 @@ static void pch_rtc_init(struct device *dev)
 		printk(BIOS_DEBUG, "rtc_failed = 0x%x\n", rtc_failed);
 	}
 
-#if IS_ENABLED(CONFIG_CHROMEOS_VBNV_CMOS)
+#if IS_ENABLED(CONFIG_CHROMEOS) && IS_ENABLED(CONFIG_CHROMEOS_VBNV_CMOS)
 	pch_cmos_init_preserve(rtc_failed);
 #else
 	cmos_init(rtc_failed);