GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/172711
Reviewed-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: http://review.coreboot.org/4879
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Aaron Durbin 2013-10-10 20:58:57 -05:00 committed by Aaron Durbin
parent d4322565ed
commit d37705c3b0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/intel/haswell/romstage.c
View File

@ -308,9 +308,7 @@ void romstage_after_car(void)
prepare_for_resume(handoff); prepare_for_resume(handoff);
#if CONFIG_VBOOT_VERIFY_FIRMWARE
vboot_verify_firmware(handoff); vboot_verify_firmware(handoff);
#endif
/* Load the ramstage. */ /* Load the ramstage. */
copy_and_run(); copy_and_run();

4
src/vendorcode/google/chromeos/chromeos.h
View File

@ -46,12 +46,14 @@ int recovery_mode_enabled(void);
/* functions implemented in vboot.c */ /* functions implemented in vboot.c */
void init_chromeos(int bootmode); void init_chromeos(int bootmode);
#if CONFIG_VBOOT_VERIFY_FIRMWARE
struct romstage_handoff; struct romstage_handoff;
#if CONFIG_VBOOT_VERIFY_FIRMWARE
void vboot_verify_firmware(struct romstage_handoff *handoff); void vboot_verify_firmware(struct romstage_handoff *handoff);
void *vboot_get_payload(size_t *len); void *vboot_get_payload(size_t *len);
/* Returns 0 on success < 0 on error. */ /* Returns 0 on success < 0 on error. */
int vboot_get_handoff_info(void **addr, uint32_t *size); int vboot_get_handoff_info(void **addr, uint32_t *size);
#else
static inline void vboot_verify_firmware(struct romstage_handoff *h) {}
#endif #endif
#endif #endif