chromeos: fix some compilation issues
This fixes some compilation issues observed with CONFIG_CHROMEOS. Nothing within the vbootX subdirectories is functional yet, but a partial compilation within the chromeos direction works now. Notable fixes: duplicate definitions and missing prototypes. Change-Id: I53c7b6dcf06b8bcf41a8555094b48968c0740026 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9936 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
parent
b69b05d9f6
commit
818e928d12
|
@ -26,33 +26,6 @@
|
||||||
#include <console/console.h>
|
#include <console/console.h>
|
||||||
#include "vboot_handoff.h"
|
#include "vboot_handoff.h"
|
||||||
|
|
||||||
static int vboot_enable_developer(void)
|
|
||||||
{
|
|
||||||
struct vboot_handoff *vbho;
|
|
||||||
|
|
||||||
vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
|
|
||||||
|
|
||||||
if (vbho == NULL) {
|
|
||||||
printk(BIOS_ERR, "%s: Couldn't find vboot_handoff structure!\n",
|
|
||||||
__func__);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_DEVELOPER);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int vboot_enable_recovery(void)
|
|
||||||
{
|
|
||||||
struct vboot_handoff *vbho;
|
|
||||||
|
|
||||||
vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
|
|
||||||
|
|
||||||
if (vbho == NULL)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
return !!(vbho->init_params.out_flags & VB_INIT_OUT_ENABLE_RECOVERY);
|
|
||||||
}
|
|
||||||
|
|
||||||
int vboot_skip_display_init(void)
|
int vboot_skip_display_init(void)
|
||||||
{
|
{
|
||||||
struct vboot_handoff *vbho;
|
struct vboot_handoff *vbho;
|
||||||
|
|
|
@ -23,9 +23,14 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <bootmode.h>
|
#include <bootmode.h>
|
||||||
|
#include <rules.h>
|
||||||
#include "vboot_common.h"
|
#include "vboot_common.h"
|
||||||
#include "vboot2/misc.h"
|
#include "vboot2/misc.h"
|
||||||
|
|
||||||
|
#if ENV_ROMSTAGE
|
||||||
|
void save_chromeos_gpios(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* functions implemented in vbnv.c: */
|
/* functions implemented in vbnv.c: */
|
||||||
int get_recovery_mode_from_vbnv(void);
|
int get_recovery_mode_from_vbnv(void);
|
||||||
int vboot_wants_oprom(void);
|
int vboot_wants_oprom(void);
|
||||||
|
|
Loading…
Reference in New Issue