From 620f289162b08d319fe1e73b3c7e2baff6b388e4 Mon Sep 17 00:00:00 2001 From: Tim He Date: Thu, 11 Jun 2015 02:50:20 +0000 Subject: Sync the branch changes to trunk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the FCE tool to remove “runtime access” . and recovery "Setup" variable in case of “Setup” variable size is incorrect somehow. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Tim He Reviewed-by: David Wei git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17620 6f19259b-4bc3-4df7-8a09-765794883524 --- Vlv2TbltDevicePkg/PlatformPei/Platform.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'Vlv2TbltDevicePkg/PlatformPei') diff --git a/Vlv2TbltDevicePkg/PlatformPei/Platform.c b/Vlv2TbltDevicePkg/PlatformPei/Platform.c index 899b4a979..23be887ca 100644 --- a/Vlv2TbltDevicePkg/PlatformPei/Platform.c +++ b/Vlv2TbltDevicePkg/PlatformPei/Platform.c @@ -716,7 +716,20 @@ PeiInitPlatform ( &VariableSize, &SystemConfiguration ); - ASSERT_EFI_ERROR(Status); + if (EFI_ERROR (Status) || VariableSize != sizeof(SYSTEM_CONFIGURATION)) { + //The setup variable is corrupted + VariableSize = sizeof(SYSTEM_CONFIGURATION); + Status = Variable->GetVariable( + Variable, + L"SetupRecovery", + &gEfiSetupVariableGuid, + NULL, + &VariableSize, + &SystemConfiguration + ); + ASSERT_EFI_ERROR (Status); + } + if (EFI_ERROR (Status)) { GGC = ((2 << 3) | 0x200); PciCfg16Write(EC_BASE, 0, 2, 0, 0x50, GGC); -- cgit v1.2.3