[coreboot-gerrit] New patch to review for coreboot: 83dae61 chromeos: Add empty functions when CONFIG_CHROMEOS is disabled

Marc Jones (marc.jones@se-eng.com) gerrit at coreboot.org
Wed Dec 17 07:07:30 CET 2014


Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7843

-gerrit

commit 83dae6190c3470b389226f70bea70ff14c12bcb4
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Tue Apr 22 10:52:31 2014 -0700

    chromeos: Add empty functions when CONFIG_CHROMEOS is disabled
    
    This allows the chromeos header and functions to be included
    without needing to guard with #if CONFIG_CHROMEOS.
    
    BUG=chrome-os-partner:28234
    BRANCH=None
    TEST=emerge-rambi coreboot
    
    Original-Change-Id: I523813dc9521d533242ae2d2bc822eb8b0ffa5e2
    Original-Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/196265
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    (cherry picked from commit b78ccada9a01f54a60993dfc2c618201d31df9ad)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: Ic2f7127966da716e114336c30829a6403d82e180
---
 src/vendorcode/google/chromeos/chromeos.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index 6e3b2da..00f3cc2 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -31,8 +31,12 @@ int vboot_wants_oprom(void);
 void read_vbnv(uint8_t *vbnv_copy);
 void save_vbnv(const uint8_t *vbnv_copy);
 
+#if CONFIG_CHROMEOS
 /* functions implemented in vboot.c */
 void init_chromeos(int bootmode);
+#else
+static inline void init_chromeos(int bootmode) { }
+#endif /* CONFIG_CHROMEOS */
 
 struct romstage_handoff;
 #if CONFIG_VBOOT_VERIFY_FIRMWARE



More information about the coreboot-gerrit mailing list