1. Patchew
  2. EDK2
  3. [edk2-devel] [edk2-platforms: PATCH v2 0/2] Minor updates to platform
  4. View patch

[edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF

Pete Batard posted 2 patches 6 years, 8 months ago
[edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
Posted by Pete Batard 6 years, 8 months ago 
This patch updates the platform DSC/FDF files to use the include fragment
files provided by NetworkPkg.

Signed-off-by: Pete Batard <pete@akeo.ie>
---
 Platform/RaspberryPi/RPi3/RPi3.dsc | 31 ++++++++------------
 Platform/RaspberryPi/RPi3/RPi3.fdf | 11 +------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 85b954b060f1..fe883eac96ba 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -25,6 +25,12 @@ [Defines]
   SKUID_IDENTIFIER               = DEFAULT
   FLASH_DEFINITION               = Platform/RaspberryPi/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
 
+  #
+  # Network definition
+  #
+  DEFINE NETWORK_TLS_ENABLE       = FALSE
+  DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
+
   #
   # Defines for default states.  These can be changed on the command line.
   # -D FLAG=VALUE
@@ -85,12 +91,6 @@ [LibraryClasses.common]
   # use the accelerated BaseMemoryLibOptDxe by default, overrides for SEC/PEI below
   BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
 
-  # Networking Requirements
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-
   #
   # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
   # This library provides the instrinsic functions such a compiler may generate calls to.
@@ -117,6 +117,11 @@ [LibraryClasses.common]
   PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
   SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
 
+  # Cryptographic libraries
+  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
+
   #
   # Uncomment (and comment out the next line) For RealView Debugger. The Standard IO window
   # in the debugger will show load and unload commands for symbols. You can cut and paste this
@@ -140,11 +145,8 @@ [LibraryClasses.common]
   # Secure Boot dependencies
   #
 !if $(SECURE_BOOT_ENABLE) == TRUE
-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
   TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
 
   # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree
   PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf
@@ -588,16 +590,7 @@ [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/Udp4Dxe/Udp4Dxe.inf
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  NetworkPkg/TcpDxe/TcpDxe.inf
+!include NetworkPkg/Network.dsc.inc
 
   #
   # RNG
diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
index 6be7c23af467..c7c3f7a2ab8c 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -265,16 +265,7 @@ [FV.FvMain]
   #
   # Networking stack
   #
-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
-  INF NetworkPkg/TcpDxe/TcpDxe.inf
+!include NetworkPkg/Network.fdf.inc
 
   #
   # RNG
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42034): https://edk2.groups.io/g/devel/message/42034
Mute This Topic: https://groups.io/mt/31975707/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
Posted by Liming Gao 6 years, 8 months ago 
Pete:
  The change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>

  In fact, I send this patch before. https://edk2.groups.io/g/devel/message/41480?p=,,,20,0,0,0::Created,,Network,20,2,0,31819937
  But, I don't get the response. Then,  I think this platform is out of maintain. 

Thanks
Liming
>-----Original Message-----
>From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>Pete Batard
>Sent: Friday, June 07, 2019 11:08 PM
>To: devel@edk2.groups.io
>Cc: ard.biesheuvel@linaro.org; leif.lindholm@linaro.org
>Subject: [edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3:
>Update DSC/FDF to use NetworkPkg DSC/FDF
>
>This patch updates the platform DSC/FDF files to use the include fragment
>files provided by NetworkPkg.
>
>Signed-off-by: Pete Batard <pete@akeo.ie>
>---
> Platform/RaspberryPi/RPi3/RPi3.dsc | 31 ++++++++------------
> Platform/RaspberryPi/RPi3/RPi3.fdf | 11 +------
> 2 files changed, 13 insertions(+), 29 deletions(-)
>
>diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc
>b/Platform/RaspberryPi/RPi3/RPi3.dsc
>index 85b954b060f1..fe883eac96ba 100644
>--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
>+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
>@@ -25,6 +25,12 @@ [Defines]
>   SKUID_IDENTIFIER               = DEFAULT
>   FLASH_DEFINITION               =
>Platform/RaspberryPi/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf
>
>+  #
>+  # Network definition
>+  #
>+  DEFINE NETWORK_TLS_ENABLE       = FALSE
>+  DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
>+
>   #
>   # Defines for default states.  These can be changed on the command line.
>   # -D FLAG=VALUE
>@@ -85,12 +91,6 @@ [LibraryClasses.common]
>   # use the accelerated BaseMemoryLibOptDxe by default, overrides for
>SEC/PEI below
>
>BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibO
>ptDxe.inf
>
>-  # Networking Requirements
>-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
>-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
>-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
>-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
>-
>   #
>   # It is not possible to prevent the ARM compiler from inserting calls to
>intrinsic functions.
>   # This library provides the instrinsic functions such a compiler may generate
>calls to.
>@@ -117,6 +117,11 @@ [LibraryClasses.common]
>
>PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlat
>formHookLibNull.inf
>
>SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortL
>ib16550.inf
>
>+  # Cryptographic libraries
>+  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
>+  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
>+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
>+
>   #
>   # Uncomment (and comment out the next line) For RealView Debugger. The
>Standard IO window
>   # in the debugger will show load and unload commands for symbols. You can
>cut and paste this
>@@ -140,11 +145,8 @@ [LibraryClasses.common]
>   # Secure Boot dependencies
>   #
> !if $(SECURE_BOOT_ENABLE) == TRUE
>-  IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
>-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
>
>TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpm
>MeasurementLib.inf
>   AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
>-  BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
>
>   # re-use the UserPhysicalPresent() dummy implementation from the ovmf
>tree
>
>PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.in
>f
>@@ -588,16 +590,7 @@ [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/Udp4Dxe/Udp4Dxe.inf
>-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>-  NetworkPkg/TcpDxe/TcpDxe.inf
>+!include NetworkPkg/Network.dsc.inc
>
>   #
>   # RNG
>diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf
>b/Platform/RaspberryPi/RPi3/RPi3.fdf
>index 6be7c23af467..c7c3f7a2ab8c 100644
>--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
>+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
>@@ -265,16 +265,7 @@ [FV.FvMain]
>   #
>   # Networking stack
>   #
>-  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
>-  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
>-  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
>-  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
>-  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
>-  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
>-  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
>-  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
>-  INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
>-  INF NetworkPkg/TcpDxe/TcpDxe.inf
>+!include NetworkPkg/Network.fdf.inc
>
>   #
>   # RNG
>--
>2.21.0.windows.1
>
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42047): https://edk2.groups.io/g/devel/message/42047
Mute This Topic: https://groups.io/mt/31975707/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
Posted by Ard Biesheuvel 6 years, 8 months ago 
On Mon, 10 Jun 2019 at 02:33, Liming Gao <liming.gao@intel.com> wrote:
>
> Pete:
>   The change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>
>
>   In fact, I send this patch before. https://edk2.groups.io/g/devel/message/41480?p=,,,20,0,0,0::Created,,Network,20,2,0,31819937

Apologies for that, I will look at those now.

>   But, I don't get the response. Then,  I think this platform is out of maintain.
>

On the contrary: Pete just spent a tremendous amount of energy
contributing it, so it is certainly not unmaintained. I just lost
track of all the patches flying around right before we entered the
soft freeze.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42078): https://edk2.groups.io/g/devel/message/42078
Mute This Topic: https://groups.io/mt/31975707/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
Posted by Ard Biesheuvel 6 years, 8 months ago 
On Mon, 10 Jun 2019 at 09:49, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
>
> On Mon, 10 Jun 2019 at 02:33, Liming Gao <liming.gao@intel.com> wrote:
> >
> > Pete:
> >   The change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>
> >
> >   In fact, I send this patch before. https://edk2.groups.io/g/devel/message/41480?p=,,,20,0,0,0::Created,,Network,20,2,0,31819937
>
> Apologies for that, I will look at those now.
>
> >   But, I don't get the response. Then,  I think this platform is out of maintain.
> >
>
> On the contrary: Pete just spent a tremendous amount of energy
> contributing it, so it is certainly not unmaintained. I just lost
> track of all the patches flying around right before we entered the
> soft freeze.

OK, I will take Pete's version of the patches, since it also fixes the
AXIS usb networking issue.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42085): https://edk2.groups.io/g/devel/message/42085
Mute This Topic: https://groups.io/mt/31975707/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
Posted by Liming Gao 6 years, 8 months ago 
Ard:

> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Monday, June 10, 2019 6:23 PM
> To: edk2-devel-groups-io <devel@edk2.groups.io>; Gao, Liming <liming.gao@intel.com>
> Cc: pete@akeo.ie; leif.lindholm@linaro.org
> Subject: Re: [edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
> 
> On Mon, 10 Jun 2019 at 09:49, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> >
> > On Mon, 10 Jun 2019 at 02:33, Liming Gao <liming.gao@intel.com> wrote:
> > >
> > > Pete:
> > >   The change is good. Reviewed-by: Liming Gao <liming.gao@intel.com>
> > >
> > >   In fact, I send this patch before. https://edk2.groups.io/g/devel/message/41480?p=,,,20,0,0,0::Created,,Network,20,2,0,31819937
> >
> > Apologies for that, I will look at those now.
> >
> > >   But, I don't get the response. Then,  I think this platform is out of maintain.
> > >
> >
> > On the contrary: Pete just spent a tremendous amount of energy
> > contributing it, so it is certainly not unmaintained. I just lost
> > track of all the patches flying around right before we entered the
> > soft freeze.
> 
> OK, I will take Pete's version of the patches, since it also fixes the
> AXIS usb networking issue.

OK to me. Thanks for your following up. 

Thanks
Liming

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42099): https://edk2.groups.io/g/devel/message/42099
Mute This Topic: https://groups.io/mt/31975707/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [edk2-platforms: PATCH v2 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
Posted by Leif Lindholm 6 years, 8 months ago 
Liming,

On Mon, Jun 10, 2019 at 01:35:35PM +0000, Gao, Liming wrote:
> > > contributing it, so it is certainly not unmaintained. I just lost
> > > track of all the patches flying around right before we entered the
> > > soft freeze.
> > 
> > OK, I will take Pete's version of the patches, since it also fixes the
> > AXIS usb networking issue.
> 
> OK to me. Thanks for your following up. 

For clarity:
I pushed Pete's patches, since I had some comments on v1.
The networking one is now in the tree as cf5d0a48c1.

Best Regards,

Leif

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42102): https://edk2.groups.io/g/devel/message/42102
Mute This Topic: https://groups.io/mt/31975707/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.