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:
@@ -62,6 +62,19 @@ PlatformInfoInit (
|
||||
UINT8 *LpssDataHobPtr;
|
||||
UINT8 *LpssDataVarPtr;
|
||||
UINTN i;
|
||||
|
||||
VarSize = sizeof(SYSTEM_CONFIGURATION);
|
||||
Status = gRT->GetVariable(
|
||||
NORMAL_SETUP_NAME,
|
||||
&gEfiNormalSetupGuid,
|
||||
NULL,
|
||||
&VarSize,
|
||||
&SystemConfiguration
|
||||
);
|
||||
|
||||
if (EFI_ERROR (Status) || VarSize != sizeof(SYSTEM_CONFIGURATION)) {
|
||||
//The setup variable is corrupted
|
||||
VarSize = sizeof(SYSTEM_CONFIGURATION);
|
||||
Status = gRT->GetVariable(
|
||||
L"SetupRecovery",
|
||||
&gEfiNormalSetupGuid,
|
||||
@@ -113,7 +126,7 @@ PlatformInfoInit (
|
||||
LpssDataVarPtr = &SystemConfiguration.LpssPciModeEnabled;
|
||||
for (i = 0; i < sizeof(EFI_PLATFORM_LPSS_DATA); i++) {
|
||||
*LpssDataVarPtr = *LpssDataHobPtr;
|
||||
LpssDataVarPtr++;
|
||||
LpssDataVarPtr++;
|
||||
LpssDataHobPtr++;
|
||||
}
|
||||
|
||||
@@ -146,7 +159,7 @@ PlatformInfoInit (
|
||||
&VarSize,
|
||||
&TmpHob
|
||||
);
|
||||
|
||||
|
||||
if (EFI_ERROR(Status) || CompareMem (&TmpHob, PlatformInfoHobPtr, VarSize)) {
|
||||
|
||||
//
|
||||
|
Reference in New Issue
Block a user