[v2] OvmfPkg: RiscVVirt: Fix network drivers not be built

[edk2-devel] [PATCH v2] OvmfPkg: RiscVVirt: Fix network drivers not be built

Posted by Tuan Phan 3 months, 2 weeks ago

Only need to include Network.dsc.inc to have all network
drivers/components be built. Otherwise, there were missing definition
that prevent them from be built for RiscVVirt platform.

Signed-off-by: Tuan Phan <tphan@ventanamicro.com>
---
v2:
 - Rebase

 OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
index f8b9479345d7..774dc8184049 100644
--- a/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
+++ b/OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
@@ -52,6 +52,7 @@
 
 
 !include MdePkg/MdeLibs.dsc.inc
+!include NetworkPkg/Network.dsc.inc
 
 [BuildOptions]
   GCC:RELEASE_*_*_CC_FLAGS       = -DMDEPKG_NDEBUG
@@ -69,8 +70,6 @@
 #
 ################################################################################
 
-!include NetworkPkg/NetworkDefines.dsc.inc
-
 !include OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
 
 !include MdePkg/MdeLibs.dsc.inc
@@ -126,8 +125,6 @@
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
   PciExpressLib|OvmfPkg/Library/BaseCachingPciExpressLib/BaseCachingPciExpressLib.inf
 
-#!include NetworkPkg/NetworkBuildOptions.dsc.inc
-
 ################################################################################
 #
 # Pcd Section - list of all EDK II PCD Entries defined by this Platform.
@@ -166,11 +163,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialClockRate|3686400
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterStride|1
 
-  #
-  # Network Pcds
-  #
-!include NetworkPkg/NetworkPcds.dsc.inc
-
   gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
   gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
 
@@ -399,11 +391,6 @@
       NULL|OvmfPkg/Library/BlobVerifierLibNull/BlobVerifierLibNull.inf
   }
 
-  #
-  # Networking stack
-  #
-!include NetworkPkg/NetworkComponents.dsc.inc
-
   NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {
     <LibraryClasses>
       NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf
-- 
2.25.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113778): https://edk2.groups.io/g/devel/message/113778
Mute This Topic: https://groups.io/mt/103695672/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v2] OvmfPkg: RiscVVirt: Fix network drivers not be built

Posted by Sunil V L 3 months, 2 weeks ago

On Fri, Jan 12, 2024 at 05:05:26PM -0800, Tuan Phan wrote:
> Only need to include Network.dsc.inc to have all network
> drivers/components be built. Otherwise, there were missing definition
> that prevent them from be built for RiscVVirt platform.
> 
> Signed-off-by: Tuan Phan <tphan@ventanamicro.com>
> ---
> v2:
>  - Rebase
> 
>  OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)
> 
Merged as #5260.

Thanks,
Sunil


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113798): https://edk2.groups.io/g/devel/message/113798
Mute This Topic: https://groups.io/mt/103695672/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v2] OvmfPkg: RiscVVirt: Fix network drivers not be built

Posted by Sunil V L 3 months, 2 weeks ago

On Fri, Jan 12, 2024 at 05:05:26PM -0800, Tuan Phan wrote:
> Only need to include Network.dsc.inc to have all network
> drivers/components be built. Otherwise, there were missing definition
> that prevent them from be built for RiscVVirt platform.
> 
> Signed-off-by: Tuan Phan <tphan@ventanamicro.com>
> ---
> v2:
>  - Rebase
> 
>  OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc | 15 +--------------
>  1 file changed, 1 insertion(+), 14 deletions(-)
> 
Thanks for the patch, Tuan. Sorry, I missed to merge earlier.

Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113789): https://edk2.groups.io/g/devel/message/113789
Mute This Topic: https://groups.io/mt/103695672/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-