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 /Vlv2TbltDevicePkg | |
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 'Vlv2TbltDevicePkg')
-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 |
6 files changed, 11 insertions, 1 deletions
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 |