Index: Include/Protocol/GlobalNvsArea.h
===================================================================
--- Include/Protocol/GlobalNvsArea.h	(revision 17502)
+++ Include/Protocol/GlobalNvsArea.h	(working copy)
@@ -104,7 +104,7 @@
   UINT8       PassiveTc2Value;                            // 23
   UINT8       PassiveTspValue;                            // 24
   UINT8       CriticalThermalTripPoint;                   // 25
-  UINT8       ReserveD;
+  UINT8       EnableDigitalThermalSensor;                 // 26
   UINT8       BspDigitalThermalSensorTemperature;         // 27   Temperature of BSP
   UINT8       ApDigitalThermalSensorTemperature;          // 28   Temperature of AP
   UINT8       DigitalThermalSensorSmiFunction;            // 29   SMI function call via DTS IO Trap
Index: PlatformPkg.fdf
===================================================================
--- PlatformPkg.fdf	(revision 17502)
+++ PlatformPkg.fdf	(working copy)
@@ -558,6 +558,7 @@
 INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
 # INF Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Dts/Smm/DigitalThermalSensor.inf
+INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
   #
   # ACPI
   #
Index: PlatformPkgGcc.fdf
===================================================================
--- PlatformPkgGcc.fdf	(revision 17502)
+++ PlatformPkgGcc.fdf	(working copy)
@@ -516,6 +516,7 @@
 INF $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
 INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
 # INF Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Dts/Smm/DigitalThermalSensor.inf
+INF RuleOverride = BINARY $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
   #
   # ACPI
   #
Index: PlatformPkgGccX64.dsc
===================================================================
--- PlatformPkgGccX64.dsc	(revision 17502)
+++ PlatformPkgGccX64.dsc	(working copy)
@@ -1336,6 +1336,7 @@
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf
   $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
+  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
 
   #
   # ACPI
Index: PlatformPkgIA32.dsc
===================================================================
--- PlatformPkgIA32.dsc	(revision 17502)
+++ PlatformPkgIA32.dsc	(working copy)
@@ -1326,6 +1326,7 @@
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf
   $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
+  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
 
   #
   # ACPI
Index: PlatformPkgX64.dsc
===================================================================
--- PlatformPkgX64.dsc	(revision 17502)
+++ PlatformPkgX64.dsc	(working copy)
@@ -1326,6 +1326,7 @@
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PiSmmCommunicationSmm.inf
   $(PLATFORM_PACKAGE)/SmmSwDispatch2OnSmmSwDispatchThunk/SmmSwDispatch2OnSmmSwDispatchThunk.inf
   $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/PowerManagement2.inf
+  $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ARCHITECTURE)/DigitalThermalSensor.inf
 
   #
   # ACPI
Index: PlatformSetupDxe/Thermal.vfi
===================================================================
--- PlatformSetupDxe/Thermal.vfi	(revision 17502)
+++ PlatformSetupDxe/Thermal.vfi	(working copy)
@@ -85,6 +85,15 @@
         option text = STRING_TOKEN(STR_ENABLED),  value = 1, flags = RESET_REQUIRED;
   endoneof;
 
+  suppressif TRUE;  
+  oneof varid     = Setup.EnableDigitalThermalSensor,
+    prompt      = STRING_TOKEN(STR_DTS_PROMPT),
+    help        = STRING_TOKEN(STR_DTS_PROMPT_HELP),
+    option text = STRING_TOKEN(STR_DISABLE), value = 0, flags = RESET_REQUIRED;
+    option text = STRING_TOKEN(STR_ENABLE),  value = 1, flags = MANUFACTURING |RESET_REQUIRED |DEFAULT;
+  endoneof;
+  endif;
+
   subtitle text = STRING_TOKEN(STR_NULL_STRING);
 
 
Index: PlatformSetupDxe/VfrStrings.uni
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream