From 5be587067ae742b6d2f7157cbff733afcba0f4fe Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 4 Dec 2024 13:26:54 +0100 Subject: [PATCH] OvmfPkg: move USB drivers to new UsbComponents.dsc.inc Allows to update USB driver configuration without touching all *.dsc files. Signed-off-by: Gerd Hoffmann --- OvmfPkg/Include/Dsc/UsbComponents.dsc.inc | 12 ++++++++++++ OvmfPkg/OvmfPkgIa32.dsc | 12 +----------- OvmfPkg/OvmfPkgIa32X64.dsc | 12 +----------- OvmfPkg/OvmfPkgX64.dsc | 12 +----------- 4 files changed, 15 insertions(+), 33 deletions(-) create mode 100644 OvmfPkg/Include/Dsc/UsbComponents.dsc.inc diff --git a/OvmfPkg/Include/Dsc/UsbComponents.dsc.inc b/OvmfPkg/Include/Dsc/UsbComponents.dsc.inc new file mode 100644 index 0000000000..7480822eae --- /dev/null +++ b/OvmfPkg/Include/Dsc/UsbComponents.dsc.inc @@ -0,0 +1,12 @@ +## +# USB Support +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + + MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf + MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf + MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf + MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf + MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 3b17952b86..315b4fd04a 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -870,17 +870,7 @@ # !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - - # - # Usb Support - # - MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf - MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf - MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf - MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - +!include OvmfPkg/Include/Dsc/UsbComponents.dsc.inc !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc !include OvmfPkg/Include/Dsc/MorLock.dsc.inc !include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index a054d8774d..a77c7d0c14 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -883,17 +883,7 @@ # !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - - # - # Usb Support - # - MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf - MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf - MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf - MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - +!include OvmfPkg/Include/Dsc/UsbComponents.dsc.inc !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc !include OvmfPkg/Include/Dsc/MorLock.dsc.inc !include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 7af5d47273..c741955f98 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -948,17 +948,7 @@ # !include NetworkPkg/NetworkComponents.dsc.inc !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc - - # - # Usb Support - # - MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf - MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf - MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf - MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf - MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf - MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - +!include OvmfPkg/Include/Dsc/UsbComponents.dsc.inc !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc !include OvmfPkg/Include/Dsc/MorLock.dsc.inc !include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc