Update some module INF files in IntelFrameworkModulePkg to UEFI_DRIVER

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5699 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
index 218b099292d7184fd5835a418bf1734ed19fd143..2beb13bd468da445a4f90ae33e432976a8bb098d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf
@@ -23,7 +23,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IsaBusDxe\r
   FILE_GUID                      = 240612B5-A063-11d4-9A3A-0090273FC14D\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IsaBusDxe\r
   FILE_GUID                      = 240612B5-A063-11d4-9A3A-0090273FC14D\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -72,3 +72,4 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportDma\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory\r
 \r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportDma\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdIsaBusSupportIsaMemory\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
index 62e8394fb2c83e79266a8dc160cb55c186e49bcb..0e1438b82e4f8ba2b00d4b00789ad71a9aed1a33 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
@@ -27,7 +27,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IsaFloppyDxe\r
   FILE_GUID                      = 0abd8284-6da3-4616-971a-83a5148067ba\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IsaFloppyDxe\r
   FILE_GUID                      = 0abd8284-6da3-4616-971a-83a5148067ba\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -65,3 +65,4 @@
   gEfiBlockIoProtocolGuid                       # PROTOCOL BY_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r
   gEfiBlockIoProtocolGuid                       # PROTOCOL BY_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
index c2a02be98bc581e0a28151f8306d940e6a6a78ab..122a7824f6afb6d730c6e1ee96cf6cd9e8dea8f8 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
@@ -18,7 +18,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IsaSerialDxe\r
   FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IsaSerialDxe\r
   FILE_GUID                      = 93B80003-9FB3-11d4-9A3A-0090273FC14D\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -71,3 +71,4 @@
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
 \r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
index 4aa2dae009557260c8cd0e2fec7a2f5f658eac8c..bacc361aed5736f256c10e7d9b9e9da34095a76e 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf
@@ -20,7 +20,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Ps2KeyboardDxe\r
   FILE_GUID                      = 3DC82376-637B-40a6-A8FC-A565417F2C38\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Ps2KeyboardDxe\r
   FILE_GUID                      = 3DC82376-637B-40a6-A8FC-A565417F2C38\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -64,3 +64,4 @@
 [Guids]\r
   gSimpleTextInExNotifyGuid                     # SOMETIMES_CONSUMED\r
 \r
 [Guids]\r
   gSimpleTextInExNotifyGuid                     # SOMETIMES_CONSUMED\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
index 25c62c66d7cb23326463626cc449618deadcbede..a3f1284f541db9227488f65fd2045559573d34a1 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseAbsolutePointerDxe/Ps2MouseAbsolutePointerDxe.inf
@@ -20,7 +20,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Ps2MouseAbsolutePointerDxe\r
   FILE_GUID                      = 2899C94A-1FB6-4b1a-B96B-8364975303E0\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Ps2MouseAbsolutePointerDxe\r
   FILE_GUID                      = 2899C94A-1FB6-4b1a-B96B-8364975303E0\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -56,3 +56,4 @@
   gEfiAbsolutePointerProtocolGuid               # PROTOCOL BY_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r
   gEfiAbsolutePointerProtocolGuid               # PROTOCOL BY_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
index 77f97e351a1e027f1e30da5b719d3b1d38abc14c..d7dea0e76bb9f8cc6e997bda4ce12e3fd85a39b0 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
@@ -20,7 +20,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Ps2MouseDxe\r
   FILE_GUID                      = 202A2B0E-9A31-4812-B291-8747DF152439\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = Ps2MouseDxe\r
   FILE_GUID                      = 202A2B0E-9A31-4812-B291-8747DF152439\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -56,3 +56,4 @@
   gEfiSimplePointerProtocolGuid                 # PROTOCOL BY_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r
   gEfiSimplePointerProtocolGuid                 # PROTOCOL BY_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
index 6aa04701ef9e7474ac59ac81f7ae984d3869d8e8..a3f466a0807f56f5fb4666d471abe34a5d7fd154 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
@@ -19,7 +19,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IdeBusDxe\r
   FILE_GUID                      = 69FD8E47-A161-4550-B01A-5594CEB2B2B2\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = IdeBusDxe\r
   FILE_GUID                      = 69FD8E47-A161-4550-B01A-5594CEB2B2B2\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -83,3 +83,4 @@
   gEfiPciIoProtocolGuid                         # PROTOCOL TO_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r
   gEfiPciIoProtocolGuid                         # PROTOCOL TO_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index d49cd1510dfb6f3ca6428546a6994e3c52c624ac..3c8b63cd78c655029de8000915b3c1d51b00acc0 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -20,7 +20,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PciBusDxe\r
   FILE_GUID                      = 93B80004-9FB3-11d4-9A3A-0090273FC14D\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PciBusDxe\r
   FILE_GUID                      = 93B80004-9FB3-11d4-9A3A-0090273FC14D\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -116,3 +116,4 @@
 [FixedPcd.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask\r
 \r
 [FixedPcd.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
index 9b6c22343e3ea72f73ebb70a860daa0aa0f56f0e..09757f94cc9a0e866c44a2b95e301d56d682429d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/VgaMiniPortDxe/VgaMiniPortDxe.inf
@@ -19,7 +19,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VgaMiniPort\r
   FILE_GUID                      = 15C5E761-58D8-461a-9173-CAB020916264\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VgaMiniPort\r
   FILE_GUID                      = 15C5E761-58D8-461a-9173-CAB020916264\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -57,3 +57,4 @@
   gEfiComponentName2ProtocolGuid\r
   gEfiVgaMiniPortProtocolGuid\r
 \r
   gEfiComponentName2ProtocolGuid\r
   gEfiVgaMiniPortProtocolGuid\r
 \r

+\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 65ae0c0ac3b1c5bad6dfe37d3d399d16b40bfea2..ee2f2198ae7c6338a10108511d545f0d513b6c4b 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -98,6 +98,23 @@
   FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
   FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf\r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r

+[LibraryClasses.common.UEFI_DRIVER]\r
+  HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
+  MemoryAllocationLib|MdePkg/Library/DxeMemoryAllocationLib/DxeMemoryAllocationLib.inf\r
+  PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
+  SmbusLib|MdePkg/Library/DxeSmbusLib/DxeSmbusLib.inf\r
+  UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
+  DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
+  UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf\r
+  UefiLib|MdePkg/Library/UefiLib/UefiLib.inf\r
+  UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf\r
+  DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
+  ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf\r
+  FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf\r
+  PciIncompatibleDeviceSupportLib|IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf\r
+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
+  GraphicsLib|IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf\r
+\r

 ################################################################################\r
 #\r
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform\r
 ################################################################################\r
 #\r
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform\r

diff --git a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
index 577b51e0708c9b551afe6332967a54133af53984..31bcea5bf07550a4e0a5c4139d6db0c96bc667d3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/Console/VgaClassDxe/VgaClassDxe.inf
@@ -19,7 +19,7 @@
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VgaClassDxe\r
   FILE_GUID                      = BF89F10D-B205-474f-96E3-7A7BB1B4A407\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VgaClassDxe\r
   FILE_GUID                      = BF89F10D-B205-474f-96E3-7A7BB1B4A407\r

-  MODULE_TYPE                    = DXE_DRIVER\r
+  MODULE_TYPE                    = UEFI_DRIVER\r

   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   VERSION_STRING                 = 1.0\r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r


@@ -68,3 +68,4 @@
   gEfiPciIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
 \r
   gEfiPciIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED\r
 \r

+\r