From e742dda985ac428b85d8e90d384ac134c0808af6 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 4 Feb 2014 12:38:41 -0600 Subject: chromeos: provide stub functions for !CONFIG_VBOOT_VERIFY_FIRMWARE Instead of checking #if CONFIG_VBOOT_VERIFY_FIRMWARE #else #endif provide empty stub functions for !CONFIG_VBOOT_VERIFY_FIRMWARE. BUG=none BRANCH=baytrail TEST=Built and booted. Original-Change-Id: Id9d1843a0ec47c5a186c9a22ea3e4c13c89ec379 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://chromium-review.googlesource.com/184841 (cherry picked from commit f6d95cf4ba6ce1bc0e1df4a0e9f655ad9fea9feb) Signed-off-by: Marc Jones Change-Id: If35ace863243e36399fc40c2802a2f7f2711e83b Reviewed-on: http://review.coreboot.org/7395 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Paul Menzel --- src/cpu/intel/haswell/romstage.c | 2 -- src/vendorcode/google/chromeos/chromeos.h | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c index 65ee3b47e0..edb2fdfccf 100644 --- a/src/cpu/intel/haswell/romstage.c +++ b/src/cpu/intel/haswell/romstage.c @@ -35,9 +35,7 @@ #include #include #include -#if CONFIG_CHROMEOS #include -#endif #if CONFIG_EC_GOOGLE_CHROMEEC #include #endif diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 64d6fea5fa..20cac997ed 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -42,6 +42,11 @@ int vboot_enable_developer(void); int vboot_enable_recovery(void); #else 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 #include "gnvs.h" -- cgit v1.2.3