Reviewed-by: Ruiyu Ni <ruiyu...@intel.com>
>-----Original Message----- >From: Laszlo Ersek [mailto:ler...@redhat.com] >Sent: Saturday, February 27, 2016 8:24 AM >To: edk2-devel-01 <edk2-de...@ml01.01.org> >Cc: Justen, Jordan L <jordan.l.jus...@intel.com>; Ni, Ruiyu ><ruiyu...@intel.com>; Marcel Apfelbaum ><mar...@redhat.com>; Alex Williamson <alex.william...@redhat.com>; Gerd >Hoffmann <kra...@redhat.com> >Subject: [PATCH 17/17] 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.jus...@intel.com> >Cc: Ruiyu Ni <ruiyu...@intel.com> >Cc: Marcel Apfelbaum <mar...@redhat.com> >Cc: Alex Williamson <alex.william...@redhat.com> >Cc: Gerd Hoffmann <kra...@redhat.com> >Contributed-under: TianoCore Contribution Agreement 1.0 >Signed-off-by: Laszlo Ersek <ler...@redhat.com> >--- > OvmfPkg/OvmfPkgIa32.dsc | 8 ++++++++ > OvmfPkg/OvmfPkgIa32X64.dsc | 8 ++++++++ > OvmfPkg/OvmfPkgX64.dsc | 8 ++++++++ > OvmfPkg/OvmfPkgIa32.fdf | 4 ++++ > OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++++ > OvmfPkg/OvmfPkgX64.fdf | 4 ++++ > 6 files changed, 36 insertions(+) > >diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc >index fd39c7ec2441..308ec39d4ddf 100644 >--- a/OvmfPkg/OvmfPkgIa32.dsc >+++ b/OvmfPkg/OvmfPkgIa32.dsc >@@ -37,6 +37,7 @@ [Defines] > DEFINE NETWORK_IP6_ENABLE = FALSE > DEFINE HTTP_BOOT_ENABLE = FALSE > DEFINE SMM_REQUIRE = FALSE >+ DEFINE USE_OLD_PCI_HOST = FALSE > > [BuildOptions] > GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG >@@ -503,7 +504,14 @@ [Components] > UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > UefiCpuPkg/CpuDxe/CpuDxe.inf > PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >+!if $(USE_OLD_PCI_HOST) == TRUE > 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 { > <LibraryClasses> > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf >diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc >index 9c739a8cb2a5..6de8ed2cb3bd 100644 >--- a/OvmfPkg/OvmfPkgIa32X64.dsc >+++ b/OvmfPkg/OvmfPkgIa32X64.dsc >@@ -37,6 +37,7 @@ [Defines] > DEFINE NETWORK_IP6_ENABLE = FALSE > DEFINE HTTP_BOOT_ENABLE = FALSE > DEFINE SMM_REQUIRE = FALSE >+ DEFINE USE_OLD_PCI_HOST = FALSE > > [BuildOptions] > GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG >@@ -510,7 +511,14 @@ [Components.X64] > UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > UefiCpuPkg/CpuDxe/CpuDxe.inf > PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >+!if $(USE_OLD_PCI_HOST) == TRUE > 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 { > <LibraryClasses> > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf >diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc >index e31f8a759fbb..6254e9a64619 100644 >--- a/OvmfPkg/OvmfPkgX64.dsc >+++ b/OvmfPkg/OvmfPkgX64.dsc >@@ -37,6 +37,7 @@ [Defines] > DEFINE NETWORK_IP6_ENABLE = FALSE > DEFINE HTTP_BOOT_ENABLE = FALSE > DEFINE SMM_REQUIRE = FALSE >+ DEFINE USE_OLD_PCI_HOST = FALSE > > [BuildOptions] > GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG >@@ -508,7 +509,14 @@ [Components] > UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > UefiCpuPkg/CpuDxe/CpuDxe.inf > PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >+!if $(USE_OLD_PCI_HOST) == TRUE > 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 { > <LibraryClasses> > PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf >diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf >index 011105358020..2ef6206bdd04 100644 >--- a/OvmfPkg/OvmfPkgIa32.fdf >+++ b/OvmfPkg/OvmfPkgIa32.fdf >@@ -207,7 +207,11 @@ [FV.DXEFV] > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > INF UefiCpuPkg/CpuDxe/CpuDxe.inf > INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >+!if $(USE_OLD_PCI_HOST) == TRUE > INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf >+!else >+INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf >+!endif > INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > INF PcAtChipsetPkg/KbcResetDxe/Reset.inf > INF MdeModulePkg/Universal/Metronome/Metronome.inf >diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf >index 52e234bddced..98464ca146bf 100644 >--- a/OvmfPkg/OvmfPkgIa32X64.fdf >+++ b/OvmfPkg/OvmfPkgIa32X64.fdf >@@ -207,7 +207,11 @@ [FV.DXEFV] > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > INF UefiCpuPkg/CpuDxe/CpuDxe.inf > INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >+!if $(USE_OLD_PCI_HOST) == TRUE > INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf >+!else >+INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf >+!endif > INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > INF PcAtChipsetPkg/KbcResetDxe/Reset.inf > INF MdeModulePkg/Universal/Metronome/Metronome.inf >diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf >index d46092a55247..88f0f0858429 100644 >--- a/OvmfPkg/OvmfPkgX64.fdf >+++ b/OvmfPkg/OvmfPkgX64.fdf >@@ -207,7 +207,11 @@ [FV.DXEFV] > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > INF UefiCpuPkg/CpuDxe/CpuDxe.inf > INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >+!if $(USE_OLD_PCI_HOST) == TRUE > INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf >+!else >+INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf >+!endif > INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf > INF PcAtChipsetPkg/KbcResetDxe/Reset.inf > INF MdeModulePkg/Universal/Metronome/Metronome.inf >-- >1.8.3.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
