public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg
@ 2021-09-27 14:03 Abner Chang
  2021-09-27 14:03 ` [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg Abner Chang
                   ` (7 more replies)
  0 siblings, 8 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Jiewen Yao,
	Jordan Justen, Gerd Hoffmann, Daniel Schaefer, Sunil V L,
	Liming Gao, Zhiguang Liu, Michael D Kinney

This pacthes set is to migrate some modules from ArmVirtPkg
to under OvmfPkg for the upcoming RiscVVirtPkg that can leverage
those modules without the dependency with Arm*Pkg.

The modules moved from ArmVirtPkg to OvmfPkg are,
- FdtClientDxe
- PciPcdProducerLib
- HighMemDxe
- QemuFwCfgLib
- FdtPciHostBridgeLib
- VirtioFdtDxe

Below PCDs are moved to under MdePkg and leverage by RiscVVirtPkg.
This change also remove the dependency on ArmPkg of OvmfPkg.
- PcdPciIoTranslation
- PcdPciIoTranslation
- PcdPciMmio32(64)Translation

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>

Abner Chang (9):
  ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg
  MdePkg: Add PcdPciIoTranslation PCD
  ArmPkg: Use PcdPciIoTranslation PCD from MdePkg
  ArmVirtPkg/FdtPciPcdProducerLib: Relocate PciPcdProducerLib to OvmfPkg
  ArmVirtPkg/HighMemDxe: Relocate HighMemDxe to OvmfPkg
  ArmVirtPkg/QemuFwCfgLib: Relocate QemuFwCfgLib to OvmfPkg
  MdePkg: Add PcdPciMmio32(64)Translation PCDs
  ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to
    OvmfPkg/Fdt
  ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe to OvmfPkg/Fdt

 ArmPkg/ArmPkg.dec                             | 16 +++++++-------
 ArmVirtPkg/ArmVirtPkg.dec                     |  4 +---
 EmbeddedPkg/EmbeddedPkg.dec                   |  2 ++
 MdePkg/MdePkg.dec                             | 12 +++++++++++
 ArmVirtPkg/ArmVirtCloudHv.dsc                 | 19 +++++++++--------
 ArmVirtPkg/ArmVirtKvmTool.dsc                 | 19 +++++++++--------
 ArmVirtPkg/ArmVirtQemu.dsc                    | 21 ++++++++++---------
 ArmVirtPkg/ArmVirtQemuKernel.dsc              | 21 ++++++++++---------
 ArmVirtPkg/ArmVirtXen.dsc                     |  3 ++-
 EmbeddedPkg/EmbeddedPkg.dsc                   |  2 ++
 ArmVirtPkg/ArmVirtCloudHv.fdf                 |  7 ++++---
 ArmVirtPkg/ArmVirtKvmTool.fdf                 |  7 ++++---
 ArmVirtPkg/ArmVirtXen.fdf                     |  3 ++-
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc          |  7 ++++---
 .../ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf       |  3 ++-
 .../ArmVirtGicArchLib/ArmVirtGicArchLib.inf   |  2 ++
 .../ArmVirtPL031FdtClientLib.inf              |  2 ++
 .../ArmVirtPsciResetSystemLib.inf             |  2 ++
 .../ArmVirtTimerFdtClientLib.inf              |  2 ++
 .../KvmtoolRtcFdtClientLib.inf                |  2 ++
 .../NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf |  3 +++
 .../NorFlashQemuLib/NorFlashQemuLib.inf       |  2 ++
 .../XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf |  2 ++
 ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf        |  2 ++
 .../Drivers}/FdtClientDxe/FdtClientDxe.inf    |  2 +-
 .../FdtPciHostBridgeLib.inf                   | 12 +++++------
 .../FdtPciPcdProducerLib.inf                  |  6 +++---
 .../Fdt}/HighMemDxe/HighMemDxe.inf            |  5 +++--
 .../Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf        |  3 ++-
 .../Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf |  7 ++++---
 .../Include/Protocol/FdtClient.h              |  0
 .../Drivers}/FdtClientDxe/FdtClientDxe.c      |  0
 .../FdtPciHostBridgeLib/FdtPciHostBridgeLib.c |  0
 .../FdtPciPcdProducerLib.c                    |  1 +
 .../Fdt}/HighMemDxe/HighMemDxe.c              |  1 +
 .../Fdt}/VirtioFdtDxe/VirtioFdtDxe.c          |  1 +
 .../Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c   |  7 ++++---
 Maintainers.txt                               |  6 ++++++
 38 files changed, 135 insertions(+), 81 deletions(-)
 rename {ArmVirtPkg => EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.inf (88%)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf (73%)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf (83%)
 rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.inf (85%)
 rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf (87%)
 rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf => OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf (81%)
 rename {ArmVirtPkg => EmbeddedPkg}/Include/Protocol/FdtClient.h (100%)
 rename {ArmVirtPkg => EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.c (100%)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c (100%)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c (95%)
 rename {ArmVirtPkg => OvmfPkg/Fdt}/HighMemDxe/HighMemDxe.c (95%)
 rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c (95%)
 rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c => OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c (93%)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  2021-09-27 20:27   ` Ard Biesheuvel
  2021-09-27 14:03 ` [PATCH 2/9] MdePkg: Add PcdPciIoTranslation PCD Abner Chang
                   ` (6 subsequent siblings)
  7 siblings, 1 reply; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Gerd Hoffmann,
	Daniel Schaefer, Sunil V L

This is one of the series patches to restructure the location of modules under
ArmVirtPkg for RiscVVirtPkg. RiscVVirtPkg leverage FDT Client protocol to
parse FDT nodes.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 ArmVirtPkg/ArmVirtPkg.dec                                     | 4 +---
 EmbeddedPkg/EmbeddedPkg.dec                                   | 2 ++
 ArmVirtPkg/ArmVirtCloudHv.dsc                                 | 3 ++-
 ArmVirtPkg/ArmVirtKvmTool.dsc                                 | 3 ++-
 ArmVirtPkg/ArmVirtQemu.dsc                                    | 3 ++-
 ArmVirtPkg/ArmVirtQemuKernel.dsc                              | 3 ++-
 ArmVirtPkg/ArmVirtXen.dsc                                     | 3 ++-
 EmbeddedPkg/EmbeddedPkg.dsc                                   | 2 ++
 ArmVirtPkg/ArmVirtCloudHv.fdf                                 | 3 ++-
 ArmVirtPkg/ArmVirtKvmTool.fdf                                 | 3 ++-
 ArmVirtPkg/ArmVirtXen.fdf                                     | 3 ++-
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc                          | 3 ++-
 ArmVirtPkg/HighMemDxe/HighMemDxe.inf                          | 2 ++
 ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf    | 2 ++
 .../ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf     | 2 ++
 .../ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf   | 2 ++
 .../ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf     | 2 ++
 .../Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf       | 2 ++
 .../Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf     | 2 ++
 .../Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf | 2 ++
 ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf  | 3 +++
 ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf        | 2 ++
 ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf              | 2 ++
 ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf                      | 2 ++
 ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf          | 2 ++
 ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf                        | 2 ++
 .../Drivers}/FdtClientDxe/FdtClientDxe.inf                    | 2 +-
 {ArmVirtPkg => EmbeddedPkg}/Include/Protocol/FdtClient.h      | 0
 .../Drivers}/FdtClientDxe/FdtClientDxe.c                      | 0
 29 files changed, 53 insertions(+), 13 deletions(-)
 rename {ArmVirtPkg => EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.inf (88%)
 rename {ArmVirtPkg => EmbeddedPkg}/Include/Protocol/FdtClient.h (100%)
 rename {ArmVirtPkg => EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.c (100%)

diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
index 4e4d758015..f5d34283b9 100644
--- a/ArmVirtPkg/ArmVirtPkg.dec
+++ b/ArmVirtPkg/ArmVirtPkg.dec
@@ -2,6 +2,7 @@
 #
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
 #  Copyright (c) 2020, ARM Limited. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -35,9 +36,6 @@
 
   gArmVirtVariableGuid   = { 0x50bea1e5, 0xa2c5, 0x46e9, { 0x9b, 0x3a, 0x59, 0x59, 0x65, 0x16, 0xb0, 0x0a } }
 
-[Protocols]
-  gFdtClientProtocolGuid = { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2, 0x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } }
-
 [PcdsFeatureFlag]
   #
   # Feature Flag PCD that defines whether TPM2 support is enabled
diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index 7638aaaade..932d1b6077 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -5,6 +5,7 @@
 # Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2012-2015, ARM Ltd. All rights reserved.<BR>
 # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #    SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -79,6 +80,7 @@
   gPlatformGpioProtocolGuid = { 0x52ce9845, 0x5af4, 0x43e2, {0xba, 0xfd, 0x23, 0x08, 0x12, 0x54, 0x7a, 0xc2 }}
   gPlatformVirtualKeyboardProtocolGuid = { 0x0e3606d2, 0x1dc3, 0x4e6f, { 0xbe, 0x65, 0x39, 0x49, 0x82, 0xa2, 0x65, 0x47 }}
   gAndroidBootImgProtocolGuid = { 0x9859bb19, 0x407c, 0x4f8b, {0xbc, 0xe1, 0xf8, 0xda, 0x65, 0x65, 0xf4, 0xa5 }}
+  gFdtClientProtocolGuid = { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2, 0x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } }
 
 [Ppis]
   gEdkiiEmbeddedGpioPpiGuid = { 0x21c3b115, 0x4e0b, 0x470c, { 0x85, 0xc7, 0xe1, 0x05, 0xa5, 0x75, 0xc9, 0x7b }}
diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index f292ba6079..9e0dd6df0b 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -1,5 +1,6 @@
 #
 #  Copyright (c) 2021, ARM Limited. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -293,7 +294,7 @@
   # Platform Driver
   #
   ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
-  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
   ArmVirtPkg/HighMemDxe/HighMemDxe.inf
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 3bd1cc72a1..7587fd4ca0 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -2,6 +2,7 @@
 #  Workspace file for KVMTool virtual platform.
 #
 #  Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -292,7 +293,7 @@
   #
   ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf
   ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
-  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
   ArmVirtPkg/HighMemDxe/HighMemDxe.inf
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 97539edef7..4e39307e7c 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -2,6 +2,7 @@
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
 #  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -404,7 +405,7 @@
   # Platform Driver
   #
   ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
-  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
   ArmVirtPkg/HighMemDxe/HighMemDxe.inf
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 28064199c8..f1bb1cd09e 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -2,6 +2,7 @@
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
 #  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -340,7 +341,7 @@
   # Platform Driver
   #
   ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
-  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
   ArmVirtPkg/HighMemDxe/HighMemDxe.inf
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 2b07a5ba19..9176ce6a44 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -2,6 +2,7 @@
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
 #  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -196,7 +197,7 @@
   # Platform Driver
   #
   ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
-  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
 
   #
   # FAT filesystem + GPT/MBR partitioning + UDF filesystem
diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index c41864e8a5..f64794b502 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -5,6 +5,7 @@
 # Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2012-2015, ARM Ltd. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #    SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -238,6 +239,7 @@
 
   EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf
   EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
+  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
 
   EmbeddedPkg/Drivers/NonCoherentIoMmuDxe/NonCoherentIoMmuDxe.inf {
     <LibraryClasses>
diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf
index 13fe8061c3..899ec3e7f6 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.fdf
+++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
@@ -1,5 +1,6 @@
 #
 #  Copyright (c) 2021, ARM Limited. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -106,7 +107,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
   INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
 
   #
diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf
index 152453dc4b..70299e42f6 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.fdf
+++ b/ArmVirtPkg/ArmVirtKvmTool.fdf
@@ -1,5 +1,6 @@
 #
 #  Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -120,7 +121,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
   INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf
   INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
 
diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 9597465cf5..a7b2d3d24d 100644
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -2,6 +2,7 @@
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
 #  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -139,7 +140,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   INF ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
 
   #
   # PI DXE Drivers producing Architectural Protocols (EFI Services)
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 26f13f6a21..0853d43519 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -2,6 +2,7 @@
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
 #  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -41,7 +42,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Core/Dxe/DxeMain.inf
   INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
-  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
   INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
 
   #
diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
index e510880b0d..3633a42d47 100644
--- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
+++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
@@ -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
 #
@@ -20,6 +21,7 @@
   HighMemDxe.c
 
 [Packages]
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   ArmPkg/ArmPkg.dec
diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
index 43fcb0b73b..f25217a1f7 100644
--- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
+++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
@@ -3,6 +3,7 @@
 #  Component description file for ArmVirtGicArchLib module
 #
 #  Copyright (c) 2015, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -30,6 +31,7 @@
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
 
 [Protocols]
diff --git a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf
index 52027d5101..e44c0d0bd3 100644
--- a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf
+++ b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf
@@ -2,6 +2,7 @@
 #  FDT client library for ARM's PL031 RTC driver
 #
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -22,6 +23,7 @@
 [Packages]
   ArmPlatformPkg/ArmPlatformPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
index 954a6ac8a6..32b63093fe 100644
--- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
+++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
@@ -3,6 +3,7 @@
 #
 # Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
 # Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -24,6 +25,7 @@
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
 
diff --git a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf
index 382e3004e1..5636e30e2a 100644
--- a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf
+++ b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf
@@ -2,6 +2,7 @@
 #  FDT client library for ARM's TimerDxe
 #
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -23,6 +24,7 @@
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
 
 [LibraryClasses]
diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
index b813a0851d..ce9890a6b6 100644
--- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
@@ -2,6 +2,7 @@
 #  PCI Host Bridge Library instance for pci-ecam-generic DT nodes
 #
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -29,6 +30,7 @@
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
index 337a5488fc..e8a4ad8253 100644
--- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
@@ -2,6 +2,7 @@
 #  FDT client library for consumers of PCI related dynamic PCDs
 #
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -22,6 +23,7 @@
 [Packages]
   ArmPkg/ArmPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
 
diff --git a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
index deb3bf635c..f174b184a9 100644
--- a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
+++ b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
@@ -2,6 +2,7 @@
 #  FDT client library for motorola,mc146818 RTC driver
 #
 #  Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -21,6 +22,7 @@
 
 [Packages]
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   PcAtChipsetPkg/PcAtChipsetPkg.dec
 
diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
index 95e4ba89a4..6f01cd7439 100644
--- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
+++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
@@ -2,6 +2,8 @@
 #  Nor Flash library for Kvmtool.
 #
 #  Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
+#
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
@@ -22,6 +24,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
index 9aad84ca6d..32018318e3 100644
--- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
+++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
@@ -3,6 +3,7 @@
 #  Component description file for NorFlashQemuLib module
 #
 #  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -24,6 +25,7 @@
   ArmPlatformPkg/ArmPlatformPkg.dec
   ArmPkg/ArmPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
index feceed5f93..74db3b01f4 100644
--- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
@@ -4,6 +4,7 @@
 #
 #  Copyright (C) 2013 - 2014, Red Hat, Inc.
 #  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -32,6 +33,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   ArmVirtPkg/ArmVirtPkg.dec
 
 [LibraryClasses]
diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
index 8fd92f17df..7d1a93f305 100644
--- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
+++ b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
@@ -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
 #
@@ -21,6 +22,7 @@
 
 [Packages]
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
 
diff --git a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
index 5881d6b515..bf57463f22 100644
--- a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
+++ b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
@@ -2,6 +2,7 @@
 #  Xen ARM ACPI Platform Driver using Xen ARM multiboot protocol
 #
 #  Copyright (C) 2016, Linaro Ltd. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -26,6 +27,7 @@
 
 [Packages]
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
diff --git a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
index 59e53cad80..a85e66ea5a 100644
--- a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
+++ b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
@@ -2,6 +2,7 @@
 #  Xenio FDT client protocol driver for xen,xen DT node
 #
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -21,6 +22,7 @@
 
 [Packages]
   ArmVirtPkg/ArmVirtPkg.dec
+  EmbeddedPkg/EmbeddedPkg.dec
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
 
diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
similarity index 88%
rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
index d7ba17a0c9..1c8311e335 100644
--- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
+++ b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
@@ -2,6 +2,7 @@
 #  FDT client driver
 #
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -19,7 +20,6 @@
   FdtClientDxe.c
 
 [Packages]
-  ArmVirtPkg/ArmVirtPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
diff --git a/ArmVirtPkg/Include/Protocol/FdtClient.h b/EmbeddedPkg/Include/Protocol/FdtClient.h
similarity index 100%
rename from ArmVirtPkg/Include/Protocol/FdtClient.h
rename to EmbeddedPkg/Include/Protocol/FdtClient.h
diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
similarity index 100%
rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/9] MdePkg: Add PcdPciIoTranslation PCD
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
  2021-09-27 14:03 ` [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  2021-09-27 14:03 ` [PATCH 3/9] ArmPkg: Use PcdPciIoTranslation PCD from MdePkg Abner Chang
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Michael D Kinney, Liming Gao, Zhiguang Liu, Ard Biesheuvel,
	Leif Lindholm, Sami Mujawar, Gerd Hoffmann, Daniel Schaefer,
	Sunil V L

This PCD is moved from ArmPkg that is used to set the base address
of PCI MMIO window that provides I/O access. We relocate this PCD
because this PCD is common to ARM and RSIC-V arch.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 MdePkg/MdePkg.dec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index a28a2daaff..08d259764a 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -2302,6 +2302,10 @@
   # @Prompt PCI Express Base Address.
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000|UINT64|0x0000000a
 
+  ## This value is used to set the base address of PCI MMIO window that provides I/O access.
+  # @Prompt PCI I/O Memory Map Window Base Address.
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0|UINT64|0x00000040
+
   ## This value is used to set the size of PCI express hierarchy. The default is 256 MB.
   # @Prompt PCI Express Base Size.
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0x10000000|UINT64|0x0000000f
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 3/9] ArmPkg: Use PcdPciIoTranslation PCD from MdePkg
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
  2021-09-27 14:03 ` [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg Abner Chang
  2021-09-27 14:03 ` [PATCH 2/9] MdePkg: Add PcdPciIoTranslation PCD Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  2021-09-27 14:03 ` [PATCH 4/9] ArmVirtPkg/FdtPciPcdProducerLib: Relocate PciPcdProducerLib to OvmfPkg Abner Chang
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Gerd Hoffmann,
	Daniel Schaefer, Sunil V L

PcdPciIoTranslation PCD is relocated to MdePkg and leveraged by
both ARM and RISC-V arch. This patch removes the one from ArmPkg
and address the corresponding changes required for other modules
under ArmVirtPkg.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 ArmPkg/ArmPkg.dec                                           | 6 +++---
 ArmVirtPkg/ArmVirtCloudHv.dsc                               | 2 +-
 ArmVirtPkg/ArmVirtKvmTool.dsc                               | 2 +-
 ArmVirtPkg/ArmVirtQemu.dsc                                  | 2 +-
 ArmVirtPkg/ArmVirtQemuKernel.dsc                            | 2 +-
 ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf          | 3 ++-
 .../Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf     | 2 +-
 .../Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf   | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 6ed51edd03..5793094fa3 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -3,6 +3,7 @@
 #
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
 # Copyright (c) 2011 - 2021, ARM Limited. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 #    SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -337,7 +338,7 @@
   #   UINT64 Mmio32CpuBase; // mapping target in 64-bit cpu-physical space
   #   UINT64 Mmio64CpuBase; // mapping target in 64-bit cpu-physical space
   #
-  #   PcdPciIoTranslation     = IoCpuBase     - PcdPciIoBase;
+  #   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation = IoCpuBase - PcdPciIoBase;
   #   PcdPciMmio32Translation = Mmio32CpuBase - (UINT64)PcdPciMmio32Base;
   #   PcdPciMmio64Translation = Mmio64CpuBase - PcdPciMmio64Base;
   #
@@ -356,7 +357,7 @@
   #   UINT64 TranslatedMmio64Address;   // output parameter
   #
   #   TranslatedIoAddress     = UntranslatedIoAddress +
-  #                             PcdPciIoTranslation;
+  #                             gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation;
   #   TranslatedMmio32Address = (UINT64)UntranslatedMmio32Address +
   #                             PcdPciMmio32Translation;
   #   TranslatedMmio64Address = UntranslatedMmio64Address +
@@ -369,7 +370,6 @@
   #
   gArmTokenSpaceGuid.PcdPciIoBase|0x0|UINT64|0x00000050
   gArmTokenSpaceGuid.PcdPciIoSize|0x0|UINT64|0x00000051
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0|UINT64|0x00000052
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x0|UINT32|0x00000053
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x0|UINT32|0x00000054
   gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000055
diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index 9e0dd6df0b..593663a6c5 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -193,7 +193,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF
 
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0
 
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0
 
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 7587fd4ca0..64cc7d7cf0 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -185,7 +185,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF
 
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0
 
   #
   # Set video resolution for boot options and for text setup.
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 4e39307e7c..04d283004e 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -248,7 +248,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF
 
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0
 
   #
   # Set video resolution for boot options and for text setup.
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index f1bb1cd09e..c2f72c4ae2 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -228,7 +228,7 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF
 
-  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0
 
   #
   # Set video resolution for boot options and for text setup.
diff --git a/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf b/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
index 2bc4571d06..3ffec4148c 100644
--- a/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
+++ b/ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf
@@ -3,6 +3,7 @@
 #
 # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -38,7 +39,7 @@
   UefiBootServicesTableLib
 
 [Pcd]
-  gArmTokenSpaceGuid.PcdPciIoTranslation
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
 
 [Protocols]
   gEfiCpuIo2ProtocolGuid                         ## PRODUCES
diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
index ce9890a6b6..c6eccdc3e3 100644
--- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
@@ -49,7 +49,7 @@
   gArmTokenSpaceGuid.PcdPciMmio64Translation
 
 [Pcd]
-  gArmTokenSpaceGuid.PcdPciIoTranslation
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
 
 [Depex]
diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
index e8a4ad8253..4520f8f433 100644
--- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
@@ -37,7 +37,7 @@
   gFdtClientProtocolGuid                                      ## CONSUMES
 
 [Pcd]
-  gArmTokenSpaceGuid.PcdPciIoTranslation                      ## PRODUCES
+  gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation                ## PRODUCES
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress           ## PRODUCES
   gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration  ## PRODUCES
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 4/9] ArmVirtPkg/FdtPciPcdProducerLib: Relocate PciPcdProducerLib to OvmfPkg
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
                   ` (2 preceding siblings ...)
  2021-09-27 14:03 ` [PATCH 3/9] ArmPkg: Use PcdPciIoTranslation PCD from MdePkg Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  2021-09-27 14:03 ` [PATCH 6/9] ArmVirtPkg/QemuFwCfgLib: Relocate QemuFwCfgLib " Abner Chang
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Jiewen Yao,
	Jordan Justen, Gerd Hoffmann, Daniel Schaefer, Sunil V L

Relocate PciPcdProducerLib to OvmfPkg/Fdt, this library is
leverage by both ARM and RISC-V archs.

Add OvmfPkg/Fdt maintainers in Maintainers.txt

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 ArmVirtPkg/ArmVirtCloudHv.dsc                             | 8 ++++----
 ArmVirtPkg/ArmVirtKvmTool.dsc                             | 8 ++++----
 ArmVirtPkg/ArmVirtQemu.dsc                                | 8 ++++----
 ArmVirtPkg/ArmVirtQemuKernel.dsc                          | 8 ++++----
 .../Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf    | 4 +---
 .../Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c      | 1 +
 Maintainers.txt                                           | 6 ++++++
 7 files changed, 24 insertions(+), 19 deletions(-)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf (87%)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c (95%)

diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index 593663a6c5..d8b3ad8d73 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -50,7 +50,7 @@
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
-  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+  PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf
@@ -342,12 +342,12 @@
   #
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
   OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
@@ -361,5 +361,5 @@
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
   ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpiPlatformDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 64cc7d7cf0..16c695e3ea 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -58,7 +58,7 @@
 
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
 
-  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+  PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf
@@ -339,17 +339,17 @@
   #
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
       NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
   }
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
       NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
   }
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
       NULL|ArmVirtPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
   }
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 04d283004e..0fde1368e9 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -78,7 +78,7 @@
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
-  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+  PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
@@ -488,12 +488,12 @@
   #
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
   OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
@@ -544,5 +544,5 @@
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index c2f72c4ae2..0cdd4a19eb 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -76,7 +76,7 @@
   FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
-  PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+  PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
   PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
@@ -424,12 +424,12 @@
   #
   ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
   MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
   OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf
@@ -460,5 +460,5 @@
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+      NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
similarity index 87%
rename from ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
rename to OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
index 4520f8f433..a6350b1485 100644
--- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
+++ b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
@@ -2,7 +2,7 @@
 #  FDT client library for consumers of PCI related dynamic PCDs
 #
 #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
-# (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,8 +21,6 @@
   FdtPciPcdProducerLib.c
 
 [Packages]
-  ArmPkg/ArmPkg.dec
-  ArmVirtPkg/ArmVirtPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
similarity index 95%
rename from ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
rename to OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
index 2520101017..f8e0a0aded 100644
--- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
+++ b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
@@ -2,6 +2,7 @@
   FDT client library for consumers of PCI related dynamic PCDs
 
   Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
diff --git a/Maintainers.txt b/Maintainers.txt
index 41f491bcae..c77b455381 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -463,6 +463,12 @@ R: Jiewen Yao <jiewen.yao@intel.com> [jyao1]
 R: Min Xu <min.m.xu@intel.com> [mxu9]
 R: Tom Lendacky <thomas.lendacky@amd.com> [tlendacky]
 
+OvmfPkg: FDT related modules
+F: OvmfPkg/Fdt/Cc: Leif Lindholm <leif@nuviainc.com>
+R: Leif Lindholm <leif@nuviainc.com>
+R: Gerd Hoffmann <kraxel@redhat.com>
+R: Abner Chang <abner.chang@hpe.com>
+
 OvmfPkg: LsiScsi driver
 F: OvmfPkg/LsiScsiDxe/
 R: Gary Lin <glin@suse.com>
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 6/9] ArmVirtPkg/QemuFwCfgLib: Relocate QemuFwCfgLib to OvmfPkg
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
                   ` (3 preceding siblings ...)
  2021-09-27 14:03 ` [PATCH 4/9] ArmVirtPkg/FdtPciPcdProducerLib: Relocate PciPcdProducerLib to OvmfPkg Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  2021-09-27 14:03 ` [PATCH 7/9] MdePkg: Add PcdPciMmio32(64)Translation PCDs Abner Chang
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Jiewen Yao,
	Jordan Justen, Gerd Hoffmann, Daniel Schaefer, Sunil V L

Relocate QemuFwCfgLib to OvmfPkg/Library/QemuFwCfgLib and rename
it to QemuFwCfgLibMMIO, this library is leverage by both ARM and
RISC-V archs.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 ArmVirtPkg/ArmVirtQemu.dsc                                 | 2 +-
 ArmVirtPkg/ArmVirtQemuKernel.dsc                           | 2 +-
 .../Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf              | 5 ++---
 .../Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c                | 7 ++++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf => OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf (88%)
 rename ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c => OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c (93%)

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index e2d3d10997..cde55af64c 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -60,7 +60,7 @@
   # Virtio Support
   VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
   VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
-  QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+  QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf
   QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf
   QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index fa63978f24..4ae5ef3172 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -58,7 +58,7 @@
   # Virtio Support
   VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
   VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
-  QemuFwCfgLib|ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+  QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf
   QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf
   QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf
diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf
similarity index 88%
rename from ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf
index 74db3b01f4..f92dcf10b7 100644
--- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.inf
@@ -24,17 +24,16 @@
 # The following information is for reference only and not required by the build
 # tools.
 #
-#  VALID_ARCHITECTURES           = ARM AARCH64
+#  VALID_ARCHITECTURES           = ARM AARCH64 RISCV64
 #
 
 [Sources]
-  QemuFwCfgLib.c
+  QemuFwCfgLibMMIO.c
 
 [Packages]
   MdePkg/MdePkg.dec
   OvmfPkg/OvmfPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
-  ArmVirtPkg/ArmVirtPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c
similarity index 93%
rename from ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c
index e2ac4108d1..b953f2eb6c 100644
--- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMMIO.c
@@ -4,6 +4,7 @@
 
   Copyright (C) 2013 - 2014, Red Hat, Inc.
   Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -239,7 +240,7 @@ MmioReadBytes (
   UINT8 *Ptr;
   UINT8 *End;
 
-#ifdef MDE_CPU_AARCH64
+#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64)
   Left = Size & 7;
 #else
   Left = Size & 3;
@@ -249,7 +250,7 @@ MmioReadBytes (
   Ptr = Buffer;
   End = Ptr + Size;
 
-#ifdef MDE_CPU_AARCH64
+#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64)
   while (Ptr < End) {
     *(UINT64 *)Ptr = MmioRead64 (mFwCfgDataAddress);
     Ptr += 8;
@@ -322,7 +323,7 @@ DmaTransferBytes (
   //
   // This will fire off the transfer.
   //
-#ifdef MDE_CPU_AARCH64
+#if defined(MDE_CPU_AARCH64) || defined(MDE_CPU_RISCV64)
   MmioWrite64 (mFwCfgDmaAddress, SwapBytes64 ((UINT64)&Access));
 #else
   MmioWrite32 ((UINT32)(mFwCfgDmaAddress + 4), SwapBytes32 ((UINT32)&Access));
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 7/9] MdePkg: Add PcdPciMmio32(64)Translation PCDs
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
                   ` (4 preceding siblings ...)
  2021-09-27 14:03 ` [PATCH 6/9] ArmVirtPkg/QemuFwCfgLib: Relocate QemuFwCfgLib " Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  2021-09-27 14:03 ` [PATCH 8/9] ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt Abner Chang
  2021-09-27 14:03 ` [PATCH 9/9] ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe " Abner Chang
  7 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Michael D Kinney, Liming Gao, Zhiguang Liu, Ard Biesheuvel,
	Leif Lindholm, Sami Mujawar, Gerd Hoffmann, Daniel Schaefer,
	Sunil V L

PcdPciMmio32Translation and PcdPciMmio64Translation PCDs are added
to MdePkg as the common PCDs for ARM and RSIC-V archs.

The one under ArmPkg is removed in the next patch.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 MdePkg/MdePkg.dec | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 08d259764a..9df95abc50 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -2306,6 +2306,14 @@
   # @Prompt PCI I/O Memory Map Window Base Address.
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation|0x0|UINT64|0x00000040
 
+  ## This value is used for the 32-bit PCI memory map I/O base address translation.
+  # @Prompt 32-bit PCI Memory Map I/O Base Address translation.
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000041
+
+  ## This value is used for the 64-bit PCI memory map I/O base address translation.
+  # @Prompt 64-bit PCI Memory Map I/O Base Address translation.
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation|0x0|UINT64|0x00000042
+
   ## This value is used to set the size of PCI express hierarchy. The default is 256 MB.
   # @Prompt PCI Express Base Size.
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0x10000000|UINT64|0x0000000f
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 8/9] ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
                   ` (5 preceding siblings ...)
  2021-09-27 14:03 ` [PATCH 7/9] MdePkg: Add PcdPciMmio32(64)Translation PCDs Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  2021-09-27 14:03 ` [PATCH 9/9] ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe " Abner Chang
  7 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Jiewen Yao,
	Jordan Justen, Gerd Hoffmann, Daniel Schaefer, Sunil V L

Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt, this library is
leverage by both ARM and RISC-V archs. Also use
PcdPciMmio32Translation and PcdPciMmio64Translation
PCDs provided by MdePkg instead of ArmPkg.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@ventanamicro.com>
---
 ArmPkg/ArmPkg.dec                                      | 10 ++++------
 ArmVirtPkg/ArmVirtCloudHv.dsc                          |  2 +-
 ArmVirtPkg/ArmVirtKvmTool.dsc                          |  2 +-
 ArmVirtPkg/ArmVirtQemu.dsc                             |  2 +-
 ArmVirtPkg/ArmVirtQemuKernel.dsc                       |  2 +-
 .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf   |  8 +++-----
 .../Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c     |  0
 7 files changed, 11 insertions(+), 15 deletions(-)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf (82%)
 rename {ArmVirtPkg/Library => OvmfPkg/Fdt}/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c (100%)

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 5793094fa3..66bfe167ca 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -339,8 +339,8 @@
   #   UINT64 Mmio64CpuBase; // mapping target in 64-bit cpu-physical space
   #
   #   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation = IoCpuBase - PcdPciIoBase;
-  #   PcdPciMmio32Translation = Mmio32CpuBase - (UINT64)PcdPciMmio32Base;
-  #   PcdPciMmio64Translation = Mmio64CpuBase - PcdPciMmio64Base;
+  #   gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation = Mmio32CpuBase - (UINT64)PcdPciMmio32Base;
+  #   gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation = Mmio64CpuBase - PcdPciMmio64Base;
   #
   # because (a) the target address space (ie. the cpu-physical space) is
   # 64-bit, and (b) the translation values are meant as offsets for *modular*
@@ -359,9 +359,9 @@
   #   TranslatedIoAddress     = UntranslatedIoAddress +
   #                             gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation;
   #   TranslatedMmio32Address = (UINT64)UntranslatedMmio32Address +
-  #                             PcdPciMmio32Translation;
+  #                             gEfiMdePkgTokenSpaceGuid..PcdPciMmio32Translation;
   #   TranslatedMmio64Address = UntranslatedMmio64Address +
-  #                             PcdPciMmio64Translation;
+  #                             gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation;
   #
   #  The modular arithmetic performed in UINT64 ensures that the translation
   #  works correctly regardless of the relation between IoCpuBase and
@@ -372,10 +372,8 @@
   gArmTokenSpaceGuid.PcdPciIoSize|0x0|UINT64|0x00000051
   gArmTokenSpaceGuid.PcdPciMmio32Base|0x0|UINT32|0x00000053
   gArmTokenSpaceGuid.PcdPciMmio32Size|0x0|UINT32|0x00000054
-  gArmTokenSpaceGuid.PcdPciMmio32Translation|0x0|UINT64|0x00000055
   gArmTokenSpaceGuid.PcdPciMmio64Base|0x0|UINT64|0x00000056
   gArmTokenSpaceGuid.PcdPciMmio64Size|0x0|UINT64|0x00000057
-  gArmTokenSpaceGuid.PcdPciMmio64Translation|0x0|UINT64|0x00000058
 
   #
   # Inclusive range of allowed PCI buses.
diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index c7515ed69b..973bf811b7 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -52,7 +52,7 @@
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
   PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
-  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf
 
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index a9716fa7b9..c135cdd2a2 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -60,7 +60,7 @@
 
   PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
-  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|ArmVirtPkg/Library/ArmVirtPciHostBridgeUtilityLib/ArmVirtPciHostBridgeUtilityLib.inf
 
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index cde55af64c..bc8b61a13c 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -80,7 +80,7 @@
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
   PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
-  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
 
 !if $(TPM2_ENABLE) == TRUE
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 4ae5ef3172..008ff2c89d 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -78,7 +78,7 @@
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf
   PciPcdProducerLib|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
-  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+  PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
   TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
 
diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
similarity index 82%
rename from ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
rename to OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
index c6eccdc3e3..0562c85f14 100644
--- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
+++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
@@ -21,15 +21,13 @@
 # The following information is for reference only and not required by the build
 # tools.
 #
-#  VALID_ARCHITECTURES           = AARCH64 ARM
+#  VALID_ARCHITECTURES           = AARCH64 ARM RISCV64
 #
 
 [Sources]
   FdtPciHostBridgeLib.c
 
 [Packages]
-  ArmPkg/ArmPkg.dec
-  ArmVirtPkg/ArmVirtPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
@@ -45,8 +43,8 @@
   PciPcdProducerLib
 
 [FixedPcd]
-  gArmTokenSpaceGuid.PcdPciMmio32Translation
-  gArmTokenSpaceGuid.PcdPciMmio64Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation
+  gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation
 
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdPciIoTranslation
diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
similarity index 100%
rename from ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
rename to OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 9/9] ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe to OvmfPkg/Fdt
  2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
                   ` (6 preceding siblings ...)
  2021-09-27 14:03 ` [PATCH 8/9] ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt Abner Chang
@ 2021-09-27 14:03 ` Abner Chang
  7 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-27 14:03 UTC (permalink / raw)
  To: devel
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Jiewen Yao,
	Jordan Justen, Gerd Hoffmann, Daniel Schaefer, Sunil V L

Relocate VirtioFdtDxe to OvmfPkg/Fdt, this driver is leverage by
both ARM and RISC-V archs.

Signed-off-by: Abner Chang <abner.chang@hpe.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
Cc: Sunil V L <sunilvl@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}/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


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg
  2021-09-27 14:03 ` [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg Abner Chang
@ 2021-09-27 20:27   ` Ard Biesheuvel
  2021-09-28  3:35     ` [edk2-devel] " Abner Chang
  0 siblings, 1 reply; 11+ messages in thread
From: Ard Biesheuvel @ 2021-09-27 20:27 UTC (permalink / raw)
  To: Abner Chang
  Cc: edk2-devel-groups-io, Ard Biesheuvel, Leif Lindholm, Sami Mujawar,
	Gerd Hoffmann, Daniel Schaefer, Sunil V L

On Mon, 27 Sept 2021 at 17:01, Abner Chang <abner.chang@hpe.com> wrote:
>
> This is one of the series patches to restructure the location of modules under
> ArmVirtPkg for RiscVVirtPkg. RiscVVirtPkg leverage FDT Client protocol to
> parse FDT nodes.
>
> Signed-off-by: Abner Chang <abner.chang@hpe.com>
> Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> Cc: Leif Lindholm <leif@nuviainc.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> Cc: Sunil V L <sunilvl@ventanamicro.com>
> ---
>  ArmVirtPkg/ArmVirtPkg.dec                                     | 4 +---
>  EmbeddedPkg/EmbeddedPkg.dec                                   | 2 ++
>  ArmVirtPkg/ArmVirtCloudHv.dsc                                 | 3 ++-
>  ArmVirtPkg/ArmVirtKvmTool.dsc                                 | 3 ++-
>  ArmVirtPkg/ArmVirtQemu.dsc                                    | 3 ++-
>  ArmVirtPkg/ArmVirtQemuKernel.dsc                              | 3 ++-
>  ArmVirtPkg/ArmVirtXen.dsc                                     | 3 ++-
>  EmbeddedPkg/EmbeddedPkg.dsc                                   | 2 ++
>  ArmVirtPkg/ArmVirtCloudHv.fdf                                 | 3 ++-
>  ArmVirtPkg/ArmVirtKvmTool.fdf                                 | 3 ++-
>  ArmVirtPkg/ArmVirtXen.fdf                                     | 3 ++-
>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc                          | 3 ++-
>  ArmVirtPkg/HighMemDxe/HighMemDxe.inf                          | 2 ++
>  ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf    | 2 ++
>  .../ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf     | 2 ++
>  .../ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf   | 2 ++
>  .../ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf     | 2 ++
>  .../Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf       | 2 ++
>  .../Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf     | 2 ++
>  .../Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf | 2 ++
>  ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf  | 3 +++
>  ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf        | 2 ++
>  ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf              | 2 ++
>  ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf                      | 2 ++
>  ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf          | 2 ++
>  ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf                        | 2 ++
>  .../Drivers}/FdtClientDxe/FdtClientDxe.inf                    | 2 +-
>  {ArmVirtPkg => EmbeddedPkg}/Include/Protocol/FdtClient.h      | 0
>  .../Drivers}/FdtClientDxe/FdtClientDxe.c                      | 0
>  29 files changed, 53 insertions(+), 13 deletions(-)
>  rename {ArmVirtPkg => EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.inf (88%)
>  rename {ArmVirtPkg => EmbeddedPkg}/Include/Protocol/FdtClient.h (100%)
>  rename {ArmVirtPkg => EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.c (100%)
>
> diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
> index 4e4d758015..f5d34283b9 100644
> --- a/ArmVirtPkg/ArmVirtPkg.dec
> +++ b/ArmVirtPkg/ArmVirtPkg.dec
> @@ -2,6 +2,7 @@
>  #
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2020, ARM Limited. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #

Please remove these bogus copyright statements. This hunk takes the
cake because it claims copyright for the lines it removes (??), but in
general, a series that claims to only move code around should not be
adding these.


>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -35,9 +36,6 @@
>
>    gArmVirtVariableGuid   = { 0x50bea1e5, 0xa2c5, 0x46e9, { 0x9b, 0x3a, 0x59, 0x59, 0x65, 0x16, 0xb0, 0x0a } }
>
> -[Protocols]
> -  gFdtClientProtocolGuid = { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2, 0x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } }
> -
>  [PcdsFeatureFlag]
>    #
>    # Feature Flag PCD that defines whether TPM2 support is enabled
> diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
> index 7638aaaade..932d1b6077 100644
> --- a/EmbeddedPkg/EmbeddedPkg.dec
> +++ b/EmbeddedPkg/EmbeddedPkg.dec
> @@ -5,6 +5,7 @@
>  # Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
>  # Copyright (c) 2012-2015, ARM Ltd. All rights reserved.<BR>
>  # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #    SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -79,6 +80,7 @@
>    gPlatformGpioProtocolGuid = { 0x52ce9845, 0x5af4, 0x43e2, {0xba, 0xfd, 0x23, 0x08, 0x12, 0x54, 0x7a, 0xc2 }}
>    gPlatformVirtualKeyboardProtocolGuid = { 0x0e3606d2, 0x1dc3, 0x4e6f, { 0xbe, 0x65, 0x39, 0x49, 0x82, 0xa2, 0x65, 0x47 }}
>    gAndroidBootImgProtocolGuid = { 0x9859bb19, 0x407c, 0x4f8b, {0xbc, 0xe1, 0xf8, 0xda, 0x65, 0x65, 0xf4, 0xa5 }}
> +  gFdtClientProtocolGuid = { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2, 0x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } }
>
>  [Ppis]
>    gEdkiiEmbeddedGpioPpiGuid = { 0x21c3b115, 0x4e0b, 0x470c, { 0x85, 0xc7, 0xe1, 0x05, 0xa5, 0x75, 0xc9, 0x7b }}
> diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
> index f292ba6079..9e0dd6df0b 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.dsc
> +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
> @@ -1,5 +1,6 @@
>  #
>  #  Copyright (c) 2021, ARM Limited. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -293,7 +294,7 @@
>    # Platform Driver
>    #
>    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
>    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
>    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
> index 3bd1cc72a1..7587fd4ca0 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.dsc
> +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
> @@ -2,6 +2,7 @@
>  #  Workspace file for KVMTool virtual platform.
>  #
>  #  Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -292,7 +293,7 @@
>    #
>    ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf
>    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
>    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
>    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 97539edef7..4e39307e7c 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -2,6 +2,7 @@
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -404,7 +405,7 @@
>    # Platform Driver
>    #
>    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
>    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
>    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index 28064199c8..f1bb1cd09e 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -2,6 +2,7 @@
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -340,7 +341,7 @@
>    # Platform Driver
>    #
>    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
>    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
>    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
> index 2b07a5ba19..9176ce6a44 100644
> --- a/ArmVirtPkg/ArmVirtXen.dsc
> +++ b/ArmVirtPkg/ArmVirtXen.dsc
> @@ -2,6 +2,7 @@
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -196,7 +197,7 @@
>    # Platform Driver
>    #
>    ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>
>    #
>    # FAT filesystem + GPT/MBR partitioning + UDF filesystem
> diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
> index c41864e8a5..f64794b502 100644
> --- a/EmbeddedPkg/EmbeddedPkg.dsc
> +++ b/EmbeddedPkg/EmbeddedPkg.dsc
> @@ -5,6 +5,7 @@
>  # Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>
>  # Copyright (c) 2012-2015, ARM Ltd. All rights reserved.<BR>
>  # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #    SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -238,6 +239,7 @@
>
>    EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf
>    EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
> +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>
>    EmbeddedPkg/Drivers/NonCoherentIoMmuDxe/NonCoherentIoMmuDxe.inf {
>      <LibraryClasses>
> diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf
> index 13fe8061c3..899ec3e7f6 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.fdf
> +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
> @@ -1,5 +1,6 @@
>  #
>  #  Copyright (c) 2021, ARM Limited. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -106,7 +107,7 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Core/Dxe/DxeMain.inf
>    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>    INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>    INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
>
>    #
> diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf
> index 152453dc4b..70299e42f6 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.fdf
> +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf
> @@ -1,5 +1,6 @@
>  #
>  #  Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -120,7 +121,7 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Core/Dxe/DxeMain.inf
>    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>    INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>    INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf
>    INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
>
> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
> index 9597465cf5..a7b2d3d24d 100644
> --- a/ArmVirtPkg/ArmVirtXen.fdf
> +++ b/ArmVirtPkg/ArmVirtXen.fdf
> @@ -2,6 +2,7 @@
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -139,7 +140,7 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Core/Dxe/DxeMain.inf
>    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>    INF ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>
>    #
>    # PI DXE Drivers producing Architectural Protocols (EFI Services)
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index 26f13f6a21..0853d43519 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -2,6 +2,7 @@
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -41,7 +42,7 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Core/Dxe/DxeMain.inf
>    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
>    INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
>    INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
>
>    #
> diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> index e510880b0d..3633a42d47 100644
> --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> +++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> @@ -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
>  #
> @@ -20,6 +21,7 @@
>    HighMemDxe.c
>
>  [Packages]
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    ArmPkg/ArmPkg.dec
> diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
> index 43fcb0b73b..f25217a1f7 100644
> --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
> +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
> @@ -3,6 +3,7 @@
>  #  Component description file for ArmVirtGicArchLib module
>  #
>  #  Copyright (c) 2015, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -30,6 +31,7 @@
>  [Packages]
>    ArmPkg/ArmPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>
>  [Protocols]
> diff --git a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf
> index 52027d5101..e44c0d0bd3 100644
> --- a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf
> +++ b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf
> @@ -2,6 +2,7 @@
>  #  FDT client library for ARM's PL031 RTC driver
>  #
>  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -22,6 +23,7 @@
>  [Packages]
>    ArmPlatformPkg/ArmPlatformPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>
>  [LibraryClasses]
> diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
> index 954a6ac8a6..32b63093fe 100644
> --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
> +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf
> @@ -3,6 +3,7 @@
>  #
>  # Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
>  # Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -24,6 +25,7 @@
>  [Packages]
>    ArmPkg/ArmPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
>
> diff --git a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf
> index 382e3004e1..5636e30e2a 100644
> --- a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf
> +++ b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf
> @@ -2,6 +2,7 @@
>  #  FDT client library for ARM's TimerDxe
>  #
>  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -23,6 +24,7 @@
>  [Packages]
>    ArmPkg/ArmPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>
>  [LibraryClasses]
> diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> index b813a0851d..ce9890a6b6 100644
> --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> +++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> @@ -2,6 +2,7 @@
>  #  PCI Host Bridge Library instance for pci-ecam-generic DT nodes
>  #
>  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -29,6 +30,7 @@
>  [Packages]
>    ArmPkg/ArmPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
>    OvmfPkg/OvmfPkg.dec
> diff --git a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> index 337a5488fc..e8a4ad8253 100644
> --- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> +++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> @@ -2,6 +2,7 @@
>  #  FDT client library for consumers of PCI related dynamic PCDs
>  #
>  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -22,6 +23,7 @@
>  [Packages]
>    ArmPkg/ArmPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
>
> diff --git a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
> index deb3bf635c..f174b184a9 100644
> --- a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
> +++ b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
> @@ -2,6 +2,7 @@
>  #  FDT client library for motorola,mc146818 RTC driver
>  #
>  #  Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -21,6 +22,7 @@
>
>  [Packages]
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>    PcAtChipsetPkg/PcAtChipsetPkg.dec
>
> diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
> index 95e4ba89a4..6f01cd7439 100644
> --- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
> +++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
> @@ -2,6 +2,8 @@
>  #  Nor Flash library for Kvmtool.
>  #
>  #  Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> +#
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> @@ -22,6 +24,7 @@
>    ArmPkg/ArmPkg.dec
>    ArmPlatformPkg/ArmPlatformPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>
> diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
> index 9aad84ca6d..32018318e3 100644
> --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
> +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
> @@ -3,6 +3,7 @@
>  #  Component description file for NorFlashQemuLib module
>  #
>  #  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -24,6 +25,7 @@
>    ArmPlatformPkg/ArmPlatformPkg.dec
>    ArmPkg/ArmPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>
>  [LibraryClasses]
>    BaseLib
> diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
> index feceed5f93..74db3b01f4 100644
> --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
> +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
> @@ -4,6 +4,7 @@
>  #
>  #  Copyright (C) 2013 - 2014, Red Hat, Inc.
>  #  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -32,6 +33,7 @@
>  [Packages]
>    MdePkg/MdePkg.dec
>    OvmfPkg/OvmfPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    ArmVirtPkg/ArmVirtPkg.dec
>
>  [LibraryClasses]
> diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> index 8fd92f17df..7d1a93f305 100644
> --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> +++ b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> @@ -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
>  #
> @@ -21,6 +22,7 @@
>
>  [Packages]
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>    OvmfPkg/OvmfPkg.dec
>
> diff --git a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
> index 5881d6b515..bf57463f22 100644
> --- a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
> +++ b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
> @@ -2,6 +2,7 @@
>  #  Xen ARM ACPI Platform Driver using Xen ARM multiboot protocol
>  #
>  #  Copyright (C) 2016, Linaro Ltd. All rights reserved.
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -26,6 +27,7 @@
>
>  [Packages]
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>
> diff --git a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> index 59e53cad80..a85e66ea5a 100644
> --- a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> +++ b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> @@ -2,6 +2,7 @@
>  #  Xenio FDT client protocol driver for xen,xen DT node
>  #
>  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -21,6 +22,7 @@
>
>  [Packages]
>    ArmVirtPkg/ArmVirtPkg.dec
> +  EmbeddedPkg/EmbeddedPkg.dec
>    MdePkg/MdePkg.dec
>    OvmfPkg/OvmfPkg.dec
>
> diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> similarity index 88%
> rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> index d7ba17a0c9..1c8311e335 100644
> --- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> +++ b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> @@ -2,6 +2,7 @@
>  #  FDT client driver
>  #
>  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -19,7 +20,6 @@
>    FdtClientDxe.c
>
>  [Packages]
> -  ArmVirtPkg/ArmVirtPkg.dec
>    EmbeddedPkg/EmbeddedPkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    MdePkg/MdePkg.dec
> diff --git a/ArmVirtPkg/Include/Protocol/FdtClient.h b/EmbeddedPkg/Include/Protocol/FdtClient.h
> similarity index 100%
> rename from ArmVirtPkg/Include/Protocol/FdtClient.h
> rename to EmbeddedPkg/Include/Protocol/FdtClient.h
> diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> similarity index 100%
> rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
> rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [edk2-devel] [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg
  2021-09-27 20:27   ` Ard Biesheuvel
@ 2021-09-28  3:35     ` Abner Chang
  0 siblings, 0 replies; 11+ messages in thread
From: Abner Chang @ 2021-09-28  3:35 UTC (permalink / raw)
  To: devel@edk2.groups.io, ardb@kernel.org
  Cc: Ard Biesheuvel, Leif Lindholm, Sami Mujawar, Gerd Hoffmann,
	Schaefer, Daniel, Sunil V L



> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Ard Biesheuvel
> Sent: Tuesday, September 28, 2021 4:27 AM
> To: Chang, Abner (HPS SW/FW Technologist) <abner.chang@hpe.com>
> Cc: edk2-devel-groups-io <devel@edk2.groups.io>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Leif Lindholm <leif@nuviainc.com>; Sami
> Mujawar <sami.mujawar@arm.com>; Gerd Hoffmann <kraxel@redhat.com>;
> Schaefer, Daniel <daniel.schaefer@hpe.com>; Sunil V L
> <sunilvl@ventanamicro.com>
> Subject: Re: [edk2-devel] [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move
> FdtClientDxe to EmbeddedPkg
> 
> On Mon, 27 Sept 2021 at 17:01, Abner Chang <abner.chang@hpe.com>
> wrote:
> >
> > This is one of the series patches to restructure the location of modules
> under
> > ArmVirtPkg for RiscVVirtPkg. RiscVVirtPkg leverage FDT Client protocol to
> > parse FDT nodes.
> >
> > Signed-off-by: Abner Chang <abner.chang@hpe.com>
> > Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
> > Cc: Leif Lindholm <leif@nuviainc.com>
> > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > Cc: Gerd Hoffmann <kraxel@redhat.com>
> > Cc: Daniel Schaefer <daniel.schaefer@hpe.com>
> > Cc: Sunil V L <sunilvl@ventanamicro.com>
> > ---
> >  ArmVirtPkg/ArmVirtPkg.dec                                     | 4 +---
> >  EmbeddedPkg/EmbeddedPkg.dec                                   | 2 ++
> >  ArmVirtPkg/ArmVirtCloudHv.dsc                                 | 3 ++-
> >  ArmVirtPkg/ArmVirtKvmTool.dsc                                 | 3 ++-
> >  ArmVirtPkg/ArmVirtQemu.dsc                                    | 3 ++-
> >  ArmVirtPkg/ArmVirtQemuKernel.dsc                              | 3 ++-
> >  ArmVirtPkg/ArmVirtXen.dsc                                     | 3 ++-
> >  EmbeddedPkg/EmbeddedPkg.dsc                                   | 2 ++
> >  ArmVirtPkg/ArmVirtCloudHv.fdf                                 | 3 ++-
> >  ArmVirtPkg/ArmVirtKvmTool.fdf                                 | 3 ++-
> >  ArmVirtPkg/ArmVirtXen.fdf                                     | 3 ++-
> >  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc                          | 3 ++-
> >  ArmVirtPkg/HighMemDxe/HighMemDxe.inf                          | 2 ++
> >  ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf    | 2 ++
> >  .../ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf     | 2 ++
> >  .../ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.inf   | 2 ++
> >  .../ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf     | 2 ++
> >  .../Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf       | 2 ++
> >  .../Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf     | 2 ++
> >  .../Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf | 2 ++
> >  ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf  | 3 +++
> >  ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf        | 2 ++
> >  ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf              | 2 ++
> >  ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf                      | 2 ++
> >  ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf          | 2 ++
> >  ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf                        | 2 ++
> >  .../Drivers}/FdtClientDxe/FdtClientDxe.inf                    | 2 +-
> >  {ArmVirtPkg => EmbeddedPkg}/Include/Protocol/FdtClient.h      | 0
> >  .../Drivers}/FdtClientDxe/FdtClientDxe.c                      | 0
> >  29 files changed, 53 insertions(+), 13 deletions(-)
> >  rename {ArmVirtPkg =>
> EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.inf (88%)
> >  rename {ArmVirtPkg => EmbeddedPkg}/Include/Protocol/FdtClient.h
> (100%)
> >  rename {ArmVirtPkg =>
> EmbeddedPkg/Drivers}/FdtClientDxe/FdtClientDxe.c (100%)
> >
> > diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec
> > index 4e4d758015..f5d34283b9 100644
> > --- a/ArmVirtPkg/ArmVirtPkg.dec
> > +++ b/ArmVirtPkg/ArmVirtPkg.dec
> > @@ -2,6 +2,7 @@
> >  #
> >  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >  #  Copyright (c) 2020, ARM Limited. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> 
> Please remove these bogus copyright statements. This hunk takes the
> cake because it claims copyright for the lines it removes (??), but in
> general, a series that claims to only move code around should not be
> adding these.
That's fine to remove those license. I thought we have to add copyright when touch the files.
Will resend the series.
Thanks
Abner
> 
> 
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -35,9 +36,6 @@
> >
> >    gArmVirtVariableGuid   = { 0x50bea1e5, 0xa2c5, 0x46e9, { 0x9b, 0x3a, 0x59,
> 0x59, 0x65, 0x16, 0xb0, 0x0a } }
> >
> > -[Protocols]
> > -  gFdtClientProtocolGuid = { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2,
> 0x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } }
> > -
> >  [PcdsFeatureFlag]
> >    #
> >    # Feature Flag PCD that defines whether TPM2 support is enabled
> > diff --git a/EmbeddedPkg/EmbeddedPkg.dec
> b/EmbeddedPkg/EmbeddedPkg.dec
> > index 7638aaaade..932d1b6077 100644
> > --- a/EmbeddedPkg/EmbeddedPkg.dec
> > +++ b/EmbeddedPkg/EmbeddedPkg.dec
> > @@ -5,6 +5,7 @@
> >  # Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
> >  # Copyright (c) 2012-2015, ARM Ltd. All rights reserved.<BR>
> >  # Copyright (c) 2017, Linaro Ltd. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -79,6 +80,7 @@
> >    gPlatformGpioProtocolGuid = { 0x52ce9845, 0x5af4, 0x43e2, {0xba, 0xfd,
> 0x23, 0x08, 0x12, 0x54, 0x7a, 0xc2 }}
> >    gPlatformVirtualKeyboardProtocolGuid = { 0x0e3606d2, 0x1dc3, 0x4e6f,
> { 0xbe, 0x65, 0x39, 0x49, 0x82, 0xa2, 0x65, 0x47 }}
> >    gAndroidBootImgProtocolGuid = { 0x9859bb19, 0x407c, 0x4f8b, {0xbc,
> 0xe1, 0xf8, 0xda, 0x65, 0x65, 0xf4, 0xa5 }}
> > +  gFdtClientProtocolGuid = { 0xE11FACA0, 0x4710, 0x4C8E, { 0xA7, 0xA2,
> 0x01, 0xBA, 0xA2, 0x59, 0x1B, 0x4C } }
> >
> >  [Ppis]
> >    gEdkiiEmbeddedGpioPpiGuid = { 0x21c3b115, 0x4e0b, 0x470c, { 0x85, 0xc7,
> 0xe1, 0x05, 0xa5, 0x75, 0xc9, 0x7b }}
> > diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc
> b/ArmVirtPkg/ArmVirtCloudHv.dsc
> > index f292ba6079..9e0dd6df0b 100644
> > --- a/ArmVirtPkg/ArmVirtCloudHv.dsc
> > +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
> > @@ -1,5 +1,6 @@
> >  #
> >  #  Copyright (c) 2021, ARM Limited. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -293,7 +294,7 @@
> >    # Platform Driver
> >    #
> >    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> >    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
> >    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> > diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc
> b/ArmVirtPkg/ArmVirtKvmTool.dsc
> > index 3bd1cc72a1..7587fd4ca0 100644
> > --- a/ArmVirtPkg/ArmVirtKvmTool.dsc
> > +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
> > @@ -2,6 +2,7 @@
> >  #  Workspace file for KVMTool virtual platform.
> >  #
> >  #  Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -292,7 +293,7 @@
> >    #
> >    ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf
> >    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> >    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
> >    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> > index 97539edef7..4e39307e7c 100644
> > --- a/ArmVirtPkg/ArmVirtQemu.dsc
> > +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> > @@ -2,6 +2,7 @@
> >  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >  #  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -404,7 +405,7 @@
> >    # Platform Driver
> >    #
> >    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> >    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
> >    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> > index 28064199c8..f1bb1cd09e 100644
> > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> > @@ -2,6 +2,7 @@
> >  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >  #  Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -340,7 +341,7 @@
> >    # Platform Driver
> >    #
> >    ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >    ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> >    OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
> >    OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
> > diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
> > index 2b07a5ba19..9176ce6a44 100644
> > --- a/ArmVirtPkg/ArmVirtXen.dsc
> > +++ b/ArmVirtPkg/ArmVirtXen.dsc
> > @@ -2,6 +2,7 @@
> >  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >  #  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -196,7 +197,7 @@
> >    # Platform Driver
> >    #
> >    ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> > -  ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >
> >    #
> >    # FAT filesystem + GPT/MBR partitioning + UDF filesystem
> > diff --git a/EmbeddedPkg/EmbeddedPkg.dsc
> b/EmbeddedPkg/EmbeddedPkg.dsc
> > index c41864e8a5..f64794b502 100644
> > --- a/EmbeddedPkg/EmbeddedPkg.dsc
> > +++ b/EmbeddedPkg/EmbeddedPkg.dsc
> > @@ -5,6 +5,7 @@
> >  # Copyright (c) 2007 - 2021, Intel Corporation. All rights reserved.<BR>
> >  # Copyright (c) 2012-2015, ARM Ltd. All rights reserved.<BR>
> >  # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #    SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -238,6 +239,7 @@
> >
> >    EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf
> >    EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf
> > +  EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >
> >
> EmbeddedPkg/Drivers/NonCoherentIoMmuDxe/NonCoherentIoMmuDxe.i
> nf {
> >      <LibraryClasses>
> > diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf
> b/ArmVirtPkg/ArmVirtCloudHv.fdf
> > index 13fe8061c3..899ec3e7f6 100644
> > --- a/ArmVirtPkg/ArmVirtCloudHv.fdf
> > +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf
> > @@ -1,5 +1,6 @@
> >  #
> >  #  Copyright (c) 2021, ARM Limited. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -106,7 +107,7 @@ READ_LOCK_STATUS   = TRUE
> >    INF MdeModulePkg/Core/Dxe/DxeMain.inf
> >    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> >    INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >    INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> >
> >    #
> > diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf
> b/ArmVirtPkg/ArmVirtKvmTool.fdf
> > index 152453dc4b..70299e42f6 100644
> > --- a/ArmVirtPkg/ArmVirtKvmTool.fdf
> > +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf
> > @@ -1,5 +1,6 @@
> >  #
> >  #  Copyright (c) 2018 - 2021, ARM Limited. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -120,7 +121,7 @@ READ_LOCK_STATUS   = TRUE
> >    INF MdeModulePkg/Core/Dxe/DxeMain.inf
> >    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> >    INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >    INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf
> >    INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> >
> > diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
> > index 9597465cf5..a7b2d3d24d 100644
> > --- a/ArmVirtPkg/ArmVirtXen.fdf
> > +++ b/ArmVirtPkg/ArmVirtXen.fdf
> > @@ -2,6 +2,7 @@
> >  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >  #  Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -139,7 +140,7 @@ READ_LOCK_STATUS   = TRUE
> >    INF MdeModulePkg/Core/Dxe/DxeMain.inf
> >    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> >    INF ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> > -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >
> >    #
> >    # PI DXE Drivers producing Architectural Protocols (EFI Services)
> > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> > index 26f13f6a21..0853d43519 100644
> > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> > @@ -2,6 +2,7 @@
> >  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
> >  #  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -41,7 +42,7 @@ READ_LOCK_STATUS   = TRUE
> >    INF MdeModulePkg/Core/Dxe/DxeMain.inf
> >    INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
> >    INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > -  INF ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +  INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> >    INF ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> >
> >    #
> > diff --git a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> > index e510880b0d..3633a42d47 100644
> > --- a/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> > +++ b/ArmVirtPkg/HighMemDxe/HighMemDxe.inf
> > @@ -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
> >  #
> > @@ -20,6 +21,7 @@
> >    HighMemDxe.c
> >
> >  [Packages]
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >    MdeModulePkg/MdeModulePkg.dec
> >    ArmPkg/ArmPkg.dec
> > diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
> b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
> > index 43fcb0b73b..f25217a1f7 100644
> > --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
> > +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.inf
> > @@ -3,6 +3,7 @@
> >  #  Component description file for ArmVirtGicArchLib module
> >  #
> >  #  Copyright (c) 2015, Linaro Ltd. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -30,6 +31,7 @@
> >  [Packages]
> >    ArmPkg/ArmPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >
> >  [Protocols]
> > diff --git
> a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.in
> f
> b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.in
> f
> > index 52027d5101..e44c0d0bd3 100644
> > ---
> a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.in
> f
> > +++
> b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.in
> f
> > @@ -2,6 +2,7 @@
> >  #  FDT client library for ARM's PL031 RTC driver
> >  #
> >  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -22,6 +23,7 @@
> >  [Packages]
> >    ArmPlatformPkg/ArmPlatformPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >
> >  [LibraryClasses]
> > diff --git
> a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLi
> b.inf
> b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemL
> ib.inf
> > index 954a6ac8a6..32b63093fe 100644
> > ---
> a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLi
> b.inf
> > +++
> b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemL
> ib.inf
> > @@ -3,6 +3,7 @@
> >  #
> >  # Copyright (c) 2008, Apple Inc. All rights reserved.<BR>
> >  # Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -24,6 +25,7 @@
> >  [Packages]
> >    ArmPkg/ArmPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdeModulePkg/MdeModulePkg.dec
> >    MdePkg/MdePkg.dec
> >
> > diff --git
> a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.in
> f
> b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.in
> f
> > index 382e3004e1..5636e30e2a 100644
> > ---
> a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.in
> f
> > +++
> b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.in
> f
> > @@ -2,6 +2,7 @@
> >  #  FDT client library for ARM's TimerDxe
> >  #
> >  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -23,6 +24,7 @@
> >  [Packages]
> >    ArmPkg/ArmPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >
> >  [LibraryClasses]
> > diff --git a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> > index b813a0851d..ce9890a6b6 100644
> > --- a/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> > +++ b/ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
> > @@ -2,6 +2,7 @@
> >  #  PCI Host Bridge Library instance for pci-ecam-generic DT nodes
> >  #
> >  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -29,6 +30,7 @@
> >  [Packages]
> >    ArmPkg/ArmPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdeModulePkg/MdeModulePkg.dec
> >    MdePkg/MdePkg.dec
> >    OvmfPkg/OvmfPkg.dec
> > diff --git
> a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> > index 337a5488fc..e8a4ad8253 100644
> > --- a/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> > +++ b/ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
> > @@ -2,6 +2,7 @@
> >  #  FDT client library for consumers of PCI related dynamic PCDs
> >  #
> >  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -22,6 +23,7 @@
> >  [Packages]
> >    ArmPkg/ArmPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdeModulePkg/MdeModulePkg.dec
> >    MdePkg/MdePkg.dec
> >
> > diff --git
> a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
> b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
> > index deb3bf635c..f174b184a9 100644
> > ---
> a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
> > +++
> b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.inf
> > @@ -2,6 +2,7 @@
> >  #  FDT client library for motorola,mc146818 RTC driver
> >  #
> >  #  Copyright (c) 2020, ARM Limited. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -21,6 +22,7 @@
> >
> >  [Packages]
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >    PcAtChipsetPkg/PcAtChipsetPkg.dec
> >
> > diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
> b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
> > index 95e4ba89a4..6f01cd7439 100644
> > --- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
> > +++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtoolLib.inf
> > @@ -2,6 +2,8 @@
> >  #  Nor Flash library for Kvmtool.
> >  #
> >  #  Copyright (c) 2020, ARM Ltd. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> > +#
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> >  ##
> > @@ -22,6 +24,7 @@
> >    ArmPkg/ArmPkg.dec
> >    ArmPlatformPkg/ArmPlatformPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >    MdeModulePkg/MdeModulePkg.dec
> >
> > diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
> b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
> > index 9aad84ca6d..32018318e3 100644
> > --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
> > +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf
> > @@ -3,6 +3,7 @@
> >  #  Component description file for NorFlashQemuLib module
> >  #
> >  #  Copyright (c) 2014, Linaro Ltd. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -24,6 +25,7 @@
> >    ArmPlatformPkg/ArmPlatformPkg.dec
> >    ArmPkg/ArmPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >
> >  [LibraryClasses]
> >    BaseLib
> > diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
> b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
> > index feceed5f93..74db3b01f4 100644
> > --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
> > +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf
> > @@ -4,6 +4,7 @@
> >  #
> >  #  Copyright (C) 2013 - 2014, Red Hat, Inc.
> >  #  Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -32,6 +33,7 @@
> >  [Packages]
> >    MdePkg/MdePkg.dec
> >    OvmfPkg/OvmfPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    ArmVirtPkg/ArmVirtPkg.dec
> >
> >  [LibraryClasses]
> > diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > index 8fd92f17df..7d1a93f305 100644
> > --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > +++ b/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf
> > @@ -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
> >  #
> > @@ -21,6 +22,7 @@
> >
> >  [Packages]
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >    OvmfPkg/OvmfPkg.dec
> >
> > diff --git a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
> b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
> > index 5881d6b515..bf57463f22 100644
> > --- a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
> > +++ b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
> > @@ -2,6 +2,7 @@
> >  #  Xen ARM ACPI Platform Driver using Xen ARM multiboot protocol
> >  #
> >  #  Copyright (C) 2016, Linaro Ltd. All rights reserved.
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -26,6 +27,7 @@
> >
> >  [Packages]
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >    MdeModulePkg/MdeModulePkg.dec
> >
> > diff --git a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> > index 59e53cad80..a85e66ea5a 100644
> > --- a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> > +++ b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf
> > @@ -2,6 +2,7 @@
> >  #  Xenio FDT client protocol driver for xen,xen DT node
> >  #
> >  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> > +# (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -21,6 +22,7 @@
> >
> >  [Packages]
> >    ArmVirtPkg/ArmVirtPkg.dec
> > +  EmbeddedPkg/EmbeddedPkg.dec
> >    MdePkg/MdePkg.dec
> >    OvmfPkg/OvmfPkg.dec
> >
> > diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> > similarity index 88%
> > rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> > index d7ba17a0c9..1c8311e335 100644
> > --- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
> > +++ b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf
> > @@ -2,6 +2,7 @@
> >  #  FDT client driver
> >  #
> >  #  Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> > +#  (C) Copyright 2021 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #
> > @@ -19,7 +20,6 @@
> >    FdtClientDxe.c
> >
> >  [Packages]
> > -  ArmVirtPkg/ArmVirtPkg.dec
> >    EmbeddedPkg/EmbeddedPkg.dec
> >    MdeModulePkg/MdeModulePkg.dec
> >    MdePkg/MdePkg.dec
> > diff --git a/ArmVirtPkg/Include/Protocol/FdtClient.h
> b/EmbeddedPkg/Include/Protocol/FdtClient.h
> > similarity index 100%
> > rename from ArmVirtPkg/Include/Protocol/FdtClient.h
> > rename to EmbeddedPkg/Include/Protocol/FdtClient.h
> > diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
> b/EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> > similarity index 100%
> > rename from ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
> > rename to EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.c
> > --
> > 2.17.1
> >
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2021-09-28  3:35 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-27 14:03 [PATCH 0/9] Migrate ArmVirtPkg modules to OvmfPkg Abner Chang
2021-09-27 14:03 ` [PATCH 1/9] ArmVirtPkg/FdtClintDxe: Move FdtClientDxe to EmbeddedPkg Abner Chang
2021-09-27 20:27   ` Ard Biesheuvel
2021-09-28  3:35     ` [edk2-devel] " Abner Chang
2021-09-27 14:03 ` [PATCH 2/9] MdePkg: Add PcdPciIoTranslation PCD Abner Chang
2021-09-27 14:03 ` [PATCH 3/9] ArmPkg: Use PcdPciIoTranslation PCD from MdePkg Abner Chang
2021-09-27 14:03 ` [PATCH 4/9] ArmVirtPkg/FdtPciPcdProducerLib: Relocate PciPcdProducerLib to OvmfPkg Abner Chang
2021-09-27 14:03 ` [PATCH 6/9] ArmVirtPkg/QemuFwCfgLib: Relocate QemuFwCfgLib " Abner Chang
2021-09-27 14:03 ` [PATCH 7/9] MdePkg: Add PcdPciMmio32(64)Translation PCDs Abner Chang
2021-09-27 14:03 ` [PATCH 8/9] ArmVirtPkg/FdtPciHostBridgeLib: Relocate FdtPciHostBridgeLib to OvmfPkg/Fdt Abner Chang
2021-09-27 14:03 ` [PATCH 9/9] ArmVirtPkg/VirtioFdtDxe: Relocate VirtioFdtDxe " Abner Chang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox