summaryrefslogtreecommitdiff
path: root/board/cr50/build.mk
diff options
context:
space:
mode:
Diffstat (limited to 'board/cr50/build.mk')
-rw-r--r--board/cr50/build.mk43
1 files changed, 26 insertions, 17 deletions
diff --git a/board/cr50/build.mk b/board/cr50/build.mk
index 3f1c40f9c6..b6d1d959cb 100644
--- a/board/cr50/build.mk
+++ b/board/cr50/build.mk
@@ -22,19 +22,20 @@ ifeq ($(BOARD_MK_INCLUDED_ONCE),)
# List of variables which can be defined in the environment or set in the make
# command line.
-ENV_VARS := CR50_DEV CRYPTO_TEST H1_RED_BOARD U2F_TEST RND_TEST DRBG_TEST\
- ECDSA_TEST DCRYPTO_TEST P256_BIN_TEST SHA1_TEST SHA256_TEST\
- HMAC_SHA256_TEST CMAC_TEST
+ENV_VARS := CR50_DEV CRYPTO_TEST CMAC_TEST DCRYPTO_TEST DRBG_TEST ECDSA_TEST\
+ H1_RED_BOARD HMAC_SHA256_TEST P256_BIN_TEST RND_TEST SELF_TEST\
+ SHA1_TEST SHA256_TEST U2F_TEST U2F_VERBOSE
+
+ifneq ($(H1_RED_BOARD),)
+CPPFLAGS += -DH1_RED_BOARD=$(EMPTY)
+endif
ifneq ($(CRYPTO_TEST),)
CPPFLAGS += -DCRYPTO_TEST_SETUP
-ifneq ($(U2F_TEST),)
-CPPFLAGS_RW += -DCRYPTO_TEST_CMD_U2F_TEST=1
-endif
-
-ifneq ($(RND_TEST),)
-CPPFLAGS_RW += -DCRYPTO_TEST_CMD_RAND=1
+# These options only work with CRYPTO_TEST=1
+ifneq ($(DCRYPTO_TEST),)
+CPPFLAGS_RW += -DCRYPTO_TEST_CMD_DCRYPTO_TEST=1
endif
ifneq ($(DRBG_TEST),)
@@ -45,14 +46,22 @@ ifneq ($(ECDSA_TEST),)
CPPFLAGS_RW += -DCRYPTO_TEST_CMD_DCRYPTO_ECDSA=1
endif
-ifneq ($(DCRYPTO_TEST),)
-CPPFLAGS_RW += -DCRYPTO_TEST_CMD_DCRYPTO_TEST=1
+ifneq ($(HMAC_SHA256_TEST),)
+CPPFLAGS_RW += -DHMAC_SHA256_TEST=1
endif
ifneq ($(P256_BIN_TEST),)
CPPFLAGS_RW += -DP256_BIN_TEST=1
endif
+ifneq ($(RND_TEST),)
+CPPFLAGS_RW += -DCRYPTO_TEST_CMD_RAND=1
+endif
+
+ifneq ($(SELF_TEST),)
+CPPFLAGS_RW += -DSELF_INTEGRITY_TEST=1
+endif
+
ifneq ($(SHA1_TEST),)
CPPFLAGS_RW += -DSHA1_TEST=1
endif
@@ -61,12 +70,16 @@ ifneq ($(SHA256_TEST),)
CPPFLAGS_RW += -DSHA256_TEST=1
endif
-ifneq ($(HMAC_SHA256_TEST),)
-CPPFLAGS_RW += -DHMAC_SHA256_TEST=1
+ifneq ($(U2F_TEST),)
+CPPFLAGS_RW += -DCRYPTO_TEST_CMD_U2F_TEST=1
endif
+ifneq ($(U2F_VERBOSE),)
+CPPFLAGS_RW += -DU2F_DEV_VERBOSE=1
endif
+endif # CRYPTO_TEST=1
+
BOARD_MK_INCLUDED_ONCE=1
SIG_EXTRA = --cros
@@ -173,10 +186,6 @@ board-y += tpm_nvmem_ops.o
board-y += wp.o
board-$(CONFIG_PINWEAVER)+=pinweaver_tpm_imports.o
-ifneq ($(H1_RED_BOARD),)
-CPPFLAGS += -DH1_RED_BOARD=$(EMPTY)
-endif
-
# Build fips code separately
ifneq ($(fips-y),)
RW_BD_OUT=$(out)/RW/$(BDIR)