Vlv2TbltDevicePkg/Vlv2DeviceRefCodePkg:

Sync the branch changes to Trunk,  

Add "RTC Battery Present" item in setup page.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Lu Shifei <shifeix.a.lu@intel.com>
Reviewed-by: Tim He <tim.he@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18763 6f19259b-4bc3-4df7-8a09-765794883524

Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c

@@ -968,6 +968,7 @@ AcpiPlatformEntryPoint (
   mGlobalNvsArea.Area->UartSelection = mSystemConfiguration.UartInterface;
   mGlobalNvsArea.Area->PcuUart1Enable = mSystemConfiguration.PcuUart1;
   mGlobalNvsArea.Area->NativePCIESupport = 1;
+  mGlobalNvsArea.Area->RtcBattery = mSystemConfiguration.RtcBattery;
 
 
 

Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h

@@ -1307,8 +1307,8 @@ typedef struct {
   UINT8  LpssHsuart1FlowControlEnabled;
 
   UINT8   SdCardRemovable; // ACPI reporting MMC/SD media as: removable/non-removable
-  
   UINT8   GpioWakeCapability;
+  UINT8   RtcBattery;
 
 } SYSTEM_CONFIGURATION;
 #pragma pack()

Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h

@@ -471,6 +471,7 @@ typedef struct {
   UINT8       EDPV;                              // 792 Check for eDP display device
   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.
 } EFI_GLOBAL_NVS_AREA;
 #pragma pack ()
 

Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi

@@ -915,4 +915,12 @@ form formid = MISC_OPTIONS_FORM_ID,
     prompt         = STRING_TOKEN(STR_PCIEDYNCLK_PROMPT),
     help           = STRING_TOKEN(STR_PCIEDYNCLK_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.GpioWakeCapability,
+    prompt         = STRING_TOKEN(STR_GPIO_WAKE_CAPABILITY_ENABLE),
+    help           = STRING_TOKEN(STR_GPIO_WAKE_CAPABILITY_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;