diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-10-23 10:28:42 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-10-23 17:32:03 -0700 |
| commit | 8625009dc2bb6f276c99893165cc636dda9b0ebe (patch) | |
| tree | 807d2eda007bb56ac039b598564cb5ea77538e18 | |
| parent | cc263093d35b2b274b52ff182927f5a15634b4b6 (diff) | |
| download | chrome-ec-8625009dc2bb6f276c99893165cc636dda9b0ebe.tar.gz | |
Use CONFIG_TASK_VBOOTHASH instead of CONFIG_VBOOT
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>
| -rw-r--r-- | board/daisy/board.h | 3 | ||||
| -rw-r--r-- | board/link/board.h | 1 | ||||
| -rw-r--r-- | board/snow/board.h | 3 | ||||
| -rw-r--r-- | board/spring/board.h | 3 | ||||
| -rw-r--r-- | common/build.mk | 12 |
5 files changed, 6 insertions, 16 deletions
diff --git a/board/daisy/board.h b/board/daisy/board.h index 91d7ed473f..b2308abc6f 100644 --- a/board/daisy/board.h +++ b/board/daisy/board.h @@ -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 diff --git a/board/link/board.h b/board/link/board.h index 2212e5565b..1e997c0190 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -26,7 +26,6 @@ #define CONFIG_TASK_PROFILING #define CONFIG_TMP006 #define CONFIG_USB_CHARGE -#define CONFIG_VBOOT #ifndef __ASSEMBLER__ diff --git a/board/snow/board.h b/board/snow/board.h index 86af96c01c..749960bc6f 100644 --- a/board/snow/board.h +++ b/board/snow/board.h @@ -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 diff --git a/board/spring/board.h b/board/spring/board.h index c89f8cf674..e31a635fad 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -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 diff --git a/common/build.mk b/common/build.mk index 0b8ecc30ea..bac305d331 100644 --- a/common/build.mk +++ b/common/build.mk @@ -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 |