|
 |
cc9195 |
From c51468996553e70659b85a24cbdad61a27dac952 Mon Sep 17 00:00:00 2001
|
|
|
cc9195 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
cc9195 |
Date: Wed, 18 Jul 2018 00:18:18 +0200
|
|
|
cc9195 |
Subject: [PATCH 2/6] ArmVirtPkg: unify HttpLib resolutions in
|
|
|
cc9195 |
"ArmVirt.dsc.inc"
|
|
|
cc9195 |
|
|
|
cc9195 |
Message-id: <20180717221822.13110-2-lersek@redhat.com>
|
|
|
cc9195 |
Patchwork-id: 81376
|
|
|
cc9195 |
O-Subject: [RHEL8/virt212 edk2 PATCH 1/5] ArmVirtPkg: unify HttpLib resolutions
|
|
|
cc9195 |
in "ArmVirt.dsc.inc"
|
|
|
cc9195 |
Bugzilla: 1536627
|
|
|
cc9195 |
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
cc9195 |
Acked-by: Wei Huang <wei@redhat.com>
|
|
|
cc9195 |
|
|
|
cc9195 |
We already resolve a number of networking-related library classes in
|
|
|
cc9195 |
ArmVirt.dsc.inc; follow suit with HttpLib.
|
|
|
cc9195 |
|
|
|
cc9195 |
Cc: Julien Grall <julien.grall@linaro.org>
|
|
|
cc9195 |
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1007
|
|
|
cc9195 |
Contributed-under: TianoCore Contribution Agreement 1.1
|
|
|
cc9195 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
cc9195 |
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
|
|
cc9195 |
(cherry picked from commit 77b702bfa4947caaa6b4b04730820d91bdf07b03)
|
|
|
cc9195 |
---
|
|
|
cc9195 |
ArmVirtPkg/ArmVirt.dsc.inc | 3 +++
|
|
|
cc9195 |
ArmVirtPkg/ArmVirtQemu.dsc | 4 ----
|
|
|
cc9195 |
ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ----
|
|
|
cc9195 |
3 files changed, 3 insertions(+), 8 deletions(-)
|
|
|
cc9195 |
|
|
|
cc9195 |
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
|
cc9195 |
index 35bccb3d..2bb8860 100644
|
|
|
cc9195 |
--- a/ArmVirtPkg/ArmVirt.dsc.inc
|
|
|
cc9195 |
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
|
|
|
cc9195 |
@@ -80,6 +80,9 @@
|
|
|
cc9195 |
DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
|
|
|
cc9195 |
UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
|
|
|
cc9195 |
IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
|
|
|
cc9195 |
+!if $(HTTP_BOOT_ENABLE) == TRUE
|
|
|
cc9195 |
+ HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
|
|
|
cc9195 |
+!endif
|
|
|
cc9195 |
|
|
|
cc9195 |
#
|
|
|
cc9195 |
# It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
|
|
|
cc9195 |
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
|
cc9195 |
index 035b729..bb9d7c8 100644
|
|
|
cc9195 |
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
|
|
cc9195 |
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
|
cc9195 |
@@ -63,10 +63,6 @@
|
|
|
cc9195 |
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
|
|
|
cc9195 |
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
|
|
|
cc9195 |
|
|
|
cc9195 |
-!if $(HTTP_BOOT_ENABLE) == TRUE
|
|
|
cc9195 |
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
|
|
|
cc9195 |
-!endif
|
|
|
cc9195 |
-
|
|
|
cc9195 |
[LibraryClasses.common.PEIM]
|
|
|
cc9195 |
ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf
|
|
|
cc9195 |
|
|
|
cc9195 |
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
|
cc9195 |
index 1981aae..9027805 100644
|
|
|
cc9195 |
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
|
cc9195 |
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
|
cc9195 |
@@ -63,10 +63,6 @@
|
|
|
cc9195 |
PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf
|
|
|
cc9195 |
PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf
|
|
|
cc9195 |
|
|
|
cc9195 |
-!if $(HTTP_BOOT_ENABLE) == TRUE
|
|
|
cc9195 |
- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
|
|
|
cc9195 |
-!endif
|
|
|
cc9195 |
-
|
|
|
cc9195 |
[LibraryClasses.common.UEFI_DRIVER]
|
|
|
cc9195 |
UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
|
|
|
cc9195 |
|
|
|
cc9195 |
--
|
|
|
cc9195 |
1.8.3.1
|
|
|
cc9195 |
|