* [PATCH 1/3] ArmVirtPkg: don't build the network stack uselessly for Xen
2017-09-11 21:08 [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe Laszlo Ersek
@ 2017-09-11 21:08 ` Laszlo Ersek
2017-09-11 21:08 ` [PATCH 2/3] ArmVirtPkg/ArmVirtQemu: port HTTP_BOOT_ENABLE from OvmfPkg Laszlo Ersek
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Laszlo Ersek @ 2017-09-11 21:08 UTC (permalink / raw)
To: edk2-devel-01; +Cc: Ard Biesheuvel
"ArmVirtXen.fdf" pulls in none of the drivers from
"MdeModulePkg/Universal/Network", therefore building them in
"ArmVirtXen.dsc", via "ArmVirt.dsc.inc", is wasted work.
Move the "MdeModulePkg/Universal/Network" drivers from "ArmVirt.dsc.inc"
to "ArmVirtQemu.dsc" and "ArmVirtQemuKernel.dsc".
Place the new block between the "Bds" and "SCSI Bus and Disk Driver"
blocks, similarly to its context in "ArmVirtQemuFvMain.fdf.inc".
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
ArmVirtPkg/ArmVirt.dsc.inc | 15 ---------------
ArmVirtPkg/ArmVirtQemu.dsc | 15 +++++++++++++++
ArmVirtPkg/ArmVirtQemuKernel.dsc | 15 +++++++++++++++
3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 3770b1ec7565..c92a69281ae4 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -376,21 +376,6 @@ [PcdsFixedAtBuild.ARM]
gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40
[Components.common]
- #
- # Networking stack
- #
- MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
- MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
- MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
- MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
- MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
- MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
- MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
- MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
- MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
- MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
-
#
# Ramdisk support
#
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 609697f29307..57baf597398a 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -324,6 +324,21 @@ [Components.common]
NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
}
+ #
+ # Networking stack
+ #
+ MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+ MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+ MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+ MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+ MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+ MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+ MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+ MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+ MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+
#
# SCSI Bus and Disk Driver
#
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index cb3704727bf1..8c15da3490ab 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -315,6 +315,21 @@ [Components.common]
NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
}
+ #
+ # Networking stack
+ #
+ MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+ MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+ MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+ MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+ MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+ MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+ MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+ MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+ MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+ MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+ MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+
#
# SCSI Bus and Disk Driver
#
--
2.14.1.3.gb7cf6e02401b
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] ArmVirtPkg/ArmVirtQemu: port HTTP_BOOT_ENABLE from OvmfPkg
2017-09-11 21:08 [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe Laszlo Ersek
2017-09-11 21:08 ` [PATCH 1/3] ArmVirtPkg: don't build the network stack uselessly for Xen Laszlo Ersek
@ 2017-09-11 21:08 ` Laszlo Ersek
2017-09-11 21:08 ` [PATCH 3/3] ArmVirtPkg/ArmVirtQemu: include UsbMassStorageDxe Laszlo Ersek
2017-09-12 6:48 ` [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe Ard Biesheuvel
3 siblings, 0 replies; 6+ messages in thread
From: Laszlo Ersek @ 2017-09-11 21:08 UTC (permalink / raw)
To: edk2-devel-01; +Cc: Ard Biesheuvel
* From commit ab44a6e833fa ("OvmfPkg: Add HttpBoot support", 2015-08-23):
- introduce HTTP_BOOT_ENABLE build define
- resolve HttpLib class
- include NetworkPkg drivers DnsDxe, HttpDxe, HttpBootDxe
* From commit 1a85139d9eac ("OvmfPkg: Build HTTP utilities driver",
2015-08-28):
- include NetworkPkg driver HttpUtilitiesDxe
* From commit 4b2fb7986d57 ("OvmfPkg: Allow HTTP connections if HTTP Boot
enabled", 2017-01-19):
- set PcdAllowHttpConnections to TRUE
> ## Indicates whether HTTP connections (i.e., unsecured) are permitted or
> ## not.
> # TRUE - HTTP connections are allowed. Both the "https://" and
> # "http://" URI schemes are permitted.
> # FALSE - HTTP connections are denied. Only the "https://" URI scheme is
> # permitted.
> # @Prompt Indicates whether HTTP connections are permitted or not.
> gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|FALSE|BOOLEAN|...
TLS_ENABLE (for HTTPS) is not ported for the time being.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
ArmVirtPkg/ArmVirtQemu.dsc | 15 +++++++++++++++
ArmVirtPkg/ArmVirtQemuKernel.dsc | 15 +++++++++++++++
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 6 ++++++
3 files changed, 36 insertions(+)
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 57baf597398a..9ec70fb8b134 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -34,6 +34,7 @@ [Defines]
# -D FLAG=VALUE
#
DEFINE SECURE_BOOT_ENABLE = FALSE
+ DEFINE HTTP_BOOT_ENABLE = FALSE
!include ArmVirtPkg/ArmVirt.dsc.inc
@@ -63,6 +64,10 @@ [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
@@ -124,6 +129,10 @@ [PcdsFixedAtBuild.common]
#
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0
+!if $(HTTP_BOOT_ENABLE) == TRUE
+ gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
+!endif
+
# System Memory Base -- fixed at 0x4000_0000
gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000
@@ -338,6 +347,12 @@ [Components.common]
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+!if $(HTTP_BOOT_ENABLE) == TRUE
+ NetworkPkg/DnsDxe/DnsDxe.inf
+ NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
+ NetworkPkg/HttpDxe/HttpDxe.inf
+ NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+!endif
#
# SCSI Bus and Disk Driver
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 8c15da3490ab..33c1385c8510 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -34,6 +34,7 @@ [Defines]
# -D FLAG=VALUE
#
DEFINE SECURE_BOOT_ENABLE = FALSE
+ DEFINE HTTP_BOOT_ENABLE = FALSE
!include ArmVirtPkg/ArmVirt.dsc.inc
@@ -63,6 +64,10 @@ [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
@@ -129,6 +134,10 @@ [PcdsFixedAtBuild.common]
#
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0
+!if $(HTTP_BOOT_ENABLE) == TRUE
+ gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
+!endif
+
[PcdsPatchableInModule.common]
#
# This will be overridden in the code
@@ -329,6 +338,12 @@ [Components.common]
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+!if $(HTTP_BOOT_ENABLE) == TRUE
+ NetworkPkg/DnsDxe/DnsDxe.inf
+ NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
+ NetworkPkg/HttpDxe/HttpDxe.inf
+ NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+!endif
#
# SCSI Bus and Disk Driver
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index e54eeea41ee6..f0f4be2fa048 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -128,6 +128,12 @@ [FV.FvMain]
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+!if $(HTTP_BOOT_ENABLE) == TRUE
+ INF NetworkPkg/DnsDxe/DnsDxe.inf
+ INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
+ INF NetworkPkg/HttpDxe/HttpDxe.inf
+ INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
+!endif
#
# SCSI Bus and Disk Driver
--
2.14.1.3.gb7cf6e02401b
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] ArmVirtPkg/ArmVirtQemu: include UsbMassStorageDxe
2017-09-11 21:08 [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe Laszlo Ersek
2017-09-11 21:08 ` [PATCH 1/3] ArmVirtPkg: don't build the network stack uselessly for Xen Laszlo Ersek
2017-09-11 21:08 ` [PATCH 2/3] ArmVirtPkg/ArmVirtQemu: port HTTP_BOOT_ENABLE from OvmfPkg Laszlo Ersek
@ 2017-09-11 21:08 ` Laszlo Ersek
2017-09-12 6:48 ` [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe Ard Biesheuvel
3 siblings, 0 replies; 6+ messages in thread
From: Laszlo Ersek @ 2017-09-11 21:08 UTC (permalink / raw)
To: edk2-devel-01; +Cc: Ard Biesheuvel
This is needed for recognizing QEMU's "usb-storage" device model.
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
ArmVirtPkg/ArmVirtQemu.dsc | 1 +
ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 +
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 +
3 files changed, 3 insertions(+)
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 9ec70fb8b134..8a60b61f2aa6 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -398,6 +398,7 @@ [Components.common]
MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+ MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
#
# ACPI Support
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 33c1385c8510..9a31ec93ca06 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -389,6 +389,7 @@ [Components.common]
MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+ MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
#
# ACPI Support
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index f0f4be2fa048..744006d13cbb 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -185,6 +185,7 @@ [FV.FvMain]
INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf
INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
#
# TianoCore logo (splash screen)
--
2.14.1.3.gb7cf6e02401b
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe
2017-09-11 21:08 [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe Laszlo Ersek
` (2 preceding siblings ...)
2017-09-11 21:08 ` [PATCH 3/3] ArmVirtPkg/ArmVirtQemu: include UsbMassStorageDxe Laszlo Ersek
@ 2017-09-12 6:48 ` Ard Biesheuvel
2017-09-12 11:11 ` Laszlo Ersek
3 siblings, 1 reply; 6+ messages in thread
From: Ard Biesheuvel @ 2017-09-12 6:48 UTC (permalink / raw)
To: Laszlo Ersek; +Cc: edk2-devel-01
On 11 September 2017 at 22:08, Laszlo Ersek <lersek@redhat.com> wrote:
> Repo: https://github.com/lersek/edk2.git
> Branch: armvirt_http_usbstor
>
> I was... ugh... experimenting with "stuff" over the weekend, and
> realized these were missing.
>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> Thanks
> Laszlo
>
> Laszlo Ersek (3):
> ArmVirtPkg: don't build the network stack uselessly for Xen
> ArmVirtPkg/ArmVirtQemu: port HTTP_BOOT_ENABLE from OvmfPkg
> ArmVirtPkg/ArmVirtQemu: include UsbMassStorageDxe
>
> ArmVirtPkg/ArmVirt.dsc.inc | 15 ----------
> ArmVirtPkg/ArmVirtQemu.dsc | 31 ++++++++++++++++++++
> ArmVirtPkg/ArmVirtQemuKernel.dsc | 31 ++++++++++++++++++++
> ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 7 +++++
> 4 files changed, 69 insertions(+), 15 deletions(-)
>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe
2017-09-12 6:48 ` [PATCH 0/3] ArmVirtPkg: add HTTP_BOOT_ENABLE and UsbMassStorageDxe Ard Biesheuvel
@ 2017-09-12 11:11 ` Laszlo Ersek
0 siblings, 0 replies; 6+ messages in thread
From: Laszlo Ersek @ 2017-09-12 11:11 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel-01
On 09/12/17 08:48, Ard Biesheuvel wrote:
> On 11 September 2017 at 22:08, Laszlo Ersek <lersek@redhat.com> wrote:
>> Repo: https://github.com/lersek/edk2.git
>> Branch: armvirt_http_usbstor
>>
>> I was... ugh... experimenting with "stuff" over the weekend, and
>> realized these were missing.
>>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>>
>> Thanks
>> Laszlo
>>
>> Laszlo Ersek (3):
>> ArmVirtPkg: don't build the network stack uselessly for Xen
>> ArmVirtPkg/ArmVirtQemu: port HTTP_BOOT_ENABLE from OvmfPkg
>> ArmVirtPkg/ArmVirtQemu: include UsbMassStorageDxe
>>
>> ArmVirtPkg/ArmVirt.dsc.inc | 15 ----------
>> ArmVirtPkg/ArmVirtQemu.dsc | 31 ++++++++++++++++++++
>> ArmVirtPkg/ArmVirtQemuKernel.dsc | 31 ++++++++++++++++++++
>> ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 7 +++++
>> 4 files changed, 69 insertions(+), 15 deletions(-)
>>
>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Thank you! Commit range b4e5807d2492..62ef40c4959e.
Laszlo
^ permalink raw reply [flat|nested] 6+ messages in thread