diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-04-21 15:23:41 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2015-04-22 16:18:43 +0200 |
| commit | 818e928d12be9376476ee299fccf9cfe47abb1f2 (patch) | |
| tree | b30cfca8e4b314659f798acbf130b02836a5fd71 /src/vendorcode/google | |
| parent | b69b05d9f65e608bbeb2891a70438ed531fa1a81 (diff) | |
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>
Diffstat (limited to 'src/vendorcode/google')
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.c | 27 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 5 |
2 files changed, 5 insertions, 27 deletions
diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c index 08d96921cf..1da96766ca 100644 --- a/src/vendorcode/google/chromeos/chromeos.c +++ b/src/vendorcode/google/chromeos/chromeos.c @@ -26,33 +26,6 @@ #include <console/console.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) { struct vboot_handoff *vbho; diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 7e7ba9afd2..78be422b08 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -23,9 +23,14 @@ #include <stddef.h> #include <stdint.h> #include <bootmode.h> +#include <rules.h> #include "vboot_common.h" #include "vboot2/misc.h" +#if ENV_ROMSTAGE +void save_chromeos_gpios(void); +#endif + /* functions implemented in vbnv.c: */ int get_recovery_mode_from_vbnv(void); int vboot_wants_oprom(void); |