Sync the branch changes to trunk.
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 <tim.he@intel.com> Reviewed-by: David Wei <david.wei@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17620 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -697,7 +697,18 @@ OnReadyToBoot (
|
||||
&VariableSize,
|
||||
&SetupVarBuffer
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
if (EFI_ERROR (Status) || VariableSize != sizeof(SYSTEM_CONFIGURATION)) {
|
||||
//The setup variable is corrupted
|
||||
VariableSize = sizeof(SYSTEM_CONFIGURATION);
|
||||
Status = gRT->GetVariable(
|
||||
L"SetupRecovery",
|
||||
&mSystemConfigurationGuid,
|
||||
NULL,
|
||||
&VariableSize,
|
||||
&SetupVarBuffer
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
|
||||
//
|
||||
// Find the AcpiSupport protocol.
|
||||
@@ -817,7 +828,18 @@ AcpiPlatformEntryPoint (
|
||||
&VarSize,
|
||||
&mSystemConfiguration
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
if (EFI_ERROR (Status) || VarSize != sizeof(SYSTEM_CONFIGURATION)) {
|
||||
//The setup variable is corrupted
|
||||
VarSize = sizeof(SYSTEM_CONFIGURATION);
|
||||
Status = gRT->GetVariable(
|
||||
L"SetupRecovery",
|
||||
&mSystemConfigurationGuid,
|
||||
NULL,
|
||||
&VarSize,
|
||||
&mSystemConfiguration
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
|
||||
//
|
||||
// Find the AcpiSupport protocol.
|
||||
@@ -842,6 +864,19 @@ AcpiPlatformEntryPoint (
|
||||
&SysCfgSize,
|
||||
&mSystemConfig
|
||||
);
|
||||
if (EFI_ERROR (Status) || SysCfgSize != sizeof(SYSTEM_CONFIGURATION)) {
|
||||
//The setup variable is corrupted
|
||||
SysCfgSize = sizeof(SYSTEM_CONFIGURATION);
|
||||
Status = gRT->GetVariable(
|
||||
L"SetupRecovery",
|
||||
&gEfiNormalSetupGuid,
|
||||
NULL,
|
||||
&SysCfgSize,
|
||||
&mSystemConfig
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
|
||||
|
||||
Status = EFI_SUCCESS;
|
||||
Instance = 0;
|
||||
|
Reference in New Issue
Block a user