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

Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c

@@ -346,7 +346,18 @@ ConfigurePlatformClocks (
                              );
   //
   // Use normal setup default from NVRAM variable,
-  // the Platform Mode (manufacturing/safe/normal) is handle in PeiGetVariable.
+  // the Platform Mode (manufacturing/safe/normal) is handle in PeiGetVariable.
+  //
+  VariableSize = sizeof(SYSTEM_CONFIGURATION);
+  Status = Variable->GetVariable (Variable,
+                                   L"Setup",
+                                   &gEfiSetupVariableGuid,
+                                   NULL,
+                                   &VariableSize,
+                                   &SystemConfiguration);
+  if (EFI_ERROR (Status) || VariableSize != sizeof(SYSTEM_CONFIGURATION)) {
+    //The setup variable is corrupted
+    VariableSize = sizeof(SYSTEM_CONFIGURATION);
     Status = Variable->GetVariable(Variable,
               L"SetupRecovery",
               &gEfiSetupVariableGuid,