From 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d Mon Sep 17 00:00:00 2001 From: Lu Shifei Date: Tue, 10 Nov 2015 07:47:29 +0000 Subject: [PATCH] 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 Reviewed-by: Tim He git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18763 6f19259b-4bc3-4df7-8a09-765794883524 --- .../AcpiTablesPCAT/GloblNvs.asl | 5 +++-- .../AcpiTablesPCAT/PciTree.asl | 14 ++++++++++++-- .../CPU/Include/Protocol/PpmPlatformPolicy.h | 4 ++-- .../SouthCluster/Include/Ppi/SmbusPolicy.h | 4 ++-- Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 1 + .../Include/Guid/SetupVariable.h | 2 +- .../Include/Protocol/GlobalNvsArea.h | 1 + .../PlatformSetupDxe/SouthClusterConfig.vfi | 8 ++++++++ .../PlatformSetupDxe/UqiList.uni | Bin 65892 -> 66540 bytes .../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 index 7ecc5491b0d6a054668d14277bd243af1a7c021e..229b75e035b5ce8fcbd98799304f8dc24d692fd0 100644 GIT binary patch delta 196 zcmaFT#PX({WkLX>X=C8lKt^H4$vZ?Pgo7AD7@Qg68Jrj#fvgY)SB9X;8;wmTCtR~& zw3zHDsHlxa1w$lIhaZDKP<=c@07DQ^S1=I!O=dh2I{8tOk}@tm$Z9{{k7c%CFrK_o dR9+OT`pFNsJ5OG)RfEfd!GuAHftP`c0RR~{EfW9$ delta 17 YcmaFU&hn&*WkLX>Nn_yFKt^Fk06_=^w_yw8q6yRMA{ixwgBU^>oEhR7oERK|tPloQhM?(%3z?iJJMb!rLL?P{ zl8Fo@K$yx<#85dsmY2y;8H+xKNT4|Z3_(CMf`Qm?^26%T$qi{N%&82;)Bn3Ls%qoX zHY8^o34L-jfTKa!pUU%%sDQrgQpST}IdG3&fa}td)Qkg1ms{N+3Uzp%_R8 t0No6901)Q^eW1XQ59BK__yOsX>4}$_#3!%#E7ZPW0^{}#6PRvo1ptZhL|y;@ delta 25 jcmV+!0OtSvk`0QD4S=)(qL7oU{SJqslL5D)lLFecq09`c -- 2.39.2