MdeModulePkg/SecurityStubDxe: Report failure if image is load earlier

[mirror_edk2.git] / ArmVirtPkg / Library / PlatformBootManagerLib / PlatformBm.c

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 5d7c2a44479995e8a6e4b842112d4365fe3c7955..56f4c921b51396961bde0e0b2afc33e448f92e86 100644 (file)
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -578,6 +578,8 @@ PlatformBootManagerBeforeConsole (
   VOID\r
   )\r
 {\r
+  RETURN_STATUS PcdStatus;\r
+\r
   //\r
   // Signal EndOfDxe PI Event\r
   //\r
@@ -629,7 +631,9 @@ PlatformBootManagerBeforeConsole (
   //\r
   // Set the front page timeout from the QEMU configuration.\r
   //\r
-  PcdSet16 (PcdPlatformBootTimeOut, GetFrontPageTimeoutFromQemu ());\r
+  PcdStatus = PcdSet16S (PcdPlatformBootTimeOut,\r
+                GetFrontPageTimeoutFromQemu ());\r
+  ASSERT_RETURN_ERROR (PcdStatus);\r
 \r
   //\r
   // Register platform-specific boot options and keyboard shortcuts.\r
@@ -657,13 +661,7 @@ PlatformBootManagerAfterConsole (
   //\r
   // Show the splash screen.\r
   //\r
-  // BootLogoEnableLogo (\r
-  //  ImageFormatBmp,                          // ImageFormat\r
-  //  PcdGetPtr (PcdLogoFile),                 // Logo\r
-  //  EdkiiPlatformLogoDisplayAttributeCenter, // Attribute\r
-  //  0,                                       // OffsetX\r
-  //  0                                        // OffsetY\r
-  //  );\r
+  BootLogoEnableLogo ();\r
 \r
   //\r
   // Connect the rest of the devices.\r