summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2016-07-25 11:48:03 -0700
committerFurquan Shaikh <furquan@google.com>2016-07-28 00:36:00 +0200
commit2a12e2e8da2477d97b8774babd1a74dda65d11a0 (patch)
treec8bbdc94b777269dcdaa2c5070c61432b1001986 /src/lib
parentaf8ef2a810f97b762d30de2b6f30d6ffefa0ae0e (diff)
downloadcoreboot-2a12e2e8da2477d97b8774babd1a74dda65d11a0.tar.xz
vboot: Separate vboot from chromeos
VBOOT_VERIFY_FIRMWARE should be independent of CHROMEOS. This allows use of verified boot library without having to stick to CHROMEOS. BUG=chrome-os-partner:55639 Change-Id: Ia2c328712caedd230ab295b8a613e3c1ed1532d9 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/15867 Tested-by: build bot (Jenkins) Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/bootmode.c2
-rw-r--r--src/lib/cbfs.c2
-rw-r--r--src/lib/coreboot_table.c10
3 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index c6c29acc17..824edfb8d8 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -22,7 +22,7 @@ int developer_mode_enabled(void)
{
if (get_developer_mode_switch())
return 1;
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
+#if CONFIG_VBOOT
if (vboot_handoff_check_developer_flag())
return 1;
#endif
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index b8575f31d1..7a0f187092 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -269,7 +269,7 @@ const struct cbfs_locator __attribute__((weak)) cbfs_master_header_locator = {
extern const struct cbfs_locator vboot_locator;
static const struct cbfs_locator *locators[] = {
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
+#if CONFIG_VBOOT
&vboot_locator,
#endif
&cbfs_master_header_locator,
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index 3af2be6c9a..44ae733e9d 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -32,6 +32,7 @@
#include <cbmem.h>
#include <bootmem.h>
#include <spi_flash.h>
+#include <vboot/vbnv_layout.h>
#if CONFIG_USE_OPTION_TABLE
#include <option_table.h>
#endif
@@ -41,7 +42,6 @@
#endif
#include <vendorcode/google/chromeos/chromeos.h>
#include <vendorcode/google/chromeos/gnvs.h>
-#include <vendorcode/google/chromeos/vbnv_layout.h>
#endif
#if CONFIG_ARCH_X86
#include <cpu/x86/mtrr.h>
@@ -221,12 +221,12 @@ static void lb_vbnv(struct lb_header *header)
vbnv = (struct lb_range *)lb_new_record(header);
vbnv->tag = LB_TAG_VBNV;
vbnv->size = sizeof(*vbnv);
- vbnv->range_start = CONFIG_VBNV_OFFSET + 14;
- vbnv->range_size = VBNV_BLOCK_SIZE;
+ vbnv->range_start = CONFIG_VBOOT_VBNV_OFFSET + 14;
+ vbnv->range_size = VBOOT_VBNV_BLOCK_SIZE;
#endif
}
-#if CONFIG_VBOOT_VERIFY_FIRMWARE
+#if CONFIG_VBOOT
static void lb_vboot_handoff(struct lb_header *header)
{
void *addr;
@@ -244,7 +244,7 @@ static void lb_vboot_handoff(struct lb_header *header)
}
#else
static inline void lb_vboot_handoff(struct lb_header *header) {}
-#endif /* CONFIG_VBOOT_VERIFY_FIRMWARE */
+#endif /* CONFIG_VBOOT */
#endif /* CONFIG_CHROMEOS */
static void lb_board_id(struct lb_header *header)