Setup clean.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lushifex <shifeix.a.lu@intel.com>

5 files changed, 0 insertions, 104 deletions

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/AcpiSetup.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/AcpiSetup.vfi
index 301b636903..1835a00756 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/AcpiSetup.vfi
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/AcpiSetup.vfi
@@ -50,13 +50,6 @@ form formid = ACPI_SETUP_FORM_ID,
   endoneof;

 

   suppressif NOT ideqval SETUP_DATA.LowPowerS0Idle == 1;

-    oneof varid   = SETUP_DATA.TenSecondPowerButtonEnable,

-      prompt      = STRING_TOKEN(STR_10SEC_POWER_BUTTON_ENABLE),

-      help        = STRING_TOKEN(STR_10SEC_POWER_BUTTON_ENABLE_HELP),

-      option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-      option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;

-    endoneof;

-

     oneof varid     = SETUP_DATA.PciDelayOptimizationEcr,

       prompt      = STRING_TOKEN(STR_PCI_DELAY_OPTIMIZATION_ECR),

       help        = STRING_TOKEN(STR_PCI_DELAY_OPTIMIZATION_ECR_HELP),

@@ -65,28 +58,5 @@ form formid = ACPI_SETUP_FORM_ID,
     endoneof;

   endif; // suppressif

 

-  oneof varid   = SETUP_DATA.CSNotifyEC,

-    prompt      = STRING_TOKEN(STR_NOTIFY_EC),

-    help        = STRING_TOKEN(STR_NOTIFY_EC_HELP),

-    option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = RESET_REQUIRED;

-    option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-  endoneof;

-

-  suppressif NOT ideqval SETUP_DATA.CSNotifyEC == 1;

-    oneof varid   = SETUP_DATA.CSDebugLightEC,

-      prompt      = STRING_TOKEN(STR_DEBUG_LT_EC),

-      help        = STRING_TOKEN(STR_DEBUG_LT_EC_HELP),

-      option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-      option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;

-    endoneof;

-

-    oneof varid   = SETUP_DATA.EcLowPowerMode,

-      prompt      = STRING_TOKEN(STR_EC_LOWPOWER_MODE),

-      help        = STRING_TOKEN(STR_EC_LOWPOWER_MODE_HELP),

-      option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-      option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;

-    endoneof;

-  endif; // suppressif

-

 endform; // ACPI_SETUP_FORM_ID

 

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi
index b8a9c41b1a..65f772c6c5 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/Boot.vfi
@@ -81,14 +81,6 @@ form formid = BOOT_CONFIGURATION_FORM_ID,
     option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = 0 | RESET_REQUIRED;

   endoneof;

 

-  oneof varid  = Setup.RTEn,

-      prompt   = STRING_TOKEN(STR_RT_IDI_AGENT_PROMPT),

-      help     = STRING_TOKEN(STR_RT_IDI_AGENT_HELP),

-      flags    = INTERACTIVE,

-      option text = STRING_TOKEN(STR_RT_IDI_AGENT_DISABLE), value=0, flags=DEFAULT | MANUFACTURING | RESET_REQUIRED;

-      option text = STRING_TOKEN(STR_RT_IDI_AGENT_DID1), value=2, flags=0 | RESET_REQUIRED;

-  endoneof;

-

 endform;

 

 

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/DebugConfig.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/DebugConfig.vfi
index e5499abc1b..235ce44371 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/DebugConfig.vfi
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/DebugConfig.vfi
@@ -31,26 +31,6 @@ form formid = DEBUG_CONFIGURATION_FORM_ID,
 

   subtitle text = STRING_TOKEN(STR_NULL_STRING);

 

-  subtitle text = STRING_TOKEN(STR_APEIBERT_STRING);

-  oneof varid  = Setup.APEIBERT,

-    prompt   = STRING_TOKEN (STR_APEIBERT_PROMPT),

-    help     = STRING_TOKEN (STR_APEIBERT_HELP),

-    option text = STRING_TOKEN (STR_ENABLE),  value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-    option text = STRING_TOKEN (STR_DISABLE), value = 0, flags = RESET_REQUIRED;

-  endoneof;

-  subtitle text = STRING_TOKEN(STR_NULL_STRING);

-

-  subtitle text = STRING_TOKEN(STR_ACPIMEMDBG_STRING);

-

-  oneof varid  = Setup.ACPIMemDbg,

-    prompt   = STRING_TOKEN (STR_ACPIMEMDBG_SWTICH),

-    help     = STRING_TOKEN (STR_ACPIMEMDBG_SWTICH_HELP),

