Remove the auto conversion for the first varstore name to "Setup".

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / Utility.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
index 4610c90deca5168fad26984fe75f185efd30f886..9e4679cb9ef5c6a81c81bead97d7905dd714eb08 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Utility.c
@@ -663,23 +663,9 @@ GetFormsetDefaultVarstoreId (
     \r
   }\r
 \r
-  DEBUG_CODE_BEGIN ();\r
   if (FormSet->DefaultVarStoreId == 0) {\r
     DEBUG ((EFI_D_INFO, "FormSet %g: No Varstore Found\n", &FormSet->Guid));\r
-  } else {\r
-    //    The name of default VARSTORE with a Explicit declaration statement will be updated to L"Setup" to make sure\r
-    //    the Framework HII Setup module will run correctly. Framework HII Setup module always assumed that default\r
-    //    VARSTORE to have L"Setup" as name, Formset GUID as GUID. \r
-\r
-    DEBUG ((EFI_D_INFO, "FormSet %g: Default Varstore ID (0x%x) N(%s) G(%g)\n", &FormSet->Guid, FormSet->DefaultVarStoreId, DefaultStorage->Name, &DefaultStorage->Guid));\r
-\r
-    if (StrCmp (DefaultStorage->Name, FrameworkReservedVarstoreName) != 0) {\r
-      DEBUG ((EFI_D_INFO, "          : Name is updated from %s to %s.\n", DefaultStorage->Name, FrameworkReservedVarstoreName));\r
-      FormSet->OriginalDefaultVarStoreName = DefaultStorage->Name;\r
-      DefaultStorage->Name = AllocateCopyPool (StrSize (FrameworkReservedVarstoreName), FrameworkReservedVarstoreName);\r
-    }\r
-  }\r
-  DEBUG_CODE_END ();\r
+  } \r
   \r
   return;\r
 }\r