The comments at the top of the files in HighMemDxe.{c,inf} say it's for ARM VMs.
We should add RISC-V there, too.
On 9/28/21 16:31, Abner Chang wrote:
> Relocate HighMemDxe to OvmfPkg/Fdt, this library is leverage by
> both ARM and RISC-V archs.
>
> Signed-off-by: Abner Chang <abner.ch...@hpe.com>
> Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>
> Cc: Leif Lindholm <l...@nuviainc.com>
> Cc: Sami Mujawar <sami.muja...@arm.com>
> Cc: Jiewen Yao <jiewen....@intel.com>
> Cc: Jordan Justen <jordan.l.jus...@intel.com>
> Cc: Gerd Hoffmann <kra...@redhat.com>
> Cc: Daniel Schaefer <daniel.schae...@hpe.com>
> Cc: Sunil V L <suni...@ventanamicro.com>
> ---
> 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 | 0
> 9 files changed, 8 insertions(+), 9 deletions(-)
> rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf (91%)
> rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c (100%)
>
> diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
> index 2928b9adb5..4470fa3b14 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.dsc
> +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
> @@ -294,7 +294,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 3cc182545c..97fc98d778 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.dsc
> +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
> @@ -293,7 +293,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 85fcf5f310..07f9699c79 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -405,7 +405,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 909968d13a..cf7a2b4463 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -341,7 +341,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 1bb452ebb8..7ecf5ca88d 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.fdf
> +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
> @@ -107,7 +107,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 1dac8b7880..0535d36b7d 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.fdf
> +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf
> @@ -122,7 +122,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 e9518dd273..279b905edd 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -42,7 +42,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 168fc90d2a..45779a2d59 100644
> --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> +++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf
> @@ -23,8 +23,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 100%
> rename from ArmVirtPkg/HighMemDxe/HighMemDxe.c
> rename to OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#81240): https://edk2.groups.io/g/devel/message/81240
Mute This Topic: https://groups.io/mt/85920586/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
