Vlv2TbltDevicePkg: Always enable QuietBoot to produce BGRT

[mirror_edk2.git] / Vlv2TbltDevicePkg / Library / PlatformBdsLib / BdsPlatform.c

diff --git a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
index e86c6b3e2e7cedd2241fc0e7298e129a82e6dd45..4d5997d6e9613b25618577109b6b35037e05b069 100644 (file)
--- a/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
+++ b/Vlv2TbltDevicePkg/Library/PlatformBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2004  - 2018, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2004  - 2019, Intel Corporation. All rights reserved.<BR>\r
                                                                                    \r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
                                                                                    \r
@@ -1702,6 +1702,8 @@ PlatformBdsPolicyBehavior (
     EsrtManagement = NULL;\r
   }\r
 \r
+  DEBUG ((DEBUG_INFO, "BDS: BootMode=%02x\n", BootMode));\r
+\r
   switch (BootMode) {\r
 \r
   case BOOT_WITH_MINIMAL_CONFIGURATION:\r
@@ -1778,9 +1780,8 @@ PlatformBdsPolicyBehavior (
       goto FULL_CONFIGURATION;\r
     }\r
 \r
-    if (SystemConfiguration.QuietBoot) {\r
-      EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
-    } else {\r
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
+    if (!SystemConfiguration.QuietBoot) {\r
       PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);\r
     }\r
 \r
@@ -1864,8 +1865,7 @@ PlatformBdsPolicyBehavior (
     // Boot with the specific configuration\r
     //\r
     PlatformBdsConnectConsole (gPlatformConsole);\r
-    PlatformBdsDiagnostics (EXTENSIVE, FALSE, BaseMemoryTest);\r
-    EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
+    PlatformBdsDiagnostics (EXTENSIVE, TRUE, BaseMemoryTest);\r
 \r
     DEBUG((DEBUG_INFO, "ProcessCapsules Before EndOfDxe......\n"));\r
     ProcessCapsules ();\r
@@ -1968,10 +1968,9 @@ FULL_CONFIGURATION:
     // Perform some platform specific connect sequence\r
     //\r
     PlatformBdsConnectSequence ();\r
-    if (SystemConfiguration.QuietBoot) {\r
-        EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
-    } else {\r
-        PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);\r
+    EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
+    if (!SystemConfiguration.QuietBoot) {\r
+      PlatformBdsDiagnostics (IGNORE, FALSE, BaseMemoryTest);\r
     }\r
 \r
     //\r