Re: [edk2] [RFC PATCH v1 8/8] OvmfPkg: Update DSC/FDF files to consume 8259/8254 drivers in OvmfPkg
On 04/03/19 09:00, Hao Wu wrote: > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1496 > > This commit updates the OVMF DSC/FDF files to consume the copied > 8259InterruptControllerDxe and 8254TimerDxe drivers within OvmfPkg. > > The unconsumed PCD: > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel > > is removed from DSC files as well. > > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: David Woodhouse > Cc: Ray Ni > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Hao Wu > --- > OvmfPkg/OvmfPkgIa32.dsc| 3 --- > OvmfPkg/OvmfPkgIa32X64.dsc | 3 --- > OvmfPkg/OvmfPkgX64.dsc | 3 --- > OvmfPkg/OvmfPkgIa32.fdf| 4 ++-- > OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++-- > OvmfPkg/OvmfPkgX64.fdf | 4 ++-- > 6 files changed, 6 insertions(+), 15 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index d88295f9fd..692da9584d 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -516,7 +516,6 @@ > !endif > ># IRQs 5, 9, 10, 11 are level-triggered > - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 >gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > ># Point to the MdeModulePkg/Application/UiApp/UiApp.inf > @@ -669,11 +668,9 @@ >} > >MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf >OvmfPkg/8259InterruptControllerDxe/8259.inf >UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf >UefiCpuPkg/CpuDxe/CpuDxe.inf > - PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >OvmfPkg/8254TimerDxe/8254Timer.inf >OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf >OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index a83b6f448e..01b2530064 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -522,7 +522,6 @@ > !endif > ># IRQs 5, 9, 10, 11 are level-triggered > - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 >gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > ># Point to the MdeModulePkg/Application/UiApp/UiApp.inf > @@ -678,11 +677,9 @@ >} > >MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf >OvmfPkg/8259InterruptControllerDxe/8259.inf >UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf >UefiCpuPkg/CpuDxe/CpuDxe.inf > - PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >OvmfPkg/8254TimerDxe/8254Timer.inf >OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf >OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index ad9816a165..444a00c87d 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -521,7 +521,6 @@ > !endif > ># IRQs 5, 9, 10, 11 are level-triggered > - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 >gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > ># Point to the MdeModulePkg/Application/UiApp/UiApp.inf > @@ -676,11 +675,9 @@ >} > >MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf >OvmfPkg/8259InterruptControllerDxe/8259.inf >UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf >UefiCpuPkg/CpuDxe/CpuDxe.inf > - PcAtChipsetPkg/8254TimerDxe/8254Timer.inf >OvmfPkg/8254TimerDxe/8254Timer.inf >OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf >OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 006ea9a415..423984b4b9 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -213,10 +213,10 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > -INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > +INF OvmfPkg/8259InterruptControllerDxe/8259.inf > INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf > INF UefiCpuPkg/CpuDxe/CpuDxe.inf > -INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf > +INF OvmfPkg/8254TimerDxe/8254Timer.inf > INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf > INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf > INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index 6c40540202..45eb561e3f 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -214,10 +214,10 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > -INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > +INF OvmfPkg/8259Interrupt
[edk2] [RFC PATCH v1 8/8] OvmfPkg: Update DSC/FDF files to consume 8259/8254 drivers in OvmfPkg
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1496 This commit updates the OVMF DSC/FDF files to consume the copied 8259InterruptControllerDxe and 8254TimerDxe drivers within OvmfPkg. The unconsumed PCD: gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel is removed from DSC files as well. Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel Cc: David Woodhouse Cc: Ray Ni Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu --- OvmfPkg/OvmfPkgIa32.dsc| 3 --- OvmfPkg/OvmfPkgIa32X64.dsc | 3 --- OvmfPkg/OvmfPkgX64.dsc | 3 --- OvmfPkg/OvmfPkgIa32.fdf| 4 ++-- OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++-- OvmfPkg/OvmfPkgX64.fdf | 4 ++-- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index d88295f9fd..692da9584d 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -516,7 +516,6 @@ !endif # IRQs 5, 9, 10, 11 are level-triggered - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 # Point to the MdeModulePkg/Application/UiApp/UiApp.inf @@ -669,11 +668,9 @@ } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf OvmfPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf - PcAtChipsetPkg/8254TimerDxe/8254Timer.inf OvmfPkg/8254TimerDxe/8254Timer.inf OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index a83b6f448e..01b2530064 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -522,7 +522,6 @@ !endif # IRQs 5, 9, 10, 11 are level-triggered - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 # Point to the MdeModulePkg/Application/UiApp/UiApp.inf @@ -678,11 +677,9 @@ } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf OvmfPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf - PcAtChipsetPkg/8254TimerDxe/8254Timer.inf OvmfPkg/8254TimerDxe/8254Timer.inf OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index ad9816a165..444a00c87d 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -521,7 +521,6 @@ !endif # IRQs 5, 9, 10, 11 are level-triggered - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 # Point to the MdeModulePkg/Application/UiApp/UiApp.inf @@ -676,11 +675,9 @@ } MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf OvmfPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf - PcAtChipsetPkg/8254TimerDxe/8254Timer.inf OvmfPkg/8254TimerDxe/8254Timer.inf OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 006ea9a415..423984b4b9 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -213,10 +213,10 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf -INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf +INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf -INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf +INF OvmfPkg/8254TimerDxe/8254Timer.inf INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 6c40540202..45eb561e3f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -214,10 +214,10 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf -INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf +INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf -INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf +INF OvmfPkg/8254TimerDxe/8254Timer.inf INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf INF OvmfPkg/Pc
