Merge cos-sdk into ToT
Includes changes for the most recent ChromeOS merge.
BUG=b/257271340
TEST=presubmit
RELEASE_NOTE=None
Change-Id: I9910568160c45bbbf5cc1a7267cf74dcba9d8aa3
diff --git a/Makefile b/Makefile
index df906a2..7731598 100644
--- a/Makefile
+++ b/Makefile
@@ -607,10 +607,13 @@
utility/signature_digest_utility \
utility/verify_data
UTIL_BIN_NAMES_BOARD = \
- utility/crossystem \
utility/dumpRSAPublicKey \
utility/tpmc
+ifneq ($(filter-out 0,${USE_FLASHROM}),)
+UTIL_BIN_NAMES_BOARD += utility/crossystem
+endif
+
UTIL_SCRIPTS_SDK = $(addprefix ${BUILD}/,${UTIL_SCRIPT_NAMES_SDK})
UTIL_SCRIPTS_BOARD = $(addprefix ${BUILD}/,${UTIL_SCRIPT_NAMES_BOARD})
UTIL_BINS_SDK = $(addprefix ${BUILD}/,${UTIL_BIN_NAMES_SDK})
