Relocate HighMemDxe to OvmfPkg/Fdt, this library is leverage by both ARM and RISC-V archs.
Signed-off-by: Abner Chang <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Leif Lindholm <[email protected]> Cc: Sami Mujawar <[email protected]> Cc: Jiewen Yao <[email protected]> Cc: Jordan Justen <[email protected]> Cc: Gerd Hoffmann <[email protected]> Cc: Daniel Schaefer <[email protected]> Cc: Sunil V L <[email protected]> --- ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- ArmVirtPkg/ArmVirtQemu.dsc | 2 +- ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- ArmVirtPkg/ArmVirtCloudHv.fdf | 2 +- ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf | 3 +-- {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c | 1 + 9 files changed, 9 insertions(+), 9 deletions(-) rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf (91%) rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c (95%) diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index d8b3ad8d73..c7515ed69b 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -295,7 +295,7 @@ # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 16c695e3ea..a9716fa7b9 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -294,7 +294,7 @@ ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 0fde1368e9..e2d3d10997 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -406,7 +406,7 @@ # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 0cdd4a19eb..fa63978f24 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -342,7 +342,7 @@ # ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - ArmVirtPkg/HighMemDxe/HighMemDxe.inf + OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioNetDxe/VirtioNet.inf diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf index 899ec3e7f6..e3e5e10169 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.fdf +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf @@ -108,7 +108,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index 70299e42f6..cd2cbd3d4b 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -123,7 +123,7 @@ READ_LOCK_STATUS = TRUE INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 0853d43519..164aedec8c 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -43,7 +43,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf - INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf + INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf similarity index 91% rename from ArmVirtPkg/HighMemDxe/HighMemDxe.inf rename to OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf index 3633a42d47..88d5371932 100644 --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf +++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf @@ -24,8 +24,7 @@ EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - ArmPkg/ArmPkg.dec - ArmVirtPkg/ArmVirtPkg.dec + OvmfPkg/OvmfPkg.dec [LibraryClasses] BaseLib diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.c b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c similarity index 95% rename from ArmVirtPkg/HighMemDxe/HighMemDxe.c rename to OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c index c383757364..92f3eda533 100644 --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.c +++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c @@ -2,6 +2,7 @@ * High memory node enumeration DXE driver for ARM Virtual Machines * * Copyright (c) 2015-2016, Linaro Ltd. All rights reserved. +* (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR> * * SPDX-License-Identifier: BSD-2-Clause-Patent * -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81183): https://edk2.groups.io/g/devel/message/81183 Mute This Topic: https://groups.io/mt/85902893/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
