diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2015-04-22 15:10:59 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-22 16:18:29 +0200 |
| commit | b69b05d9f65e608bbeb2891a70438ed531fa1a81 (patch) | |
| tree | 05b85eac5285a2388fae41ff71368e151e4e8878 | |
| parent | 6e5f22eb1c34fd70a58f8e016189689a843e4fb8 (diff) | |
| download | coreboot-b69b05d9f65e608bbeb2891a70438ed531fa1a81.tar.xz | |
chromeos: make functions visible with CONFIG_CHROMEOS
They were keyed to VBOOT_VERIFY_FIRMWARE which made them invisible
under some circumstances.
Change-Id: I61c56b4d245351fae0ec14f80bcd17ba93184651
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/9956
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index dad357e71d..7e7ba9afd2 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -43,11 +43,16 @@ void elog_add_boot_reason(void); /* functions implemented in watchdog.c */ void elog_add_watchdog_reset(void); void reboot_from_watchdog(void); + +int vboot_enable_developer(void); +int vboot_enable_recovery(void); +int vboot_skip_display_init(void); #else static inline void init_chromeos(int bootmode) { } static inline void elog_add_boot_reason(void) { return; } static inline void elog_add_watchdog_reset(void) { return; } static inline void reboot_from_watchdog(void) { return; } +static inline int vboot_skip_display_init(void) { return 0; } #endif /* CONFIG_CHROMEOS */ struct romstage_handoff; @@ -55,9 +60,6 @@ struct romstage_handoff; #if CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE /* Returns 0 on success < 0 on error. */ int vboot_get_handoff_info(void **addr, uint32_t *size); -int vboot_enable_developer(void); -int vboot_enable_recovery(void); -int vboot_skip_display_init(void); void *vboot_get_payload(int *len); #else /* CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE */ static inline void vboot_verify_firmware(struct romstage_handoff *h) {} @@ -66,7 +68,6 @@ static inline int vboot_get_handoff_info(void **addr, uint32_t *size) { return -1; } -static inline int vboot_skip_display_init(void) { return 0; } #endif /* CONFIG_VBOOT_VERIFY_FIRMWARE || CONFIG_VBOOT2_VERIFY_FIRMWARE */ int vboot_get_sw_write_protect(void); |