diff options
| author | nagendra modadugu <ngm@google.com> | 2017-12-14 01:52:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-14 01:52:46 +0000 |
| commit | 15ad1c7faae0993185f133d41b012871ae8153d5 (patch) | |
| tree | 0dc4cb0d35448728234b51703717496e235020f3 | |
| parent | e46578ab17221be45a136c6fdd308ab463e71121 (diff) | |
| parent | f52a9aae46ca182174d61342791d0d519bc51629 (diff) | |
| download | tpm2-15ad1c7faae0993185f133d41b012871ae8153d5.tar.gz | |
resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to master
am: f52a9aae46
Change-Id: I19133361e7372b0b4e2228f6d7bec5256f9b331d
| -rw-r--r-- | Startup.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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; } |