[PATCH 0/2] Include HardwareInfoLib in all platforms using

[PATCH 0/2] Include HardwareInfoLib in all platforms using

[Ojeda Leon, Nicolas]

In past days, a patch series to support multiple PCI host bridges in Ovmf
was merged which caused an error in ArmVirtQemuKernel.dsc build, part
of the CI pipeline.

These 2 commits aim at fixing this issue by adding the HardwareInfoLib
to all ArmVirt* platofrms as well as for IntelTdx which were missing
this library that now is a dependency of PciHostBridgeUtilityLib.

Nicolas Ojeda Leon (2):
  ArmVirtPkg: Include DxeHardwareInfoLib library class in dsc
  Ovmf: Include HardwareInfoLib library classes for IntelTdx

 ArmVirtPkg/ArmVirt.dsc.inc       | 1 +
 ArmVirtPkg/ArmVirtQemu.dsc       | 1 -
 OvmfPkg/IntelTdx/IntelTdxX64.dsc | 2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

-- 
2.17.1




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879

[PATCH 1/2] ArmVirtPkg: Include DxeHardwareInfoLib library class in dsc

[Ojeda Leon, Nicolas]

Include DxeHardwareInfoLib class in the common ArmVirt.dsc.inc so that
ArmVirt* platforms use it during build given that PciHostBridgeUtilityLib
depends on it.

Cc: Alexander Graf <graf@amazon.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Nicolas Ojeda Leon <ncoleon@amazon.com>
---
 ArmVirtPkg/ArmVirt.dsc.inc | 1 +
 ArmVirtPkg/ArmVirtQemu.dsc | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index f15a3f7f06..4732bd76d6 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -144,6 +144,7 @@
   PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf
   PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf
   PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf
+  DxeHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/DxeHardwareInfoLib.inf
 
   # USB Libraries
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 56eb53911d..9369a88858 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -82,7 +82,6 @@
   PciHostBridgeLib|OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
   PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf
   PeiHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/PeiHardwareInfoLib.inf
-  DxeHardwareInfoLib|OvmfPkg/Library/HardwareInfoLib/DxeHardwareInfoLib.inf
 
 !if $(TPM2_ENABLE) == TRUE
   Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf
-- 
2.17.1




Amazon Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
Sitz: Berlin
Ust-ID: DE 289 237 879

Re: [PATCH 0/2] Include HardwareInfoLib in all platforms using

[Ard Biesheuvel]

On Thu, 23 Jun 2022 at 17:23, Nicolas Ojeda Leon <ncoleon@amazon.com> wrote:
>
> In past days, a patch series to support multiple PCI host bridges in Ovmf
> was merged which caused an error in ArmVirtQemuKernel.dsc build, part
> of the CI pipeline.
>
> These 2 commits aim at fixing this issue by adding the HardwareInfoLib
> to all ArmVirt* platofrms as well as for IntelTdx which were missing
> this library that now is a dependency of PciHostBridgeUtilityLib.
>
> Nicolas Ojeda Leon (2):
>   ArmVirtPkg: Include DxeHardwareInfoLib library class in dsc
>   Ovmf: Include HardwareInfoLib library classes for IntelTdx
>

Thanks for the fixes

Merged as #3012

>  ArmVirtPkg/ArmVirt.dsc.inc       | 1 +
>  ArmVirtPkg/ArmVirtQemu.dsc       | 1 -
>  OvmfPkg/IntelTdx/IntelTdxX64.dsc | 2 ++
>  3 files changed, 3 insertions(+), 1 deletion(-)
>
> --
> 2.17.1
>
>
>
>
> Amazon Development Center Germany GmbH
> Krausenstr. 38
> 10117 Berlin
> Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
> Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B
> Sitz: Berlin
> Ust-ID: DE 289 237 879
>
>
>