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

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

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

diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
index 4b9f9921a0c805bfcbf6f39cbdee320ec1d83fd5..6029d141633012548baab469df244b5101c116c3 100644 (file)
--- a/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
+++ b/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
@@ -110,7 +110,7 @@ typedef struct _PPM_TURBO_SETTINGS {
 //\r
 // Platform Policy\r
 //\r
-typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {\r
+struct _PPM_PLATFORM_POLICY_PROTOCOL {\r
   UINT8                                 Revision;\r
   PPM_FUNCTION_ENABLES                  FunctionEnables;\r
   PPM_CUSTOM_VID_TABLE                  CustomVidTable;\r
@@ -133,6 +133,6 @@ typedef struct _PPM_PLATFORM_POLICY_PROTOCOL {
   //\r
   UINT16                                Reserve10;\r
   UINT8                                 Reserve11;\r
-} PPM_PLATFORM_POLICY_PROTOCOL;\r
+};\r
 \r
 #endif\r

diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
index c4eba994499b6c14000e4d54c83891c2f1b0b6b1..bd9164a655b4cee41ab379513962c61384a8afa9 100644 (file)
--- a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
+++ b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
@@ -34,12 +34,12 @@ Abstract:
 \r
 typedef struct _PEI_SMBUS_POLICY_PPI PEI_SMBUS_POLICY_PPI;\r
 \r
-typedef struct _PEI_SMBUS_POLICY_PPI {\r
+struct _PEI_SMBUS_POLICY_PPI {\r
   UINTN   BaseAddress;\r
   UINT32  PciAddress;\r
   UINT8   NumRsvdAddress;\r
   UINT8   *RsvdAddress;\r
-} PEI_SMBUS_POLICY_PPI;\r
+};\r
 \r
 extern EFI_GUID gPeiSmbusPolicyPpiGuid;\r
 \r

diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
index c39c36daad797d3e298f3206b4a2e662d6867759..ac387c647a11bc88033359277192b4c5aa1c0984 100644 (file)
--- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
+++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
@@ -968,6 +968,7 @@ AcpiPlatformEntryPoint (
   mGlobalNvsArea.Area->UartSelection = mSystemConfiguration.UartInterface;\r
   mGlobalNvsArea.Area->PcuUart1Enable = mSystemConfiguration.PcuUart1;\r
   mGlobalNvsArea.Area->NativePCIESupport = 1;\r
+  mGlobalNvsArea.Area->RtcBattery = mSystemConfiguration.RtcBattery;\r
 \r
 \r
 \r

diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
index 6b9b83066ec42522f56d715db916078e71476685..5168bd51f94c159c0c343c0a62193f13809406be 100644 (file)
--- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
+++ b/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()

diff --git a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
index 27aa2d70878d51054d7df2b7be8158385dab706d..e0de86d2f517011fc5dd76f7645be8a204098abb 100644 (file)
--- a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
+++ b/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 ()
 

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
index e7e952fe963de8ddadd6e87f4c98f5f77c7a60e7..18a29ed562ed4c311d5195477018cc59d2334e47 100644 (file)
--- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
+++ b/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;\r
     option text    = STRING_TOKEN(STR_ENABLE), value = 1, flags = RESET_REQUIRED;\r
   endoneof;\r
+\r
+  oneof varid = Setup.RtcBattery,\r
+    prompt         = STRING_TOKEN(STR_RTC_BATTERY),\r
+    help           = STRING_TOKEN(STR_RTC_BATTERY_HELP),\r
+    option text    = STRING_TOKEN(STR_RTC_BATTERY_NOT_PRESENT), value = 0, flags = RESET_REQUIRED;\r
+    option text    = STRING_TOKEN(STR_RTC_BATTERY_PRESENT), value = 1, flags = DEFAULT | MANUFACTURING |RESET_REQUIRED;\r
+  endoneof;\r
+\r
 endform;\r

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
index 7ecc5491b0d6a054668d14277bd243af1a7c021e..229b75e035b5ce8fcbd98799304f8dc24d692fd0 100644 (file)
Binary files a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni and b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni differ

diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
index 144579aa2c5d5f2946a0fff2fc14a261d78f3e10..d1e1b6d9a7b4372ec5579fd7cfcf3582dc40da46 100644 (file)
Binary files a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni and b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni differ