[coreboot-gerrit] New patch to review for coreboot: d0b3fbe haswell: Fix issues building without CONFIG_CHROMEOS

[Duncan Laurie (dlaurie@google.com)]

Duncan Laurie (dlaurie at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5180

-gerrit

commit d0b3fbe8ff4cc3abff39cc4b13ca0bc6cce2ca9a
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Mon Feb 10 11:33:01 2014 -0800

    haswell: Fix issues building without CONFIG_CHROMEOS
    
    There are some places that make assumptions about ChromeOS
    and/or Verified Boot environment and should be guarded with
    an appropriate #ifdef CONFIG_CHROMEOS.
    
    Without this change builds will fail if CONFIG_CHROMEOS is
    not defined.
    
    Change-Id: I4077e19e4dc0cdbfa35c9b92ea9a1ed3c5483fdc
    Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
---
 src/cpu/intel/haswell/romstage.c | 2 ++
 src/ec/google/chromeec/ec.c      | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 60a1c3a..c28cfed 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -309,7 +309,9 @@ void romstage_after_car(void)
 
 	prepare_for_resume(handoff);
 
+#if CONFIG_CHROMEOS
 	vboot_verify_firmware(handoff);
+#endif
 
 	/* Load the ramstage. */
 	copy_and_run();
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index f1cefae..d512cec 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -113,6 +113,7 @@ void google_chromeec_early_init(void)
 	cec_cmd.cmd_size_out = sizeof(cec_resp);
 	google_chromeec_command(&cec_cmd);
 
+#if CONFIG_CHROMEOS
 	if (cec_cmd.cmd_code ||
 	    (recovery_mode_enabled() &&
 	     (cec_resp.current_image != EC_IMAGE_RO))) {
@@ -131,6 +132,7 @@ void google_chromeec_early_init(void)
 		hard_reset();
 		hlt();
 	}
+#endif
 }
 
 u16 google_chromeec_get_board_version(void)
@@ -394,6 +396,7 @@ void google_chromeec_init(void)
 		ec_image_type = cec_resp.current_image;
 	}
 
+#if CONFIG_CHROMEOS
 	if (cec_cmd.cmd_code ||
 	    (recovery_mode_enabled() &&
 	     (cec_resp.current_image != EC_IMAGE_RO))) {
@@ -412,7 +415,7 @@ void google_chromeec_init(void)
 		hard_reset();
 		hlt();
 	}
-
+#endif
 }
 
 int google_ec_running_ro(void)