diff options
| -rw-r--r-- | Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl | 5 | ||||
| -rw-r--r-- | Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PciTree.asl | 14 | ||||
| -rw-r--r-- | Vlv2DeviceRefCodePkg/ValleyView2Soc/CPU/Include/Protocol/PpmPlatformPolicy.h | 4 | ||||
| -rw-r--r-- | Vlv2DeviceRefCodePkg/ValleyView2Soc/SouthCluster/Include/Ppi/SmbusPolicy.h | 4 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 1 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h | 2 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h | 1 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi | 8 | ||||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni | bin | 65892 -> 66540 bytes | |||
| -rw-r--r-- | Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni | bin | 214666 -> 215420 bytes |
10 files changed, 30 insertions, 9 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;
diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index c39c36daad..ac387c647a 100644 --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/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;
diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h index 6b9b83066e..5168bd51f9 100644 --- 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 27aa2d7087..e0de86d2f5 100644 --- 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 e7e952fe96..18a29ed562 100644 --- 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;
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;
diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni Binary files differindex 7ecc5491b0..229b75e035 100644 --- a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni +++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni Binary files differindex 144579aa2c..d1e1b6d9a7 100644 --- a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni +++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni |