Nt32Pkg: Use the new LogoDxe driver

Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
index 373442e7ceeb90ccd6c3122839c6f8719b321947..07068f9e0ea6e9f10dd350a1521dffb46c3f8027 100644 (file)
--- a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+++ b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManager.c
@@ -42,7 +42,7 @@ PlatformBootManagerDiagnostics (
   // from the graphic lib\r
   //\r
   if (QuietBoot) {\r
-    // BootLogoEnableLogo (ImageFormatBmp, PcdGetPtr(PcdLogoFile), EdkiiPlatformLogoDisplayAttributeCenter, 0, 0);\r
+    BootLogoEnableLogo ();\r
 \r
     //\r
     // Perform system diagnostic\r

diff --git a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index c552f9799e181101066d57b36a4a07b6bf9d3b3f..91fbcc84bfc88dd08b927c1604382bf13cfd5c85 100644 (file)
--- a/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/Nt32Pkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -1,7 +1,7 @@
 ## @file\r
 #  Include all platform action which can be customized by IBV/OEM.\r
 #\r
-#  Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
@@ -71,5 +71,3 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdBootlogoOnlyEnable\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile\r
-  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile\r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 408cc51b99d37f1549d2d61fc2553bb9f53b7534..4458c0296ff275374121936664ecc034ef149f5d 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -119,7 +119,6 @@
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
-  ImageDecoderLib|MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf\r
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf\r
   #\r
   # Platform\r
@@ -447,10 +446,7 @@
   NetworkPkg/HttpDxe/HttpDxe.inf\r
   NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
 \r
-  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
-    <LibraryClasses>\r
-      NULL|MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf\r
-  }\r
+  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
   MdeModulePkg/Application/UiApp/UiApp.inf{\r
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf\r
@@ -474,6 +470,7 @@
     <LibraryClasses>\r
       NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf\r
   }\r
+  MdeModulePkg/Logo/LogoDxe.inf\r
 \r
 ###################################################################################################\r
 #\r

diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index bd9eeca8016e1573af974f4497582a672963cb2f..cf00a1386cdbc057a991653a78a18c65aebf2201 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -279,10 +279,7 @@ INF  EdkShellBinPkg/FullShell/FullShell.inf
 \r
 INF FatPkg/EnhancedFatDxe/Fat.inf\r
 \r
-FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-    SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-  }\r
-\r
+INF MdeModulePkg/Logo/LogoDxe.inf\r
 INF MdeModulePkg/Universal/LoadFileOnFv2/LoadFileOnFv2.inf\r
 ################################################################################\r
 #\r