aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagendra modadugu <ngm@google.com>2017-12-12 11:28:58 -0800
committerchrome-bot <chrome-bot@chromium.org>2017-12-12 12:43:44 -0800
commitf6187c733f349b9529006f6d1afbc42f150c2bf0 (patch)
treec2bff699d1d7a50808c0cefcd56a078f9292db0d
parentae8d044cd15f49f56de4db84da7203a0ac2ff783 (diff)
downloadtpm2-f6187c733f349b9529006f6d1afbc42f150c2bf0.tar.gz
Fix build breakage for non-CR50 builds.
Commit ae8d044cd1 introduced a externally defined callback _plat__ResetCallback() which is not available outside the CR50 environment. Address the issue with conditional compilation. TEST=docker fuzz container builds; CR50 builds Change-Id: If23c036c41a900bbcedd4b0bfd9edb1e89c17a0f Reviewed-on: https://chromium-review.googlesource.com/822601 Commit-Ready: Nagendra Modadugu <ngm@google.com> Tested-by: Nagendra Modadugu <ngm@google.com> Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
-rw-r--r--Startup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Startup.c b/Startup.c
index 54df25b..053735c 100644
--- a/Startup.c
+++ b/Startup.c
@@ -163,8 +163,10 @@ TPM2_Startup(
// The H-CRTM state no longer matters
g_DrtmPreStartup = FALSE;
+#ifdef EMBEDDED_MODE
if (startup == SU_RESET)
_plat__ResetCallback();
+#endif
return TPM_RC_SUCCESS;
}