[PATCH 0/2] RaspberryPi/RPi3: Minor updates to platform

[PATCH 0/2] RaspberryPi/RPi3: Minor updates to platform

[Pete Batard]

The following 2 patches provide minor updates for the Raspberry Pi 3
platform, by enabling the use of the RAM Disk feature as well as the
new network stack fragment file.

Pete Batard (2):
  RaspberryPi/RPi3: Enable RAM Disk
  RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF

 Platform/RaspberryPi/RPi3/RPi3.dsc | 37 +++++++++-----------
 Platform/RaspberryPi/RPi3/RPi3.fdf | 17 ++++-----
 2 files changed, 23 insertions(+), 31 deletions(-)

-- 
2.21.0.windows.1

[PATCH 1/2] RaspberryPi/RPi3: Enable RAM Disk

[Pete Batard]

Also remove UsbNetworking/Ax88772b/Ax88772b.inf references since
this module is no longer present.

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

diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 53b87ba4e5e0..f87d06f9b080 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -541,6 +541,11 @@ [Components.common]
   Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
   MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 
+  #
+  # RAM Disk Support
+  #
+  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
+
   #
   # Bds
   #
@@ -571,7 +576,6 @@ [Components.common]
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
   MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-  OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
 
   #
   # SD/MMC support
diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
index cf4b99a5e9b7..3bd2be314401 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -247,6 +247,11 @@ [FV.FvMain]
   INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 
+  #
+  # RAM Disk Support
+  #
+  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
+
   #
   # Bds
   #
@@ -289,7 +294,6 @@ [FV.FvMain]
   INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
   INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
-  INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
 
   #
   # SD/MMC support
-- 
2.21.0.windows.1

Re: [PATCH 1/2] RaspberryPi/RPi3: Enable RAM Disk

[Leif Lindholm]

On Fri, Jun 07, 2019 at 02:55:57PM +0100, Pete Batard wrote:
> Also remove UsbNetworking/Ax88772b/Ax88772b.inf references since
> this module is no longer present.

This driver moved to edk2-platforms, under
Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/

(No issues with the rest of this patch, but figure you may want to
respin based on the above.)

/
    Leif

> Signed-off-by: Pete Batard <pete@akeo.ie>
> ---
>  Platform/RaspberryPi/RPi3/RPi3.dsc | 6 +++++-
>  Platform/RaspberryPi/RPi3/RPi3.fdf | 6 +++++-
>  2 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
> index 53b87ba4e5e0..f87d06f9b080 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc
> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
> @@ -541,6 +541,11 @@ [Components.common]
>    Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>    MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>  
> +  #
> +  # RAM Disk Support
> +  #
> +  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
> +
>    #
>    # Bds
>    #
> @@ -571,7 +576,6 @@ [Components.common]
>    MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>    MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> -  OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
>  
>    #
>    # SD/MMC support
> diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
> index cf4b99a5e9b7..3bd2be314401 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.fdf
> +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
> @@ -247,6 +247,11 @@ [FV.FvMain]
>    INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>    INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>  
> +  #
> +  # RAM Disk Support
> +  #
> +  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
> +
>    #
>    # Bds
>    #
> @@ -289,7 +294,6 @@ [FV.FvMain]
>    INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>    INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>    INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
> -  INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
>  
>    #
>    # SD/MMC support
> -- 
> 2.21.0.windows.1
> 

Re: [PATCH 1/2] RaspberryPi/RPi3: Enable RAM Disk

[Pete Batard]

Hi Leif,

On 2019.06.07 15:30, Leif Lindholm wrote:
> 
> On Fri, Jun 07, 2019 at 02:55:57PM +0100, Pete Batard wrote:
>> Also remove UsbNetworking/Ax88772b/Ax88772b.inf references since
>> this module is no longer present.
> 
> This driver moved to edk2-platforms, under
> Drivers/OptionRomPkg/Bus/Usb/UsbNetworking/

Thanks, I missed that. v2 coming up.

Regards,

/Pete

> 
> (No issues with the rest of this patch, but figure you may want to
> respin based on the above.)
> 
> /
>      Leif
> 
>> Signed-off-by: Pete Batard <pete@akeo.ie>
>> ---
>>   Platform/RaspberryPi/RPi3/RPi3.dsc | 6 +++++-
>>   Platform/RaspberryPi/RPi3/RPi3.fdf | 6 +++++-
>>   2 files changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
>> index 53b87ba4e5e0..f87d06f9b080 100644
>> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc
>> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
>> @@ -541,6 +541,11 @@ [Components.common]
>>     Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>>     MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>>   
>> +  #
>> +  # RAM Disk Support
>> +  #
>> +  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
>> +
>>     #
>>     # Bds
>>     #
>> @@ -571,7 +576,6 @@ [Components.common]
>>     MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>>     MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>>     MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
>> -  OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
>>   
>>     #
>>     # SD/MMC support
>> diff --git a/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
>> index cf4b99a5e9b7..3bd2be314401 100644
>> --- a/Platform/RaspberryPi/RPi3/RPi3.fdf
>> +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
>> @@ -247,6 +247,11 @@ [FV.FvMain]
>>     INF Platform/RaspberryPi/$(PLATFORM_NAME)/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
>>     INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
>>   
>> +  #
>> +  # RAM Disk Support
>> +  #
>> +  INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
>> +
>>     #
>>     # Bds
>>     #
>> @@ -289,7 +294,6 @@ [FV.FvMain]
>>     INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
>>     INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
>>     INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
>> -  INF OptionRomPkg/Bus/Usb/UsbNetworking/Ax88772b/Ax88772b.inf
>>   
>>     #
>>     # SD/MMC support
>> -- 
>> 2.21.0.windows.1
>>

[PATCH 2/2] RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF

[Pete Batard]

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 f87d06f9b080..7c9ee5ef4802 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
@@ -587,16 +589,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 3bd2be314401..f2c0ee09af1e 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

Re: [PATCH 0/2] RaspberryPi/RPi3: Minor updates to platform

[Leif Lindholm]

On Fri, Jun 07, 2019 at 02:55:56PM +0100, Pete Batard wrote:
> The following 2 patches provide minor updates for the Raspberry Pi 3
> platform, by enabling the use of the RAM Disk feature as well as the
> new network stack fragment file.

I took the liberty of splitting 1/2 up into its separate logical
components before pushing.

For the series:
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Pushed as 5752f09f7e..cf5d0a48c1.

Thanks!

> Pete Batard (2):
>   RaspberryPi/RPi3: Enable RAM Disk
>   RaspberryPi/RPi3: Update DSC/FDF to use NetworkPkg DSC/FDF
> 
>  Platform/RaspberryPi/RPi3/RPi3.dsc | 37 +++++++++-----------
>  Platform/RaspberryPi/RPi3/RPi3.fdf | 17 ++++-----
>  2 files changed, 23 insertions(+), 31 deletions(-)
> 
> -- 
> 2.21.0.windows.1
>