Revision: 18763
http://sourceforge.net/p/edk2/code/18763
Author: timhe
Date: 2015-11-10 07:47:29 +0000 (Tue, 10 Nov 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Tim He <[email protected]>
Modified Paths:
--------------
trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
trunk/edk2/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
trunk/edk2/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
trunk/edk2/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
Modified: trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl
===================================================================
--- trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl 2015-11-10
04:57:14 UTC (rev 18762)
+++ trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl 2015-11-10
07:47:29 UTC (rev 18763)
@@ -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 @@
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.
}
Modified: trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl
===================================================================
--- trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl 2015-11-10
04:57:14 UTC (rev 18762)
+++ trunk/edk2/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl 2015-11-10
07:47:29 UTC (rev 18763)
@@ -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 @@
{
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
Modified:
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
===================================================================
---
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
2015-11-10 04:57:14 UTC (rev 18762)
+++
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h
2015-11-10 07:47:29 UTC (rev 18763)
@@ -110,7 +110,7 @@
//
// 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 @@
//
UINT16 Reserve10;
UINT8 Reserve11;
-} PPM_PLATFORM_POLICY_PROTOCOL;
+};
#endif
Modified:
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
===================================================================
---
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
2015-11-10 04:57:14 UTC (rev 18762)
+++
trunk/edk2/Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h
2015-11-10 07:47:29 UTC (rev 18763)
@@ -34,12 +34,12 @@
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;
Modified: trunk/edk2/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c 2015-11-10
04:57:14 UTC (rev 18762)
+++ trunk/edk2/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c 2015-11-10
07:47:29 UTC (rev 18763)
@@ -968,6 +968,7 @@
mGlobalNvsArea.Area->UartSelection = mSystemConfiguration.UartInterface;
mGlobalNvsArea.Area->PcuUart1Enable = mSystemConfiguration.PcuUart1;
mGlobalNvsArea.Area->NativePCIESupport = 1;
+ mGlobalNvsArea.Area->RtcBattery = mSystemConfiguration.RtcBattery;
Modified: trunk/edk2/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h 2015-11-10
04:57:14 UTC (rev 18762)
+++ trunk/edk2/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h 2015-11-10
07:47:29 UTC (rev 18763)
@@ -1307,8 +1307,8 @@
UINT8 LpssHsuart1FlowControlEnabled;
UINT8 SdCardRemovable; // ACPI reporting MMC/SD media as:
removable/non-removable
-
UINT8 GpioWakeCapability;
+ UINT8 RtcBattery;
} SYSTEM_CONFIGURATION;
#pragma pack()
Modified: trunk/edk2/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
2015-11-10 04:57:14 UTC (rev 18762)
+++ trunk/edk2/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h
2015-11-10 07:47:29 UTC (rev 18763)
@@ -471,6 +471,7 @@
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 ()
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
===================================================================
--- trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
2015-11-10 04:57:14 UTC (rev 18762)
+++ trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi
2015-11-10 07:47:29 UTC (rev 18763)
@@ -924,4 +924,12 @@
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;
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni
===================================================================
(Binary files differ)
Modified: trunk/edk2/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni
===================================================================
(Binary files differ)
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