-    option text = STRING_TOKEN (STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-    option text = STRING_TOKEN (STR_ENABLE),  value = 1, flags = RESET_REQUIRED;

-  endoneof;

-

-  subtitle text = STRING_TOKEN(STR_NULL_STRING);

-

   subtitle text = STRING_TOKEN(STR_TXE_DEBUG_OPTION_STRING);

 

   oneof varid   = SETUP_DATA.SeCEOPEnable,

@@ -60,13 +40,6 @@ form formid = DEBUG_CONFIGURATION_FORM_ID,
     option text = STRING_TOKEN(STR_ENABLE),  value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

   endoneof;

 

-  oneof varid   = SETUP_DATA.SeCLockDir,

-    prompt      = STRING_TOKEN(STR_TXE_LOCK_DIR_PROMPT),

-    help        = STRING_TOKEN(STR_TXE_LOCK_DIR_HELP),

-    option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-    option text = STRING_TOKEN(STR_ENABLE),  value = 1, flags = RESET_REQUIRED;

-  endoneof;

-

   subtitle text = STRING_TOKEN(STR_NULL_STRING);

 

   subtitle text = STRING_TOKEN(STR_PTT_DEBUG_OPTION_STRING);

@@ -120,13 +93,6 @@ form formid = DEBUG_CONFIGURATION_FORM_ID,
 

   subtitle text = STRING_TOKEN(STR_OS_DNX_STRING);

 

-  oneof varid  = Setup.OSDnX,

-    prompt   = STRING_TOKEN (STR_OS_DNX_ENABLE),

-    help     = STRING_TOKEN (STR_OS_DNX_ENABLE_HELP),

-    option text = STRING_TOKEN (STR_ENABLE),  value = 1, flags = RESET_REQUIRED;

-    option text = STRING_TOKEN (STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-  endoneof;

-

     oneof varid   = Setup.IshI2c0PullUp,

       prompt      = STRING_TOKEN (STR_ISH_I2C0_GPIO_PULL_ENABLE_PROMPT),

       help        = STRING_TOKEN (STR_ISH_I2C0_GPIO_PULL_HELP),

@@ -184,17 +150,6 @@ form formid = DEBUG_CONFIGURATION_FORM_ID,
           endoneof;

       endif;

 

-#ifdef CRASHDUMP_SUPPORT

-  subtitle text = STRING_TOKEN(STR_NULL_STRING);

-  oneof varid = Setup.CrashDump,

-    prompt   = STRING_TOKEN(STR_CRASHDUMP_PROMPT),

-    help     = STRING_TOKEN(STR_CRASHDUMP_HELP),

-    option text = STRING_TOKEN(STR_ENABLE),  value = 1, flags = RESET_REQUIRED;

-    option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-  endoneof;

-#endif 

- 

-

   subtitle text = STRING_TOKEN(STR_NULL_STRING);

   subtitle text = STRING_TOKEN(STR_DATA_CLEAR_STRING);

   text

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi
index a2bd4f8d23..866dff5298 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/SouthClusterConfig.vfi
@@ -129,13 +129,6 @@ form formid     = MISC_OPTIONS_FORM_ID,
      option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;

   endoneof;

 

-  oneof varid   = Setup.UartInterface,

-    prompt      = STRING_TOKEN(STR_PCH_UART_SELECT),

-    help        = STRING_TOKEN(STR_PCH_UART_SELECT_HELP),

-    option text = STRING_TOKEN(STR_UART_SELECT_PCU), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-    option text = STRING_TOKEN(STR_UART_SELECT_SIO), value = 1, flags = RESET_REQUIRED;

-  endoneof;

-

    oneof varid   = Setup.Wol,

     prompt      = STRING_TOKEN(STR_WAKE_ON_LAN_PROMPT),

     help        = STRING_TOKEN(STR_WAKE_ON_LAN_HELP),

@@ -2270,13 +2263,6 @@ form formid     = USB_OPTIONS_FORM_ID,
     option text = STRING_TOKEN(STR_ON), value = 1, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

   endoneof;

 

-  oneof varid   = Setup.Hsic1Support,

-    prompt      = STRING_TOKEN(STR_USB_HSIC1_PROMPT),

-    help        = STRING_TOKEN(STR_USB_HSIC1_HELP),

-    option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;

-    option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-  endoneof;

-

   oneof varid   = Setup.Ssic1Support,

     prompt      = STRING_TOKEN(STR_USB_SSIC1_PROMPT),

     help        = STRING_TOKEN(STR_USB_SSIC1_HELP),

@@ -2427,13 +2413,6 @@ form formid     = USB_OPTIONS_FORM_ID,
     option text = STRING_TOKEN(STR_XHCI_COMPLIANCE_FALSE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

     option text = STRING_TOKEN(STR_XHCI_COMPLIANCE_TRUE), value = 1, flags = RESET_REQUIRED;

   endoneof;

-

-  oneof varid   = Setup.IddigComp,

-    prompt      = STRING_TOKEN(STR_USB_IDDIG_PROMPT),

-    help        = STRING_TOKEN(STR_USB_IDDIG_HELP),

-    option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = DEFAULT | MANUFACTURING | RESET_REQUIRED;

-    option text = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;

-  endoneof;

   

 endform; // end of USB_OPTIONS_FORM_ID

 

diff --git a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/VfrStrings.uni b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/VfrStrings.uni
index 16bb0bd13e..f728cf26f9 100644
--- a/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/VfrStrings.uni
+++ b/Platform/BroxtonPlatformPkg/Common/PlatformSettings/PlatformSetupDxe/VfrStrings.uni