From d46f36324fa86c08386f57c2675c45e4c1e888ec Mon Sep 17 00:00:00 2001 From: lgao4 Date: Thu, 9 Jul 2009 05:48:35 +0000 Subject: Retire Logo and Shell guid header file, which are replaced by gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile and gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8829 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c | 2 +- Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h | 1 - Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf | 4 ++-- Nt32Pkg/Nt32Pkg.fdf | 14 +++++--------- 4 files changed, 8 insertions(+), 13 deletions(-) (limited to 'Nt32Pkg') diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c index 891492ff82..34fd46ee59 100644 --- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c +++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.c @@ -282,7 +282,7 @@ Returns: // from the graphic lib // if (QuietBoot) { - EnableQuietBoot (&gEfiDefaultBmpLogoGuid); + EnableQuietBoot (PcdGetPtr(PcdLogoFile)); // // Perform system diagnostic // diff --git a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h index aa777deac2..d9aafc8fcd 100644 --- a/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h +++ b/Nt32Pkg/Library/Nt32BdsLib/BdsPlatform.h @@ -37,7 +37,6 @@ Abstract: #include #include -#include #include extern BDS_CONSOLE_CONNECT_ENTRY gPlatformConsole[]; diff --git a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf index 1284f4d06a..3708d679cb 100644 --- a/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf +++ b/Nt32Pkg/Library/Nt32BdsLib/Nt32BdsLib.inf @@ -54,13 +54,13 @@ GenericBdsLib [Guids] - gEfiDefaultBmpLogoGuid gEfiWinNtSystemConfigGuid [Pcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut - + gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile + [Depex] gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index d7427994c5..d5945cf2bf 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -210,8 +210,8 @@ INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf INF RuleOverride = TIANOCOMPRESSED MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf INF IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf -INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf ##This driver follows UEFI specification definition -INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf ##This driver follows UEFI specification definition +INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf +INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf INF IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf INF Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf INF Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIoDxe.inf @@ -240,19 +240,15 @@ INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf # for binary shell, binary fat and logo module. # ################################################################################ -FILE APPLICATION = c57ad6b7-0515-40a8-9d21-551652854e37 { - SECTION COMPRESS PI_STD { - SECTION GUIDED { - SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi - } - } +FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) { + SECTION PE32 = EdkShellBinPkg/FullShell/Ia32/Shell_Full.efi } FILE DRIVER = 961578FE-B6B7-44c3-AF35-6BC705CD2B1F { SECTION PE32 = FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi } -FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D { +FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) { SECTION RAW = MdeModulePkg/Logo/Logo.bmp } -- cgit v1.2.3