sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
jcarsey
2012-05-30 17:34:16 +00:00
parent f3235b77e4
commit 6398b08db2
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
View File

@ -19,7 +19,7 @@
FILE_GUID = 9495D344-9D8A-41f3-8D17-E2FD238C4E71 FILE_GUID = 9495D344-9D8A-41f3-8D17-E2FD238C4E71
MODULE_TYPE = DXE_DRIVER MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0 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 # VALID_ARCHITECTURES = IA32 X64 IPF EBC

2
ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
View File

@ -18,7 +18,7 @@
FILE_GUID = 3CDC7177-CC2A-4678-BA8F-1A936A093FA4 FILE_GUID = 3CDC7177-CC2A-4678-BA8F-1A936A093FA4
MODULE_TYPE = UEFI_DRIVER MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = HandleParsingLib|UEFI_APPLICATION UEFI_DRIVER LIBRARY_CLASS = HandleParsingLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER
CONSTRUCTOR = HandleParsingLibConstructor CONSTRUCTOR = HandleParsingLibConstructor
DESTRUCTOR = HandleParsingLibDestructor DESTRUCTOR = HandleParsingLibDestructor

6
ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
View File

@ -19,7 +19,7 @@
FILE_GUID = 5C12F31F-EBAC-466e-A400-FCA8C9EA3A05 FILE_GUID = 5C12F31F-EBAC-466e-A400-FCA8C9EA3A05
MODULE_TYPE = UEFI_DRIVER MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = ShellCommandLib|UEFI_APPLICATION UEFI_DRIVER LIBRARY_CLASS = ShellCommandLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER
CONSTRUCTOR = ShellCommandLibConstructor CONSTRUCTOR = ShellCommandLibConstructor
DESTRUCTOR = ShellCommandLibDestructor DESTRUCTOR = ShellCommandLibDestructor
@ -46,6 +46,7 @@
UefiBootServicesTableLib UefiBootServicesTableLib
ShellLib ShellLib
HiiLib HiiLib
HandleParsingLib
[Protocols] [Protocols]
gEfiUnicodeCollation2ProtocolGuid # ALWAYS_CONSUMED gEfiUnicodeCollation2ProtocolGuid # ALWAYS_CONSUMED
@ -59,3 +60,6 @@
[Pcd.common] [Pcd.common]
gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## ALWAYS_CONSUMED gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## ALWAYS_CONSUMED
gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength ## ALWAYS_CONSUMED gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength ## ALWAYS_CONSUMED
[Depex]
gEfiUnicodeCollation2ProtocolGuid

2
ShellPkg/Library/UefiShellLib/UefiShellLib.inf
View File

@ -19,7 +19,7 @@
FILE_GUID = 449D0F00-2148-4a43-9836-F10B3980ECF5 FILE_GUID = 449D0F00-2148-4a43-9836-F10B3980ECF5
MODULE_TYPE = UEFI_DRIVER MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
LIBRARY_CLASS = ShellLib|UEFI_APPLICATION UEFI_DRIVER LIBRARY_CLASS = ShellLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER
CONSTRUCTOR = ShellLibConstructor CONSTRUCTOR = ShellLibConstructor
DESTRUCTOR = ShellLibDestructor DESTRUCTOR = ShellLibDestructor

2
ShellPkg/Library/UefiSortLib/UefiSortLib.inf
View File

@ -19,7 +19,7 @@
FILE_GUID = 4264A823-45A3-42db-B92C-AA078555CBD3 FILE_GUID = 4264A823-45A3-42db-B92C-AA078555CBD3
MODULE_TYPE = UEFI_DRIVER MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0 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 # VALID_ARCHITECTURES = IA32 X64 IPF EBC