From b3b3cfab7eb52acd77558a9727196e30d05d1f2a Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 8 Nov 2024 10:11:53 +0100 Subject: [PATCH] OvmfPkg: move VirtioNet to NetworkComponents.dsc.inc Allows to update VirtioNet driver configuration without touching all *.dsc files. Signed-off-by: Gerd Hoffmann --- OvmfPkg/CloudHv/CloudHvX64.dsc | 2 -- OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc | 3 +++ OvmfPkg/Microvm/MicrovmX64.dsc | 2 -- OvmfPkg/OvmfPkgIa32.dsc | 2 -- OvmfPkg/OvmfPkgIa32X64.dsc | 2 -- OvmfPkg/OvmfPkgX64.dsc | 2 -- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index 3ec4faa74a..db6389ad91 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -830,8 +830,6 @@ !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - OvmfPkg/VirtioNetDxe/VirtioNet.inf - !if $(TOOL_CHAIN_TAG) != "XCODE5" ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { diff --git a/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc b/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc index 42455c2d48..28515d6e4f 100644 --- a/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc +++ b/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc @@ -34,4 +34,7 @@ gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/IPv6Support" } !endif + + OvmfPkg/VirtioNetDxe/VirtioNet.inf + !endif diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 81af41ef6f..55211d88aa 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -831,8 +831,6 @@ !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - OvmfPkg/VirtioNetDxe/VirtioNet.inf - # # Usb Support # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 8b8d5124ec..3b17952b86 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -871,8 +871,6 @@ !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - OvmfPkg/VirtioNetDxe/VirtioNet.inf - # # Usb Support # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 68b0d4b2ea..a054d8774d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -884,8 +884,6 @@ !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - OvmfPkg/VirtioNetDxe/VirtioNet.inf - # # Usb Support # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 846444b949..7af5d47273 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -949,8 +949,6 @@ !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - OvmfPkg/VirtioNetDxe/VirtioNet.inf - # # Usb Support #