summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2014-02-04 12:38:41 -0600
committerMarc Jones <marc.jones@se-eng.com>2014-11-15 00:39:39 +0100
commite742dda985ac428b85d8e90d384ac134c0808af6 (patch)
tree68d5b5cd31dbec095afe3a033859c48b092392fe /src
parent7d221b4ef21833bd2f6be2a8116da22f340c2006 (diff)
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 <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/184841 (cherry picked from commit f6d95cf4ba6ce1bc0e1df4a0e9f655ad9fea9feb) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: If35ace863243e36399fc40c2802a2f7f2711e83b Reviewed-on: http://review.coreboot.org/7395 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r--src/cpu/intel/haswell/romstage.c2
-rw-r--r--src/vendorcode/google/chromeos/chromeos.h5
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 <ramstage_cache.h>
#include <romstage_handoff.h>
#include <reset.h>
-#if CONFIG_CHROMEOS
#include <vendorcode/google/chromeos/chromeos.h>
-#endif
#if CONFIG_EC_GOOGLE_CHROMEEC
#include <ec/google/chromeec/ec.h>
#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"