On 04/10/19 03:06, Wu, Hao A wrote: > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1496 > > Several updates have been made to the > OvmfPkg/8259InterruptControllerDxe driver to make it build under OvmfPkg: > > A) Update the driver INF file to consume PCDs defined within OvmfPkg; > B) Remove the unnecessary dependency on the IntelFrameworkPkg header file > 'FrameworkDxe.h'; > C) Remove the IntelFrameworkPkg & PcAtChipsetPkg DEC files dependency in > the driver INF file. > > A new GUID has been updated for the INF file. > > Corresponding changes have been made in OVMF DSC files as well in order to > verify the build. > > Please note that a subsequent commit (final patch of the series) will: > > A) Add OvmfPkg/8259InterruptControllerDxe driver in OVMF FDF files; > B) Remove the consumption of PcAtChipsetPkg/8259InterruptControllerDxe > driver in OVMF DSC/FDF files; > C) Remove the consumption of > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel in OVMF DSC > files. > > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> > Cc: David Woodhouse <dw...@infradead.org> > Cc: Ray Ni <ray...@intel.com> > Signed-off-by: Hao Wu <hao.a...@intel.com> > Reviewed-by: Laszlo Ersek <ler...@redhat.com> > --- > OvmfPkg/OvmfPkgIa32.dsc | 2 ++ > OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++ > OvmfPkg/OvmfPkgX64.dsc | 2 ++ > OvmfPkg/8259InterruptControllerDxe/8259.inf | 11 +++++------ > OvmfPkg/8259InterruptControllerDxe/8259.h | 4 +--- > 5 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 2612c6fd89..feb8bc9b92 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -511,6 +511,7 @@ [PcdsFixedAtBuild] > > # IRQs 5, 9, 10, 11 are level-triggered > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > > # Point to the MdeModulePkg/Application/UiApp/UiApp.inf > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, > 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > @@ -663,6 +664,7 @@ [Components] > > 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 > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 02308c01c5..993da3197c 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -517,6 +517,7 @@ [PcdsFixedAtBuild.X64] > > # IRQs 5, 9, 10, 11 are level-triggered > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > > # Point to the MdeModulePkg/Application/UiApp/UiApp.inf > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, > 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > @@ -672,6 +673,7 @@ [Components.X64] > > 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 > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index 505a46bb0b..65aab4f711 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -516,6 +516,7 @@ [PcdsFixedAtBuild] > > # IRQs 5, 9, 10, 11 are level-triggered > gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20 > > # Point to the MdeModulePkg/Application/UiApp/UiApp.inf > gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, > 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 } > @@ -670,6 +671,7 @@ [Components] > > 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 > diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.inf > b/OvmfPkg/8259InterruptControllerDxe/8259.inf > index 530596a36c..7320ff2490 100644 > --- a/OvmfPkg/8259InterruptControllerDxe/8259.inf > +++ b/OvmfPkg/8259InterruptControllerDxe/8259.inf > @@ -1,7 +1,7 @@ > ## @file > # 8259 Interrupt Controller driver that provides Legacy 8259 protocol. > # > -# Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR> > # SPDX-License-Identifier: BSD-2-Clause-Patent > # > ## > @@ -10,7 +10,7 @@ [Defines] > INF_VERSION = 0x00010005 > BASE_NAME = Legacy8259 > MODULE_UNI_FILE = Legacy8259.uni > - FILE_GUID = 79CA4208-BBA1-4a9a-8456-E1E66A81484E > + FILE_GUID = 245CB4DA-8E15-4A1B-87E3-9878FFA07520 > MODULE_TYPE = DXE_DRIVER > VERSION_STRING = 1.0 > ENTRY_POINT = Install8259 > @@ -21,8 +21,7 @@ [Sources] > > [Packages] > MdePkg/MdePkg.dec > - IntelFrameworkPkg/IntelFrameworkPkg.dec > - PcAtChipsetPkg/PcAtChipsetPkg.dec > + OvmfPkg/OvmfPkg.dec > > [LibraryClasses] > UefiBootServicesTableLib > @@ -36,8 +35,8 @@ [Protocols] > gEfiPciIoProtocolGuid ## SOMETIMES_CONSUMES > > [Pcd] > - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeMask ## CONSUMES > - gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel ## CONSUMES > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeMask ## CONSUMES > + gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel ## CONSUMES > > [Depex] > TRUE > diff --git a/OvmfPkg/8259InterruptControllerDxe/8259.h > b/OvmfPkg/8259InterruptControllerDxe/8259.h > index a874e11fb4..a9673f9c87 100644 > --- a/OvmfPkg/8259InterruptControllerDxe/8259.h > +++ b/OvmfPkg/8259InterruptControllerDxe/8259.h > @@ -1,7 +1,7 @@ > /** @file > Driver implementing the Tiano Legacy 8259 Protocol > > -Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR> > +Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR> > SPDX-License-Identifier: BSD-2-Clause-Patent > > **/ > @@ -9,8 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #ifndef _8259_H__ > #define _8259_H__ > > -#include <FrameworkDxe.h> > - > #include <Protocol/Legacy8259.h> > #include <Protocol/PciIo.h> > >
Thanks for the commit message update, patch looks good. Laszlo -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38821): https://edk2.groups.io/g/devel/message/38821 Mute This Topic: https://groups.io/mt/31014309/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
