resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7

Test: I solemnly swear I tested this conflict resolution.

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