From 6398b08db25de85918b5421262f8d2aabaedb0f9 Mon Sep 17 00:00:00 2001 From: jcarsey Date: Wed, 30 May 2012 17:34:16 +0000 Subject: ShellPkg: Enable Runtime DXE drivers to make use of Shell libraries with the expectation that the driver is responsible for ensuring that they are only called when boot services are present. Also adds a ShellCommandLib Depex for gEfiUnicodeCollation2ProtocolGuid to fix constructor crash when used by drivers. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eugene Cohen eugene@hp.com reviewed-by: jaben carsey jaben.carsey@intel.com git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13380 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf | 2 +- ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf | 2 +- ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf | 6 +++++- ShellPkg/Library/UefiShellLib/UefiShellLib.inf | 2 +- ShellPkg/Library/UefiSortLib/UefiSortLib.inf | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) (limited to 'ShellPkg') diff --git a/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf b/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf index dbeb6ba5f3..1d27c6da2c 100644 --- a/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf +++ b/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf @@ -19,7 +19,7 @@ FILE_GUID = 9495D344-9D8A-41f3-8D17-E2FD238C4E71 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = FileHandleLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = FileHandleLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER # # VALID_ARCHITECTURES = IA32 X64 IPF EBC diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf index ddba0cfa18..15226a0b2e 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf @@ -18,7 +18,7 @@ FILE_GUID = 3CDC7177-CC2A-4678-BA8F-1A936A093FA4 MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = HandleParsingLib|UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = HandleParsingLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER CONSTRUCTOR = HandleParsingLibConstructor DESTRUCTOR = HandleParsingLibDestructor diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf index fb361a67f4..6b3d774f47 100644 --- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf +++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf @@ -19,7 +19,7 @@ FILE_GUID = 5C12F31F-EBAC-466e-A400-FCA8C9EA3A05 MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = ShellCommandLib|UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = ShellCommandLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER CONSTRUCTOR = ShellCommandLibConstructor DESTRUCTOR = ShellCommandLibDestructor @@ -46,6 +46,7 @@ UefiBootServicesTableLib ShellLib HiiLib + HandleParsingLib [Protocols] gEfiUnicodeCollation2ProtocolGuid # ALWAYS_CONSUMED @@ -59,3 +60,6 @@ [Pcd.common] gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## ALWAYS_CONSUMED gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength ## ALWAYS_CONSUMED + +[Depex] + gEfiUnicodeCollation2ProtocolGuid diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf index 18803bdcb8..9606ebf5c5 100644 --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf @@ -19,7 +19,7 @@ FILE_GUID = 449D0F00-2148-4a43-9836-F10B3980ECF5 MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = ShellLib|UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = ShellLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER CONSTRUCTOR = ShellLibConstructor DESTRUCTOR = ShellLibDestructor diff --git a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf index 522d4d8537..8080cc0c82 100644 --- a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf +++ b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf @@ -19,7 +19,7 @@ FILE_GUID = 4264A823-45A3-42db-B92C-AA078555CBD3 MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 - LIBRARY_CLASS = SortLib|UEFI_APPLICATION UEFI_DRIVER UEFI_DRIVER + LIBRARY_CLASS = SortLib|UEFI_APPLICATION UEFI_DRIVER UEFI_DRIVER DXE_RUNTIME_DRIVER # # VALID_ARCHITECTURES = IA32 X64 IPF EBC -- cgit v1.2.3