[coreboot-gerrit] New patch to review for coreboot: d93b669 chromeos: provide stub functions for !CONFIG_VBOOT_VERIFY_FIRMWARE
Marc Jones (marc.jones@se-eng.com)
gerrit at coreboot.org
Tue Nov 11 00:43:50 CET 2014
Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7395
-gerrit
commit d93b669ca55b71429f401176d2d891327a7a5e52
Author: Aaron Durbin <adurbin at chromium.org>
Date: Tue Feb 4 12:38:41 2014 -0600
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 at chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/184841
(cherry picked from commit f6d95cf4ba6ce1bc0e1df4a0e9f655ad9fea9feb)
Signed-off-by: Marc Jones <marc.jones at se-eng.com>
Conflicts:
src/cpu/intel/haswell/romstage.c
src/lib/cbfs.c
src/southbridge/intel/lynxpoint/spi_loading.c
src/vendorcode/google/chromeos/chromeos.h
Change-Id: If35ace863243e36399fc40c2802a2f7f2711e83b
---
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 65ee3b4..edb2fdf 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 6da9267..536e401 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -41,6 +41,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"
More information about the coreboot-gerrit
mailing list