> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of
> Laszlo Ersek
> Sent: Wednesday, April 03, 2019 8:47 PM
> To: Wu, Hao A; edk2-de...@lists.01.org
> Cc: Justen, Jordan L; David Woodhouse
> Subject: Re: [edk2] [RFC PATCH v1 4/8] OvmfPkg/8259InterruptControllerDxe:
> Update to make it build for OVMF
>
> On 04/03/19 09:00, Hao Wu 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.
>
> (1) This patch is really well done, but we need an extra hint here, in
> the last paragraph of the commit message, namely that the DSC and FDF
> files will get a final update (= removals) later in this series.
Agree. I will update the log message to reflect this.
Best Regards,
Hao Wu
>
> With that spelled out:
>
> Reviewed-by: Laszlo Ersek <ler...@redhat.com>
>
> Thanks
> Laszlo
>
> >
> > Cc: Jordan Justen <jordan.l.jus...@intel.com>
> > Cc: Laszlo Ersek <ler...@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
> > Cc: David Woodhouse <dw...@infradead.org>
> > Cc: Ray Ni <ray...@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Hao Wu <hao.a...@intel.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 f55ab5a3d2..47182f0cad 100644
> > --- a/OvmfPkg/OvmfPkgIa32.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32.dsc
> > @@ -517,6 +517,7 @@
> >
> > # 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 }
> > @@ -669,6 +670,7 @@
> >
> > 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 5c9bdf034e..d9603a7107 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> > @@ -523,6 +523,7 @@
> >
> > # 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 }
> > @@ -678,6 +679,7 @@
> >
> > 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 2943e9e8af..2cc39d54b0 100644
> > --- a/OvmfPkg/OvmfPkgX64.dsc
> > +++ b/OvmfPkg/OvmfPkgX64.dsc
> > @@ -522,6 +522,7 @@
> >
> > # 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 }
> > @@ -676,6 +677,7 @@
> >
> > 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 1d9be675e3..c5a1385418 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>
> > # This program and the accompanying materials
> > # are licensed and made available under the terms and conditions of the
> BSD License
> > # which accompanies this distribution. The full text of the license may be
> found at
> > @@ -16,7 +16,7 @@
> > 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
> > @@ -27,8 +27,7 @@
> >
> > [Packages]
> > MdePkg/MdePkg.dec
> > - IntelFrameworkPkg/IntelFrameworkPkg.dec
> > - PcAtChipsetPkg/PcAtChipsetPkg.dec
> > + OvmfPkg/OvmfPkg.dec
> >
> > [LibraryClasses]
> > UefiBootServicesTableLib
> > @@ -42,8 +41,8 @@
> > 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 0d4c1e8223..80a4e23959 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>
> > This program and the accompanying materials
> > are licensed and made available under the terms and conditions of the BSD
> License
> > which accompanies this distribution. The full text of the license may be
> found at
> > @@ -15,8 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
> > #ifndef _8259_H__
> > #define _8259_H__
> >
> > -#include <FrameworkDxe.h>
> > -
> > #include <Protocol/Legacy8259.h>
> > #include <Protocol/PciIo.h>
> >
> >
>
> _______________________________________________
> edk2-devel mailing list
> edk2-de...@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#24): https://edk2.groups.io/g/devel/message/24
Mute This Topic: https://groups.io/mt/30892961/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
