Move gEfiPciOptionRomTableGuid from IntelFrameworkModulePkg to the DuetPkg

Update PCI Bus Driver in IntelFramworkModulePkg to no longer depend on gEfiPciOptionRomTableGuid

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

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
index 90e32bf19847b035ae6a933f154a983fed335d7c..8f2e29c16e1020db597294ab9ebb88a2c2784806 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBus.h
@@ -29,7 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/PciPlatform.h>\r
 #include <Protocol/PciHotPlugInit.h>\r
 #include <Protocol/Decompress.h>\r
-#include <Guid/PciOptionRomTable.h>\r
 #include <Protocol/BusSpecificDriverOverride.h>\r
 #include <Protocol/UgaIo.h>\r
 #include <Protocol/IncompatiblePciDeviceSupport.h>\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
index b4dd56d2218495238d47703f4a790eb41995295f..bf66552185f0456877da23de51290a111f4e664f 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
@@ -71,8 +71,6 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
   IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
-\r
-\r
 [LibraryClasses]\r
   PciIncompatibleDeviceSupportLib\r
   PcdLib\r
@@ -87,9 +85,6 @@
   DebugLib\r
   PeCoffLib\r
 \r
-[Guids]\r
-  gEfiPciOptionRomTableGuid                     # SOMETIMES_CONSUMED  System Table\r
-\r
 [Protocols]\r
   gEfiPciHotPlugRequestProtocolGuid             # PROTOCOL ALWAYS_PRODUCED\r
   gEfiBusSpecificDriverOverrideProtocolGuid     # PROTOCOL BY_START\r
@@ -110,7 +105,6 @@
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciBusHotplugDeviceSupport\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIsaEnable\r
 \r
-\r
 [FixedPcd.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPciIncompatibleDeviceSupportMask\r
 \r

diff --git a/IntelFrameworkModulePkg/Include/Guid/PciOptionRomTable.h b/IntelFrameworkModulePkg/Include/Guid/PciOptionRomTable.h
deleted file mode 100644 (file)
index 09e4faa..0000000
--- a/IntelFrameworkModulePkg/Include/Guid/PciOptionRomTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/** @file\r
-  GUID and data structure used to describe the list of PCI Option ROMs present in a system.\r
-  \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. 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
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-**/\r
-\r
-#ifndef __PCI_OPTION_ROM_TABLE_GUID_H_\r
-#define __PCI_OPTION_ROM_TABLE_GUID_H_\r
-\r
-#define EFI_PCI_OPTION_ROM_TABLE_GUID \\r
-  { 0x7462660f, 0x1cbd, 0x48da, {0xad, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1c } }\r
-\r
-extern EFI_GUID gEfiPciOptionRomTableGuid;\r
-\r
-typedef struct {\r
-  EFI_PHYSICAL_ADDRESS   RomAddress; \r
-  EFI_MEMORY_TYPE        MemoryType;\r
-  UINT32                 RomLength; \r
-  UINT32                 Seg; \r
-  UINT8                  Bus; \r
-  UINT8                  Dev; \r
-  UINT8                  Func; \r
-  BOOLEAN                ExecutedLegacyBiosImage; \r
-  BOOLEAN                DontLoadEfiRom;\r
-} EFI_PCI_OPTION_ROM_DESCRIPTOR;\r
-\r
-typedef struct {\r
-  UINT64                         PciOptionRomCount;\r
-  EFI_PCI_OPTION_ROM_DESCRIPTOR   *PciOptionRomDescriptors;\r
-} EFI_PCI_OPTION_ROM_TABLE;\r
-\r
-#endif // __PCI_OPTION_ROM_TABLE_GUID_H_\r
-\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index acb6f98a82c83321174806f5c3aaf731c4001025..0f31f934a66a19c3b248020ab3750c35802a24c0 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -40,9 +40,6 @@
   ## Include/Guid/DataHubStatusCodeRecord.h\r
   gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}\r
   \r
-  ## Include/Guid/PciOptionRomTable.h\r
-  gEfiPciOptionRomTableGuid       = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}\r
-  \r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}\r
   \r
   ## Include/Guid/CustomDecompress.h\r