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

Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl

@@ -5,7 +5,7 @@
 ;*    Family of Customer Reference Boards.                                *;
 ;*                                                                        *;
 ;*                                                                        *;
-;*    Copyright (c)  1999  - 2014, Intel Corporation. All rights reserved   *;
+;*    Copyright (c)  1999  - 2015, Intel Corporation. All rights reserved   *;
 ;
 ; This program and the accompanying materials are licensed and made available under
 ; the terms and conditions of the BSD License that accompanies this distribution.
@@ -347,6 +347,7 @@ Field(GNVS,AnyAcc,Lock,Preserve)
   Offset(792),
   EDPV,     8,      //(792) Check for eDP display device
   DIDX,     32,     //(793) Device ID for eDP device
-  IOT,      8,      //(794) MinnowBoard Max JP1 is configured for MSFT IOT project.   
+  IOT,      8,      //(794) MinnowBoard Max JP1 is configured for MSFT IOT project.
+  BATT,     8,      //(795) The Flag of RTC Battery Prensent.  
 }
 

Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl

@@ -5,7 +5,7 @@
 ;*    Family of Customer Reference Boards.                                *;
 ;*                                                                        *;
 ;*                                                                        *;
-;*    Copyright (c) 2012  - 2014, Intel Corporation. All rights reserved    *;
+;*    Copyright (c) 2012  - 2015, Intel Corporation. All rights reserved    *;
 ;
 ; This program and the accompanying materials are licensed and made available under
 ; the terms and conditions of the BSD License that accompanies this distribution.
@@ -21,7 +21,6 @@
 
 Scope(\_SB)
 {
-
 //RTC
   Device(RTC)    // RTC
   {
@@ -31,6 +30,17 @@ Scope(\_SB)
     {
       IO(Decode16,0x70,0x70,0x01,0x08)
     })
+
+    Method(_STA,0,Serialized) {
+
+      //
+      // Report RTC Battery is Prensent or Not Present.
+      //
+      If (LEqual(BATT, 1)) {
+        Return (0xF)
+      }
+      Return (0x0)
+    }
   }
 //RTC
 

Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h

@@ -110,7 +110,7 @@ typedef struct _PPM_TURBO_SETTINGS {
 //
 // Platform Policy
 //
-typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {
+struct _PPM_PLATFORM_POLICY_PROTOCOL {
   UINT8                                 Revision;
   PPM_FUNCTION_ENABLES                  FunctionEnables;
   PPM_CUSTOM_VID_TABLE                  CustomVidTable;
@@ -133,6 +133,6 @@ typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {
   //
   UINT16                                Reserve10;
   UINT8                                 Reserve11;
-} PPM_PLATFORM_POLICY_PROTOCOL;
+};
 
 #endif

Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h

@@ -34,12 +34,12 @@ Abstract:
 
 typedef struct _PEI_SMBUS_POLICY_PPI PEI_SMBUS_POLICY_PPI;
 
-typedef struct _PEI_SMBUS_POLICY_PPI {
+struct _PEI_SMBUS_POLICY_PPI {
   UINTN   BaseAddress;
   UINT32  PciAddress;
   UINT8   NumRsvdAddress;
   UINT8   *RsvdAddress;
-} PEI_SMBUS_POLICY_PPI;
+};
 
 extern EFI_GUID gPeiSmbusPolicyPpiGuid;
 

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,
     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.RtcBattery,
+    prompt         = STRING_TOKEN(STR_RTC_BATTERY),
+    help           = STRING_TOKEN(STR_RTC_BATTERY_HELP),
+    option text    = STRING_TOKEN(STR_RTC_BATTERY_NOT_PRESENT), value = 0, flags = RESET_REQUIRED;
+    option text    = STRING_TOKEN(STR_RTC_BATTERY_PRESENT), value = 1, flags = DEFAULT | MANUFACTURING |RESET_REQUIRED;
+  endoneof;
+
 endform;