Relocate VirtioFdtDxe to OvmfPkg/Fdt, this driver 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}/VirtioFdtDxe/VirtioFdtDxe.inf | 3 +-- {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c | 1 + 9 files changed, 9 insertions(+), 9 deletions(-) rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf (87%) rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c (95%) diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index 973bf811b7..2cdd6f7fe1 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -293,7 +293,7 @@ # # Platform Driver # - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index c135cdd2a2..1c5bcd522d 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -292,7 +292,7 @@ # Platform Driver # ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index bc8b61a13c..f7d50657eb 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -404,7 +404,7 @@ # # Platform Driver # - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 008ff2c89d..4465abd8ab 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -340,7 +340,7 @@ # # Platform Driver # - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf OvmfPkg/VirtioBlkDxe/VirtioBlk.inf diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf index e3e5e10169..90ef02c55d 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.fdf +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf @@ -106,7 +106,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index cd2cbd3d4b..b1067d1e0d 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -120,7 +120,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 164aedec8c..36edc68948 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -41,7 +41,7 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf similarity index 87% rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf index 7d1a93f305..cc311659e7 100644 --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf +++ b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf @@ -2,7 +2,7 @@ # Virtio FDT client protocol driver for virtio,mmio DT node # # Copyright (c) 2014 - 2016, Linaro Ltd. All rights reserved.<BR> -# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR> # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -21,7 +21,6 @@ VirtioFdtDxe.c [Packages] - ArmVirtPkg/ArmVirtPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec OvmfPkg/OvmfPkg.dec diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c similarity index 95% rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c index 9625693b15..2260e44278 100644 --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c +++ b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c @@ -2,6 +2,7 @@ * Virtio FDT client protocol driver for virtio,mmio DT node * * Copyright (c) 2014 - 2016, Linaro Ltd. All rights reserved.<BR> +* (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 (#81180): https://edk2.groups.io/g/devel/message/81180 Mute This Topic: https://groups.io/mt/85902627/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
