[Patch][edk2-platforms/devel-MinnowBoard3] Set TPM to Disabled.

[Patch][edk2-platforms/devel-MinnowBoard3] Set TPM to Disabled.

[lushifex]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
 .../Common/PlatformSettings/PlatformSetupDxe/Security.vfi        | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi
index da103b2..f79e81b 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi
@@ -1,7 +1,7 @@
 // /** @file
 //  Security Setup formset.
 //
-//  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+//  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
 //
 //  This program and the accompanying materials
 //  are licensed and made available under the terms and conditions of the BSD License
@@ -148,17 +148,10 @@ form formid = SECURITY_CONFIGURATION_FORM_ID,
   oneof   varid   = Setup.TPM,
     prompt      = STRING_TOKEN(STR_TPM_PROMPT),
     help        = STRING_TOKEN(STR_TPM_HELP),
-#if (X64_BUILD_ENABLE == FALSE)
     option text = STRING_TOKEN(STR_DISABLE), value = 0x00, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
     option text = STRING_TOKEN(STR_TPM_PTT), value = 0x01, flags = RESET_REQUIRED;
     option text = STRING_TOKEN(STR_TPM_DTPM_1_2), value = 0x02, flags = RESET_REQUIRED;
     option text = STRING_TOKEN(STR_TPM_DTPM_2_0), value = 0x03, flags = RESET_REQUIRED;
-#else
-    option text = STRING_TOKEN(STR_DISABLE), value = 0x00, flags = RESET_REQUIRED;
-    option text = STRING_TOKEN(STR_TPM_PTT), value = 0x01, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
-    option text = STRING_TOKEN(STR_TPM_DTPM_1_2), value = 0x02, flags = RESET_REQUIRED;
-    option text = STRING_TOKEN(STR_TPM_DTPM_2_0), value = 0x03, flags = RESET_REQUIRED;
-#endif
   endoneof;
 
   suppressif NOT ideqval Setup.TPM == 1; 
-- 
2.7.0.windows.1

Re: [Patch][edk2-platforms/devel-MinnowBoard3] Set TPM to Disabled.

[Wei, David]

Reviewed-by: zwei4 <david.wei@intel.com>

Thanks,
David  Wei                                 


-----Original Message-----
From: Lu, ShifeiX A 
Sent: Friday, January 20, 2017 2:17 PM
To: edk2-devel@lists.01.org
Cc: Wei, David <david.wei@intel.com>
Subject: [Patch][edk2-platforms/devel-MinnowBoard3] Set TPM to Disabled.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>
---
 .../Common/PlatformSettings/PlatformSetupDxe/Security.vfi        | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi
index da103b2..f79e81b 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Security.vfi
@@ -1,7 +1,7 @@
 // /** @file
 //  Security Setup formset.
 //
-//  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>
+//  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
 //
 //  This program and the accompanying materials
 //  are licensed and made available under the terms and conditions of the BSD License
@@ -148,17 +148,10 @@ form formid = SECURITY_CONFIGURATION_FORM_ID,
   oneof   varid   = Setup.TPM,
     prompt      = STRING_TOKEN(STR_TPM_PROMPT),
     help        = STRING_TOKEN(STR_TPM_HELP),
-#if (X64_BUILD_ENABLE == FALSE)
     option text = STRING_TOKEN(STR_DISABLE), value = 0x00, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
     option text = STRING_TOKEN(STR_TPM_PTT), value = 0x01, flags = RESET_REQUIRED;
     option text = STRING_TOKEN(STR_TPM_DTPM_1_2), value = 0x02, flags = RESET_REQUIRED;
     option text = STRING_TOKEN(STR_TPM_DTPM_2_0), value = 0x03, flags = RESET_REQUIRED;
-#else
-    option text = STRING_TOKEN(STR_DISABLE), value = 0x00, flags = RESET_REQUIRED;
-    option text = STRING_TOKEN(STR_TPM_PTT), value = 0x01, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;
-    option text = STRING_TOKEN(STR_TPM_DTPM_1_2), value = 0x02, flags = RESET_REQUIRED;
-    option text = STRING_TOKEN(STR_TPM_DTPM_2_0), value = 0x03, flags = RESET_REQUIRED;
-#endif
   endoneof;
 
   suppressif NOT ideqval Setup.TPM == 1; 
-- 
2.7.0.windows.1