2020-07-13 07:41:31 +02:00
|
|
|
## @file
|
|
|
|
|
# OVMF ACPI Platform Driver
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2020, Rebecca Cran <rebecca@bsdio.com>
|
|
|
|
|
# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>
|
|
|
|
|
#
|
|
|
|
|
# SPDX-License-Identifier: BSD-2-Clause-Patent
|
|
|
|
|
##
|
|
|
|
|
|
|
|
|
|
[Defines]
|
2020-11-30 06:34:12 +01:00
|
|
|
INF_VERSION = 1.29
|
2020-07-13 07:41:31 +02:00
|
|
|
BASE_NAME = AcpiPlatform
|
|
|
|
|
FILE_GUID = D5F92408-BAB5-44CA-8A60-C212F01D7E9D
|
|
|
|
|
MODULE_TYPE = DXE_DRIVER
|
|
|
|
|
VERSION_STRING = 1.0
|
|
|
|
|
ENTRY_POINT = AcpiPlatformEntryPoint
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# The following information is for reference only and not required by the build tools.
|
|
|
|
|
#
|
|
|
|
|
# VALID_ARCHITECTURES = IA32 X64 EBC
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
[Sources]
|
|
|
|
|
AcpiPlatform.c
|
|
|
|
|
AcpiPlatform.h
|
2020-11-30 06:34:12 +01:00
|
|
|
Bhyve.c
|
2020-07-13 07:41:31 +02:00
|
|
|
EntryPoint.c
|
|
|
|
|
|
|
|
|
|
[Packages]
|
|
|
|
|
MdePkg/MdePkg.dec
|
|
|
|
|
MdeModulePkg/MdeModulePkg.dec
|
OvmfPkg: fix DEC spec violation introduced by Bhyve addition
Sean reports that having two DEC files under OvmfPkg violates the DEC
spec:
> An EDK II Package (directory) is a directory that contains an EDK II
> package declaration (DEC) file. Only one DEC file is permitted per
> directory. EDK II Packages cannot be nested within other EDK II
> Packages.
This issue originates from commit 656419f922c0 ("Add BhyvePkg, to support
the bhyve hypervisor", 2020-07-31).
Remedy the problem as follows. (Note that these steps are not split to
multiple patches in order to keep Bhyve buildable across the transition.)
(1) Delete "OvmfPkg/Bhyve/BhyvePkg.dec".
(2) Point the [Packages] sections of the Bhyve-specific AcpiPlatformDxe,
BhyveRfbDxe, and BhyveFwCtlLib INF files to "OvmfPkg.dec".
(3) Migrate the artifacts that "BhyvePkg.dec" used to have on top of
"OvmfPkg.dec" as follows:
(3a) Merge the copyright notices from Rebecca Cran and Pluribus Networks
into "OvmfPkg.dec".
(3b) Merge the "BhyveFwCtlLib" class header definition into "OvmfPkg.dec".
(3c) Merge value 0x2F8 for the fixed PcdDebugIoPort into
"BhyvePkgX64.dsc".
(4) Unnest the the Include/Library/ and Library/ subtrees from under
OvmfPkg/Bhyve to the corresponding, preexistent subtrees in OvmfPkg.
The goal is to keep the [Includes] section in the "OvmfPkg.dec" file
unchanged, plus simplify references in "BhyvePkgX64.dsc". Non-library
modules remain under "OvmfPkg/Bhyve/".
(4a) The BhyveFwCtlLib class header, and sole instance, are already
uniquely named, so their movements need not involve file renames.
(4b) Rename the Bhyve-specific PlatformBootManagerLib instance to
PlatformBootManagerLibBhyve, in additon to moving it, for
distinguishing it from OvmfPkg's preexistent lib instance. Apply the
name change to all three of the lib instance directory name, the INF
file, and the BASE_NAME define in the INF file.
(4c) Update lib class resolutions in "BhyvePkgX64.dsc" accordingly.
(5) Replace the "ACPI table storage" FILE_GUID in
"OvmfPkg/Bhyve/AcpiTables/AcpiTables.inf" with a new GUID, and
open-code the "ACPI table storage" GUID in the "ACPITABLE" FDF rule
instead, replacing $(NAMED_GUID). This step is necessary because CI
requires unique FILE_GUIDs over all INF files, and OVMF's original
"AcpiTables.inf" already uses the "ACPI table storage" GUID as
FILE_GUID.
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Cc: Sean Brogan <spbrogan@outlook.com>
Fixes: 656419f922c047a3c48bd3f4ecea7d8e87d0b761
Reported-by: Sean Brogan <spbrogan@outlook.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200801155024.16439-1-lersek@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
2020-08-01 17:50:24 +02:00
|
|
|
OvmfPkg/OvmfPkg.dec
|
2020-07-13 07:41:31 +02:00
|
|
|
UefiCpuPkg/UefiCpuPkg.dec
|
|
|
|
|
|
|
|
|
|
[LibraryClasses]
|
2023-06-06 11:21:39 +02:00
|
|
|
AcpiPlatformLib
|
2020-11-30 06:34:12 +01:00
|
|
|
BaseLib
|
2020-07-13 07:41:31 +02:00
|
|
|
BaseMemoryLib
|
|
|
|
|
BhyveFwCtlLib
|
2020-11-30 06:34:12 +01:00
|
|
|
DebugLib
|
2020-07-13 07:41:31 +02:00
|
|
|
DxeServicesTableLib
|
2020-11-30 06:34:12 +01:00
|
|
|
MemoryAllocationLib
|
2020-07-13 07:41:31 +02:00
|
|
|
OrderedCollectionLib
|
2020-11-30 06:34:12 +01:00
|
|
|
PcdLib
|
2021-10-13 11:19:36 +02:00
|
|
|
QemuFwCfgLib
|
2020-11-30 06:34:12 +01:00
|
|
|
UefiBootServicesTableLib
|
|
|
|
|
UefiDriverEntryPoint
|
|
|
|
|
UefiLib
|
2020-07-13 07:41:31 +02:00
|
|
|
|
|
|
|
|
[Protocols]
|
|
|
|
|
gEfiAcpiTableProtocolGuid # PROTOCOL ALWAYS_CONSUMED
|
|
|
|
|
gEfiFirmwareVolume2ProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
|
|
|
|
|
gEfiPciIoProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
|
|
|
|
|
|
|
|
|
|
[Guids]
|
|
|
|
|
gRootBridgesConnectedEventGroupGuid
|
|
|
|
|
|
|
|
|
|
[Pcd]
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile
|
|
|
|
|
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
|
|
|
|
gUefiCpuPkgTokenSpaceGuid.PcdCpuLocalApicBaseAddress
|
|
|
|
|
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress
|
|
|
|
|
|
|
|
|
|
[Depex]
|
|
|
|
|
gEfiAcpiTableProtocolGuid
|
