diff options
author | Aaron Durbin <adurbin@chromium.org> | 2015-04-22 10:41:42 -0500 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-28 16:09:56 +0200 |
commit | 1124cec59a2c705a4ef3740dbdf0f68113602d31 (patch) | |
tree | e5c519b0539e581c05c9d9f610a1a6deea9cd3a6 /src/vendorcode/google/chromeos/chromeos.h | |
parent | 6d65f796db04927bfc8324f50ad0816cec9673b6 (diff) |
chromeos: remove VBOOT2_VERIFY_FIRMWARE option
There's no need to have the VBOOT2_VERIFY_FIRMWARE
distinction because it's the only game in town.
Change-Id: I82aab665934c27829e1a04115bf499ae527a91aa
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9958
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/vendorcode/google/chromeos/chromeos.h')
-rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 78be422b08..3e427b91a1 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -62,18 +62,18 @@ static inline int vboot_skip_display_init(void) { return 0; } struct romstage_handoff; -#if CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE +#if CONFIG_VBOOT_VERIFY_FIRMWARE /* Returns 0 on success < 0 on error. */ int vboot_get_handoff_info(void **addr, uint32_t *size); void *vboot_get_payload(int *len); -#else /* CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE */ +#else /* CONFIG_VBOOT_VERIFY_FIRMWARE */ static inline void vboot_verify_firmware(struct romstage_handoff *h) {} static inline void *vboot_get_payload(int *len) { return NULL; } static inline int vboot_get_handoff_info(void **addr, uint32_t *size) { return -1; } -#endif /* CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE */ +#endif /* CONFIG_VBOOT_VERIFY_FIRMWARE */ int vboot_get_sw_write_protect(void); |