Vlv2TbltDevicePkg: Sync the branch changes to trunk.

[mirror_edk2.git] / Vlv2TbltDevicePkg / Library / MultiPlatformLib / BoardClkGens / BoardClkGens.c

diff --git a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
index 1fc731205bad28b507d75a8a8762453932f849bc..e38633b2b3ae6402567f8e18ffed7ae110a0d227 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
+++ b/Vlv2TbltDevicePkg/Library/MultiPlatformLib/BoardClkGens/BoardClkGens.c
@@ -346,7 +346,18 @@ ConfigurePlatformClocks (
                                    NULL,\r
                                    &VariableSize,\r
                                    &SystemConfiguration);\r
-\r
+  if (EFI_ERROR (Status) || VariableSize != sizeof(SYSTEM_CONFIGURATION)) {\r
+    //The setup variable is corrupted\r
+    VariableSize = sizeof(SYSTEM_CONFIGURATION);\r
+    Status = Variable->GetVariable(Variable,\r
+              L"SetupRecovery",\r
+              &gEfiSetupVariableGuid,\r
+              NULL,\r
+              &VariableSize,\r
+              &SystemConfiguration\r
+              );\r
+    ASSERT_EFI_ERROR (Status);\r
+  }  \r
   if(!EFI_ERROR (Status)){\r
     EnableSpreadSpectrum = SystemConfiguration.EnableClockSpreadSpec;\r
   }\r
@@ -359,6 +370,7 @@ ConfigurePlatformClocks (
 \r
   switch (PlatformInfoHob->BoardId) {\r
     case BOARD_ID_MINNOW2:\r
+    case BOARD_ID_MINNOW2_TURBOT:\r
     default:\r
       switch(PlatformInfoHob->PlatformFlavor) {\r
       case FlavorTablet:\r