| commit | f52a9aae46ca182174d61342791d0d519bc51629 | [log] [tgz] |
|---|---|---|
| author | nagendra modadugu <ngm@google.com> | Wed Dec 13 15:54:28 2017 -0800 |
| committer | nagendra modadugu <ngm@google.com> | Wed Dec 13 15:54:28 2017 -0800 |
| tree | 0dc4cb0d35448728234b51703717496e235020f3 | |
| parent | 9eb074bfa3d0e7fa271fe8cf5aed5821e43b9ba9 [diff] | |
| parent | f6187c733f349b9529006f6d1afbc42f150c2bf0 [diff] |
resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to master Test: I solemnly swear I tested this conflict resolution.
diff --git a/Startup.c b/Startup.c index 54df25b..053735c 100644 --- a/Startup.c +++ b/Startup.c
@@ -163,8 +163,10 @@ // The H-CRTM state no longer matters g_DrtmPreStartup = FALSE; +#ifdef EMBEDDED_MODE if (startup == SU_RESET) _plat__ResetCallback(); +#endif return TPM_RC_SUCCESS; }