scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-28 02:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use CONFIG_TASK_VBOOTHASH instead of CONFIG_VBOOT

Browse Source 
This fixes build breaks in 'make tests'.

BUG=none
BRANCH=none

TEST=make tests (note that this still fails due to other problems;
will fix those in a followup CL)

Change-Id: I5b5ce52ed6e44ade6051e0a091a6699c0454d61a
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/36353
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Randall Spangler
2012-10-23 10:28:42 -07:00
committed by Gerrit
parent cc263093d3
commit 8625009dc2
5 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
board/daisy/board.h
View File

@@ -21,9 +21,6 @@
#define CONFIG_PANIC_HELP
#define CONFIG_ASSERT_HELP
/* compute RW firmware hash at startup */
#define CONFIG_VBOOT
/* Allow dangerous commands all the time, since we don't have a write protect
* switch. */
/* TODO: (crosbug.com/p/9986) This is a serious security hole and should be

1
board/link/board.h
View File

@@ -26,7 +26,6 @@
#define CONFIG_TASK_PROFILING
#define CONFIG_TMP006
#define CONFIG_USB_CHARGE
#define CONFIG_VBOOT
#ifndef __ASSEMBLER__

3
board/snow/board.h
View File

@@ -28,9 +28,6 @@
#undef CONFIG_TASK_PROFILING
#define CONFIG_WATCHDOG_HELP
/* compute RW firmware hash at startup */
#define CONFIG_VBOOT
/* use STOP mode when we have nothing to do */
#define CONFIG_LOW_POWER_IDLE

3
board/spring/board.h
View File

@@ -27,9 +27,6 @@
#undef CONFIG_TASK_PROFILING
#define CONFIG_WATCHDOG_HELP
/* compute RW firmware hash at startup */
#define CONFIG_VBOOT
/* DE-ACTIVATED: use STOP mode when we have nothing to do */
#undef CONFIG_LOW_POWER_IDLE

12
common/build.mk
View File

@@ -38,18 +38,18 @@ common-$(CONFIG_USB_CHARGE)+=usb_charge.o
VBOOT_SOURCE?=/usr/src/vboot
VBOOT_DEVKEYS?=/usr/share/vboot/devkeys
CFLAGS_$(CONFIG_VBOOT)+= -DCHROMEOS_ENVIRONMENT -DCHROMEOS_EC
# CFLAGS_$(CONFIG_VBOOT)+= -DVBOOT_DEBUG
CFLAGS_$(CONFIG_TASK_VBOOTHASH)+= -DCHROMEOS_ENVIRONMENT -DCHROMEOS_EC
# CFLAGS_$(CONFIG_TASK_VBOOTHASH)+= -DVBOOT_DEBUG
common-$(CONFIG_VBOOT)+=vboot_stub.o vboot_hash.o
common-$(CONFIG_TASK_VBOOTHASH)+=vboot_stub.o vboot_hash.o
includes-$(CONFIG_VBOOT)+= \
includes-$(CONFIG_TASK_VBOOTHASH)+= \
$(VBOOT_SOURCE)/include \
$(VBOOT_SOURCE)/lib/include \
$(VBOOT_SOURCE)/lib/cryptolib/include
dirs-$(CONFIG_VBOOT)+=vboot/lib vboot/lib/cryptolib
dirs-$(CONFIG_TASK_VBOOTHASH)+=vboot/lib vboot/lib/cryptolib
vboot-$(CONFIG_VBOOT)+= \
vboot-$(CONFIG_TASK_VBOOTHASH)+= \
lib/cryptolib/padding.o \
lib/cryptolib/sha256.o