Sync UDK2014 SVN commit in January 21, 2016: Add setup option to control _STA of LPE Audio.

7 files changed, 16 insertions, 4 deletions

diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index a7e54e3284..691a9d1d3c 100644
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -1,6 +1,6 @@
 /** @file

 

-  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>

                                                                                    

 

   This program and the accompanying materials are licensed and made available under

@@ -1056,6 +1056,7 @@ AcpiPlatformEntryPoint (
   mGlobalNvsArea.Area->BatteryChargingSolution          = GLOBAL_NVS_DEVICE_DISABLE;

   mGlobalNvsArea.Area->ISPDevSel                        = mSystemConfiguration.ISPDevSel;

   mGlobalNvsArea.Area->LpeEnable                        = mSystemConfiguration.Lpe;

+  mGlobalNvsArea.Area->LpeAudioReportedByDSDT           = mSystemConfiguration.LpeAudioReportedByDSDT;

 

   if (mSystemConfiguration.ISPEn == 0) {

     mGlobalNvsArea.Area->ISPDevSel                      = GLOBAL_NVS_DEVICE_DISABLE;

diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
index 5168bd51f9..c7c51d0d2a 100644
--- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
+++ b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
@@ -1,6 +1,6 @@
 /*++
 
-  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
                                                                                    
 
   This program and the accompanying materials are licensed and made available under
@@ -1309,6 +1309,7 @@ typedef struct {
   UINT8   SdCardRemovable; // ACPI reporting MMC/SD media as: removable/non-removable
   UINT8   GpioWakeCapability;
   UINT8   RtcBattery;
+  UINT8   LpeAudioReportedByDSDT;
 
 } SYSTEM_CONFIGURATION;
 #pragma pack()
diff --git a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
index 5e650b69a2..aa7ec9277e 100644
--- a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
+++ b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
@@ -1,6 +1,6 @@
 /*++
 
-  Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2004  - 2016, Intel Corporation. All rights reserved.<BR>
                                                                                    
 
   This program and the accompanying materials are licensed and made available under
@@ -472,6 +472,7 @@ typedef struct {
   UINT32      DIDX;                              // 793 Device ID for eDP device
   UINT8       MicrosoftIoT;                      // (794)JP1 pins are for Microsoft IoT project.
   UINT8       RtcBattery;                        // (795) The Flag of RTC Battery Present.
+  UINT8       LpeAudioReportedByDSDT;            // (796)
 } EFI_GLOBAL_NVS_AREA;
 #pragma pack ()
 
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
index 58e2676c44..258bd6f60f 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
@@ -1,6 +1,6 @@
 //

 //

-// Copyright (c) 2004  - 2015, Intel Corporation. All rights reserved.<BR>

+// Copyright (c) 2004  - 2016, 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 that accompanies this distribution.  


@@ -781,6 +781,15 @@ form formid = AZALIA_OPTIONS_FORM_ID,
       option text = STRING_TOKEN(STR_LPE_ACPI_MODE), value=2, flags=0 | RESET_REQUIRED;

   endoneof;

 

+  grayoutif NOT ideqval Setup.Lpe == 0x2;

+  oneof varid   = Setup.LpeAudioReportedByDSDT,

+      prompt      = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_PROMPT),

+      help        = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_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;

+

   subtitle text = STRING_TOKEN(STR_NULL_STRING);

   suppressif ideqval Setup.AzaliaDs == 0x1;

     oneof varid  = Setup.PchAzalia,

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
index 229b75e035..1de43911c3 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
index d1e1b6d9a7..02d3321918 100644
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
+++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
diff --git a/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin b/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin
index 0882391d7d..4cacff7af8 100644
--- a/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin
+++ b/Vlv2TbltDevicePkg/Stitch/Gcc/NvStorageVariable.bin