[coreboot-gerrit] Patch set updated for coreboot: 45ec8f5 vboot: provide empty vboot_verify_firmware()

[Aaron Durbin]

Aaron Durbin ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4879

-gerrit

commit 45ec8f5c8052cc3fa8de6170ef6685819a4fa9a0
Author: Aaron Durbin 
Date:   Thu Oct 10 20:58:57 2013 -0500

vboot: provide empty vboot_verify_firmware()

In the case of CONFIG_VBOOT_VERIFY_FIRMWARE not being
    selected allow for calling vboot_verify_firmware()
    with an empty implementation. This allows for one not to
    clutter the source with ifdefs.

BUG=chrome-os-partner:23249
    BRANCH=None
    TEST=Built with a !CONFIG_VBOOT_VERIFY_FIRMWARE and non-guarded
         call to vboot_verify_firmware().

Change-Id: I72af717ede3c5d1db2a1f8e586fefcca82b191d5
    Signed-off-by: Aaron Durbin 
    Reviewed-on: https://chromium-review.googlesource.com/172711
    Reviewed-by: Shawn Nematbakhsh 
---
 src/cpu/intel/haswell/romstage.c          | 2 --
 src/vendorcode/google/chromeos/chromeos.h | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 40a396d..6b5780b 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -308,9 +308,7 @@ void romstage_after_car(void)

prepare_for_resume(handoff);

-#if CONFIG_VBOOT_VERIFY_FIRMWARE
    vboot_verify_firmware(handoff);
-#endif

/* Load the ramstage. */
    copy_and_run();
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index f51215e..5493801 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -46,12 +46,14 @@ int recovery_mode_enabled(void);
 /* functions implemented in vboot.c */
 void init_chromeos(int bootmode);

-#if CONFIG_VBOOT_VERIFY_FIRMWARE
 struct romstage_handoff;
+#if CONFIG_VBOOT_VERIFY_FIRMWARE
 void vboot_verify_firmware(struct romstage_handoff *handoff);
 void *vboot_get_payload(size_t *len);
 /* Returns 0 on success < 0 on error. */
 int vboot_get_handoff_info(void **addr, uint32_t *size);
+#else
+static inline void vboot_verify_firmware(struct romstage_handoff *h) {}
 #endif

#endif