tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg: switch to MdeModulePkg/Bus/Pci/PciHostBridgeDxe 

The old driver is retained for now; it remains available with "-D
USE_OLD_PCI_HOST". This is because I'd like to involve end users and
downstreams in testing the new drier, but also allow them to switch back
to the old driver at the first sight of trouble, while we debug the new
driver in parallel.

In a few weeks the ifdeffery and the "OvmfPkg/PciHostBridgeDxe/" driver
should be removed.

Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Alex Williamson <alex.williamson@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Laszlo Ersek 2016-01-26 01:18:36 +01:00
parent 75f4533119
commit 4014885ffd
6 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OvmfPkg/OvmfPkgIa32.dsc
View File

@ -37,6 +37,7 @@
DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE NETWORK_IP6_ENABLE = FALSE
DEFINE HTTP_BOOT_ENABLE = FALSE DEFINE HTTP_BOOT_ENABLE = FALSE
DEFINE SMM_REQUIRE = FALSE DEFINE SMM_REQUIRE = FALSE
DEFINE USE_OLD_PCI_HOST = FALSE
[BuildOptions] [BuildOptions]
GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
@ -525,7 +526,14 @@
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
UefiCpuPkg/CpuDxe/CpuDxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
!if $(USE_OLD_PCI_HOST) == TRUE
OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
!else
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
<LibraryClasses>
PciHostBridgeLib|OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
}
!endif
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
<LibraryClasses> <LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

4
OvmfPkg/OvmfPkgIa32.fdf
View File

@ -207,7 +207,11 @@ INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
!if $(USE_OLD_PCI_HOST) == TRUE
INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
!else
INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
!endif
INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf INF PcAtChipsetPkg/KbcResetDxe/Reset.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf INF MdeModulePkg/Universal/Metronome/Metronome.inf

8
OvmfPkg/OvmfPkgIa32X64.dsc
View File

@ -37,6 +37,7 @@
DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE NETWORK_IP6_ENABLE = FALSE
DEFINE HTTP_BOOT_ENABLE = FALSE DEFINE HTTP_BOOT_ENABLE = FALSE
DEFINE SMM_REQUIRE = FALSE DEFINE SMM_REQUIRE = FALSE
DEFINE USE_OLD_PCI_HOST = FALSE
[BuildOptions] [BuildOptions]
GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
@ -532,7 +533,14 @@
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
UefiCpuPkg/CpuDxe/CpuDxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
!if $(USE_OLD_PCI_HOST) == TRUE
OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
!else
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
<LibraryClasses>
PciHostBridgeLib|OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
}
!endif
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
<LibraryClasses> <LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

4
OvmfPkg/OvmfPkgIa32X64.fdf
View File

@ -207,7 +207,11 @@ INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
!if $(USE_OLD_PCI_HOST) == TRUE
INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
!else
INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
!endif
INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf INF PcAtChipsetPkg/KbcResetDxe/Reset.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf INF MdeModulePkg/Universal/Metronome/Metronome.inf

8
OvmfPkg/OvmfPkgX64.dsc
View File

@ -37,6 +37,7 @@
DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE NETWORK_IP6_ENABLE = FALSE
DEFINE HTTP_BOOT_ENABLE = FALSE DEFINE HTTP_BOOT_ENABLE = FALSE
DEFINE SMM_REQUIRE = FALSE DEFINE SMM_REQUIRE = FALSE
DEFINE USE_OLD_PCI_HOST = FALSE
[BuildOptions] [BuildOptions]
GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG
@ -530,7 +531,14 @@
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
UefiCpuPkg/CpuDxe/CpuDxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
!if $(USE_OLD_PCI_HOST) == TRUE
OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
!else
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
<LibraryClasses>
PciHostBridgeLib|OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.inf
}
!endif
MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf { MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
<LibraryClasses> <LibraryClasses>
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

4
OvmfPkg/OvmfPkgX64.fdf
View File

@ -207,7 +207,11 @@ INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
!if $(USE_OLD_PCI_HOST) == TRUE
INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
!else
INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
!endif
INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf INF PcAtChipsetPkg/KbcResetDxe/Reset.inf
INF MdeModulePkg/Universal/Metronome/Metronome.inf INF MdeModulePkg/Universal/Metronome/Metronome.inf