erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chromeos: provide stub functions for !CONFIG_VBOOT_VERIFY_FIRMWARE

Browse source 
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.

Change-Id: Id9d1843a0ec47c5a186c9a22ea3e4c13c89ec379
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/184841
This commit is contained in:
Aaron Durbin 2014-02-04 12:38:41 -06:00 • committed by chrome-internal-fetch
commit f6d95cf4ba
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/intel/haswell/romstage.c
View file

@ -36,9 +36,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
@ -327,9 +325,7 @@ void romstage_after_car(void)
prepare_for_resume(handoff);
#if CONFIG_VBOOT_VERIFY_FIRMWARE
vboot_verify_firmware(handoff);
#endif
/* Load the ramstage. */
copy_and_run();

4
src/lib/cbfs.c
View file

@ -63,11 +63,7 @@
#include "cbfs_core.c"
#if CONFIG_VBOOT_VERIFY_FIRMWARE
#include <vendorcode/google/chromeos/chromeos.h>
#else
static inline void *vboot_get_payload(int *len) { return NULL; }
#endif
#ifndef __SMM__
static inline int tohex4(unsigned int c)

4
src/southbridge/intel/lynxpoint/spi_loading.c
View file

@ -25,11 +25,7 @@
#include <cbfs.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#if CONFIG_VBOOT_VERIFY_FIRMWARE
#include <vendorcode/google/chromeos/chromeos.h>
#else
static inline void *vboot_get_payload(int *len) { return NULL; }
#endif
#define CACHELINE_SIZE 64
#define INTRA_CACHELINE_MASK (CACHELINE_SIZE - 1)

6
src/vendorcode/google/chromeos/chromeos.h
View file

@ -21,6 +21,7 @@
#define __CHROMEOS_H__
#include <stdint.h>
#include <stddef.h>
/* functions implemented per mainboard: */
int get_developer_mode_switch(void);
@ -53,6 +54,11 @@ void *vboot_get_payload(int *len);
int vboot_get_handoff_info(void **addr, uint32_t *size);
#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
#endif