68 lines
2.5 KiB
Diff
68 lines
2.5 KiB
Diff
From 77b702bfa4947caaa6b4b04730820d91bdf07b03 Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Fri, 13 Jul 2018 01:41:11 +0200
|
|
Subject: [PATCH 1/2] ArmVirtPkg: unify HttpLib resolutions in
|
|
"ArmVirt.dsc.inc"
|
|
|
|
We already resolve a number of networking-related library classes in
|
|
ArmVirt.dsc.inc; follow suit with HttpLib.
|
|
|
|
Cc: Julien Grall <julien.grall@linaro.org>
|
|
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1007
|
|
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
---
|
|
ArmVirtPkg/ArmVirt.dsc.inc | 3 +++
|
|
ArmVirtPkg/ArmVirtQemu.dsc | 4 ----
|
|
ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ----
|
|
3 files changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
index 7464ac70ed..76c400a5de 100644
|
|
--- a/ArmVirtPkg/ArmVirt.dsc.inc
|
|
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
@@ -80,6 +80,9 @@ [LibraryClasses.common]
|
|
DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
|
|
UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
|
|
IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
|
|
+!if $(HTTP_BOOT_ENABLE) == TRUE
|
|
+ HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
|
|
+!endif
|
|
|
|
#
|
|
# It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
|
|
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
index 744d127a10..742df36285 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
|
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
@@ -64,10 +64,6 @@ [LibraryClasses.common]
|
|
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
|
|
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
|
|
|
|
-!if $(HTTP_BOOT_ENABLE) == TRUE
|
|
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
|
|
-!endif
|
|
-
|
|
[LibraryClasses.common.PEIM]
|
|
ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
index e59f53b728..4ae61ec635 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
@@ -64,10 +64,6 @@ [LibraryClasses.common]
|
|
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
|
|
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
|
|
|
|
-!if $(HTTP_BOOT_ENABLE) == TRUE
|
|
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
|
|
-!endif
|
|
-
|
|
[LibraryClasses.common.UEFI_DRIVER]
|
|
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
|
|
|
|
--
|
|
2.17.1
|
|
|