2 files changed, 13 insertions, 26 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
index da0a8389fa..5ab898959e 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/ConsoleOption.c
@@ -918,25 +918,20 @@ GetConsoleOutMode (
   UINTN                         Mode;
   UINTN                         MaxMode;
   EFI_STATUS                    Status;
-  CONSOLE_OUT_MODE              *ModeInfo;
   EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *ConOut;
 
   ConOut   = gST->ConOut;
   MaxMode  = (UINTN) (ConOut->Mode->MaxMode);
-  ModeInfo = EfiLibGetVariable (VAR_CON_OUT_MODE, &gEfiGenericPlatformVariableGuid);
-
-  if (ModeInfo != NULL) {
-    CurrentCol = ModeInfo->Column;
-    CurrentRow = ModeInfo->Row;
-    for (Mode = 0; Mode < MaxMode; Mode++) {
-      Status = ConOut->QueryMode (ConOut, Mode, &Col, &Row);
-      if (!EFI_ERROR(Status)) {
-        if (CurrentCol == Col && CurrentRow == Row) {
-          CallbackData->BmmFakeNvData.ConsoleOutMode = (UINT16) Mode;
-          break;
-        }
+
+  CurrentCol = PcdGet32 (PcdConOutColumn);
+  CurrentRow = PcdGet32 (PcdConOutRow);
+  for (Mode = 0; Mode < MaxMode; Mode++) {
+    Status = ConOut->QueryMode (ConOut, Mode, &Col, &Row);
+    if (!EFI_ERROR(Status)) {
+      if (CurrentCol == Col && CurrentRow == Row) {
+        CallbackData->BmmFakeNvData.ConsoleOutMode = (UINT16) Mode;
+        break;
       }
     }
-    FreePool (ModeInfo);
   }
 }
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index d513da2ef3..489827f9de 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -1399,18 +1399,10 @@ Var_UpdateConMode (
   Mode = CallbackData->BmmFakeNvData.ConsoleOutMode;
 
   Status = gST->ConOut->QueryMode (gST->ConOut, Mode, &(ModeInfo.Column), &(ModeInfo.Row));
-  if (EFI_ERROR(Status)) {
-    ModeInfo.Column = 80;
-    ModeInfo.Row = 25;
+  if (!EFI_ERROR(Status)) {
+    PcdSet32 (PcdConOutColumn, (UINT32) ModeInfo.Column);
+    PcdSet32 (PcdConOutRow, (UINT32) ModeInfo.Row);
   }
 
-  Status = gRT->SetVariable (
-                  VAR_CON_OUT_MODE,
-                  &gEfiGenericPlatformVariableGuid,
-                  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
-                  sizeof (CONSOLE_OUT_MODE),
-                  &ModeInfo
-                  );
-
-  return Status;
+  return EFI_SUCCESS;
 }