mirror of https://github.com/acidanthera/audk.git
OvmfPkg/8259InterruptControllerDxe: Update to make it build for OVMF
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.justen@intel.com> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Ray Ni <ray.ni@intel.com> Signed-off-by: Hao Wu <hao.a.wu@intel.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
parent
460ffed242
commit
c01852433f
|
@ -1,7 +1,7 @@
|
||||||
/** @file
|
/** @file
|
||||||
Driver implementing the Tiano Legacy 8259 Protocol
|
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
|
SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||||
|
|
||||||
**/
|
**/
|
||||||
|
@ -9,8 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||||
#ifndef _8259_H__
|
#ifndef _8259_H__
|
||||||
#define _8259_H__
|
#define _8259_H__
|
||||||
|
|
||||||
#include <FrameworkDxe.h>
|
|
||||||
|
|
||||||
#include <Protocol/Legacy8259.h>
|
#include <Protocol/Legacy8259.h>
|
||||||
#include <Protocol/PciIo.h>
|
#include <Protocol/PciIo.h>
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
## @file
|
## @file
|
||||||
# 8259 Interrupt Controller driver that provides Legacy 8259 protocol.
|
# 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
|
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
||||||
#
|
#
|
||||||
##
|
##
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
INF_VERSION = 0x00010005
|
INF_VERSION = 0x00010005
|
||||||
BASE_NAME = Legacy8259
|
BASE_NAME = Legacy8259
|
||||||
MODULE_UNI_FILE = Legacy8259.uni
|
MODULE_UNI_FILE = Legacy8259.uni
|
||||||
FILE_GUID = 79CA4208-BBA1-4a9a-8456-E1E66A81484E
|
FILE_GUID = 245CB4DA-8E15-4A1B-87E3-9878FFA07520
|
||||||
MODULE_TYPE = DXE_DRIVER
|
MODULE_TYPE = DXE_DRIVER
|
||||||
VERSION_STRING = 1.0
|
VERSION_STRING = 1.0
|
||||||
ENTRY_POINT = Install8259
|
ENTRY_POINT = Install8259
|
||||||
|
@ -21,8 +21,7 @@
|
||||||
|
|
||||||
[Packages]
|
[Packages]
|
||||||
MdePkg/MdePkg.dec
|
MdePkg/MdePkg.dec
|
||||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
OvmfPkg/OvmfPkg.dec
|
||||||
PcAtChipsetPkg/PcAtChipsetPkg.dec
|
|
||||||
|
|
||||||
[LibraryClasses]
|
[LibraryClasses]
|
||||||
UefiBootServicesTableLib
|
UefiBootServicesTableLib
|
||||||
|
@ -36,8 +35,8 @@
|
||||||
gEfiPciIoProtocolGuid ## SOMETIMES_CONSUMES
|
gEfiPciIoProtocolGuid ## SOMETIMES_CONSUMES
|
||||||
|
|
||||||
[Pcd]
|
[Pcd]
|
||||||
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeMask ## CONSUMES
|
gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeMask ## CONSUMES
|
||||||
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel ## CONSUMES
|
gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel ## CONSUMES
|
||||||
|
|
||||||
[Depex]
|
[Depex]
|
||||||
TRUE
|
TRUE
|
||||||
|
|
|
@ -511,6 +511,7 @@
|
||||||
|
|
||||||
# IRQs 5, 9, 10, 11 are level-triggered
|
# IRQs 5, 9, 10, 11 are level-triggered
|
||||||
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
||||||
|
gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
||||||
|
|
||||||
# Point to the MdeModulePkg/Application/UiApp/UiApp.inf
|
# 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 }
|
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
|
||||||
|
@ -663,6 +664,7 @@
|
||||||
|
|
||||||
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
||||||
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
||||||
|
OvmfPkg/8259InterruptControllerDxe/8259.inf
|
||||||
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
||||||
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||||
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
|
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
|
||||||
|
|
|
@ -517,6 +517,7 @@
|
||||||
|
|
||||||
# IRQs 5, 9, 10, 11 are level-triggered
|
# IRQs 5, 9, 10, 11 are level-triggered
|
||||||
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
||||||
|
gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
||||||
|
|
||||||
# Point to the MdeModulePkg/Application/UiApp/UiApp.inf
|
# 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 }
|
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
|
||||||
|
@ -672,6 +673,7 @@
|
||||||
|
|
||||||
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
||||||
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
||||||
|
OvmfPkg/8259InterruptControllerDxe/8259.inf
|
||||||
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
||||||
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||||
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
|
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
|
||||||
|
|
|
@ -516,6 +516,7 @@
|
||||||
|
|
||||||
# IRQs 5, 9, 10, 11 are level-triggered
|
# IRQs 5, 9, 10, 11 are level-triggered
|
||||||
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
gPcAtChipsetPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
||||||
|
gUefiOvmfPkgTokenSpaceGuid.Pcd8259LegacyModeEdgeLevel|0x0E20
|
||||||
|
|
||||||
# Point to the MdeModulePkg/Application/UiApp/UiApp.inf
|
# 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 }
|
gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
|
||||||
|
@ -670,6 +671,7 @@
|
||||||
|
|
||||||
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
||||||
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf
|
||||||
|
OvmfPkg/8259InterruptControllerDxe/8259.inf
|
||||||
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
||||||
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
||||||
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
|
PcAtChipsetPkg/8254TimerDxe/8254Timer.inf
|
||||||
|
|
Loading…
Reference in New Issue