Re: [PATCH] UefiPayloadPkg: Include Network modules in UefiPayloadPkg.

Re: [PATCH] UefiPayloadPkg: Include Network modules in UefiPayloadPkg.

[Guo Dong]

It would be better if the FD size could change based on features as below, but it looks the FDF doesn't support expression ☹
!if $(NETWORK_DRIVER_ENABLE) == TRUE
  $(NUM_BLOCKS)   += 0x170
!endif
DEFINE FD_SIZE     = $(NUM_BLOCKS)   * $(FD_BLOCK_SIZE)

Reviewed-by: Guo Dong <guo.dong@intel.com>

Thanks,
Guo

-----Original Message-----
From: Sravanthi, K KavyaX <k.kavyax.sravanthi@intel.com> 
Sent: Monday, August 23, 2021 10:40 PM
To: devel@edk2.groups.io
Cc: Sravanthi, K KavyaX <k.kavyax.sravanthi@intel.com>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Ma, Maurice <maurice.ma@intel.com>; You, Benjamin <benjamin.you@intel.com>
Subject: [PATCH] UefiPayloadPkg: Include Network modules in UefiPayloadPkg.

From: Sravanthi <k.kavyax.sravanthi@intel.com>

Include Network modules in UefiPayloadPkg.dsc and UefiPayloadPkg.fdf

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Signed-off-by: Sravanthi <k.kavyax.sravanthi@intel.com>
---
 UefiPayloadPkg/UefiPayloadPkg.dsc |  9 +++++++++  UefiPayloadPkg/UefiPayloadPkg.fdf | 11 +++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
index ff02ac6103..8691cb217a 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -92,6 +92,7 @@
   DEFINE DISABLE_RESET_SYSTEM  = FALSE
   DEFINE SECURE_BOOT_ENABLE    = TRUE
   DEFINE ENABLE_TCG_SUPPORT    = TRUE
+  DEFINE NETWORK_DRIVER_ENABLE = TRUE
 
   # Dfine the maximum size of the capsule image without a reset flag that the platform can support.
   DEFINE MAX_SIZE_NON_POPULATE_CAPSULE = 0xa00000 @@ -167,6 +168,7 @@
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
   RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf
+  TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
 
 !if $(UNIVERSAL_PAYLOAD) == TRUE
   HobLib|UefiPayloadPkg/Library/DxeHobLib/DxeHobLib.inf
@@ -452,6 +454,13 @@
   !endif
 !endif
 
+#
+# UEFI network modules
+#
+!if $(NETWORK_DRIVER_ENABLE) == TRUE
+  !include NetworkPkg/Network.dsc.inc
+!endif
+
 [Components.X64]
   #
   # DXE Core
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index afb57612f7..1b6c93c961 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -17,8 +17,8 @@ DEFINE FD_SIZE     = 0x00850000
 DEFINE NUM_BLOCKS  = 0x850
 !else
 
-DEFINE FD_SIZE     = 0x00470000
-DEFINE NUM_BLOCKS  = 0x470
+DEFINE FD_SIZE     = 0x00640000
+DEFINE NUM_BLOCKS  = 0x640
 !endif
 
 ################################################################################
@@ -214,6 +214,13 @@ INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf  INF SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
 !endif
 
+#
+# UEFI network modules
+#
+!if $(NETWORK_DRIVER_ENABLE) == TRUE
+  !include NetworkPkg/Network.fdf.inc
+!endif
+
 #
 # Shell
 #
--
2.30.2.windows.1