1. Update Generic BDS part to use dynamic PCD to set console output mode instead...

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / BootMaint / ConsoleOption.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
index da0a8389fa43ebbd9596d5d819fc738272f33d70..5ab898959e96c7bb067fcc0d2513a93c34188c13 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
@@ -918,25 +918,20 @@ GetConsoleOutMode (
   UINTN                         Mode;\r
   UINTN                         MaxMode;\r
   EFI_STATUS                    Status;\r
-  CONSOLE_OUT_MODE              *ModeInfo;\r
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *ConOut;\r
 \r
   ConOut   = gST->ConOut;\r
   MaxMode  = (UINTN) (ConOut->Mode->MaxMode);\r
-  ModeInfo = EfiLibGetVariable (VAR_CON_OUT_MODE, &gEfiGenericPlatformVariableGuid);\r
-\r
-  if (ModeInfo != NULL) {\r
-    CurrentCol = ModeInfo->Column;\r
-    CurrentRow = ModeInfo->Row;\r
-    for (Mode = 0; Mode < MaxMode; Mode++) {\r
-      Status = ConOut->QueryMode (ConOut, Mode, &Col, &Row);\r
-      if (!EFI_ERROR(Status)) {\r
-        if (CurrentCol == Col && CurrentRow == Row) {\r
-          CallbackData->BmmFakeNvData.ConsoleOutMode = (UINT16) Mode;\r
-          break;\r
-        }\r
+\r
+  CurrentCol = PcdGet32 (PcdConOutColumn);\r
+  CurrentRow = PcdGet32 (PcdConOutRow);\r
+  for (Mode = 0; Mode < MaxMode; Mode++) {\r
+    Status = ConOut->QueryMode (ConOut, Mode, &Col, &Row);\r
+    if (!EFI_ERROR(Status)) {\r
+      if (CurrentCol == Col && CurrentRow == Row) {\r
+        CallbackData->BmmFakeNvData.ConsoleOutMode = (UINT16) Mode;\r
+        break;\r
       }\r
     }\r
-    FreePool (ModeInfo);\r
   }\r
 }\r