diff options
author | Lu Shifei <shifeix.a.lu@intel.com> | 2015-11-10 07:47:29 +0000 |
---|---|---|
committer | timhe <timhe@Edk2> | 2015-11-10 07:47:29 +0000 |
commit | 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d (patch) | |
tree | 40c4af36e39e81abc489645ff22e67b143419efa /Vlv2DeviceRefCodePkg | |
parent | d28f77df0f51f84b0af79f09abe2c27b1f1aaa69 (diff) | |
download | edk2-52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d.tar.gz edk2-52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d.tar.bz2 edk2-52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d.zip |
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
Diffstat (limited to 'Vlv2DeviceRefCodePkg')
4 files changed, 19 insertions, 8 deletions
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl index fffc8297c0..21e526c505 100644 --- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl +++ b/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.
}
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl index 84a7ee21d0..2a57d0f887 100644 --- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl +++ b/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
diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h index 4b9f9921a0..6029d14163 100644 --- 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 { //
// 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
diff --git a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h b/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h index c4eba99449..bd9164a655 100644 --- a/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h +++ b/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;
|