On Mon, 27 Sept 2021 at 17:01, Abner Chang <[email protected]> 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 <[email protected]>
> Cc: Ard Biesheuvel <[email protected]>
> Cc: Leif Lindholm <[email protected]>
> Cc: Sami Mujawar <[email protected]>
> Cc: Gerd Hoffmann <[email protected]>
> Cc: Daniel Schaefer <[email protected]>
> Cc: Sunil V L <[email protected]>
> ---
> 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
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#81185): https://edk2.groups.io/g/devel/message/81185
Mute This Topic: https://groups.io/mt/85902617/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
