resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to master am: f52a9aae46

am: 15ad1c7faa

Change-Id: I2624295ad90ce418f905f21b4cc2fa4ac149cbcc

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;
 }