From faf600ccc76cf235c399d866ba7db52da8cea46c Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 9 May 2025 11:23:42 +0200 Subject: [PATCH] OvmfPkg: move scsi drivers to new OptHw include files Signed-off-by: Gerd Hoffmann --- OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc | 15 +++++++++++++++ OvmfPkg/Include/Dsc/OvmfOptHwDefines.dsc.inc | 9 +++++++++ OvmfPkg/Include/Fdf/OvmfOptHw.fdf.inc | 15 +++++++++++++++ OvmfPkg/OvmfPkgX64.dsc | 14 ++------------ OvmfPkg/OvmfPkgX64.fdf | 10 +--------- 5 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc create mode 100644 OvmfPkg/Include/Dsc/OvmfOptHwDefines.dsc.inc create mode 100644 OvmfPkg/Include/Fdf/OvmfOptHw.fdf.inc diff --git a/OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc b/OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc new file mode 100644 index 0000000000..faf049e754 --- /dev/null +++ b/OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc @@ -0,0 +1,15 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# optional hardware support components +## + +!if $(PVSCSI_ENABLE) == TRUE + OvmfPkg/PvScsiDxe/PvScsiDxe.inf +!endif +!if $(MPT_SCSI_ENABLE) == TRUE + OvmfPkg/MptScsiDxe/MptScsiDxe.inf +!endif +!if $(LSI_SCSI_ENABLE) == TRUE + OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf +!endif diff --git a/OvmfPkg/Include/Dsc/OvmfOptHwDefines.dsc.inc b/OvmfPkg/Include/Dsc/OvmfOptHwDefines.dsc.inc new file mode 100644 index 0000000000..54a631ada6 --- /dev/null +++ b/OvmfPkg/Include/Dsc/OvmfOptHwDefines.dsc.inc @@ -0,0 +1,9 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# optional hardware support components +## + + DEFINE PVSCSI_ENABLE = FALSE + DEFINE MPT_SCSI_ENABLE = FALSE + DEFINE LSI_SCSI_ENABLE = FALSE diff --git a/OvmfPkg/Include/Fdf/OvmfOptHw.fdf.inc b/OvmfPkg/Include/Fdf/OvmfOptHw.fdf.inc new file mode 100644 index 0000000000..60698d0a3c --- /dev/null +++ b/OvmfPkg/Include/Fdf/OvmfOptHw.fdf.inc @@ -0,0 +1,15 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +# optional hardware support components +## + +!if $(PVSCSI_ENABLE) == TRUE +INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf +!endif +!if $(MPT_SCSI_ENABLE) == TRUE +INF OvmfPkg/MptScsiDxe/MptScsiDxe.inf +!endif +!if $(LSI_SCSI_ENABLE) == TRUE +INF OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf +!endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index cdb815c4b6..20e73588e4 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -58,9 +58,7 @@ # # Device drivers # - DEFINE PVSCSI_ENABLE = FALSE - DEFINE MPT_SCSI_ENABLE = FALSE - DEFINE LSI_SCSI_ENABLE = FALSE +!include OvmfPkg/Include/Dsc/OvmfOptHwDefines.dsc.inc # # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to @@ -946,15 +944,6 @@ OvmfPkg/VirtioScsiDxe/VirtioScsi.inf OvmfPkg/VirtioSerialDxe/VirtioSerial.inf OvmfPkg/VirtioKeyboardDxe/VirtioKeyboard.inf -!if $(PVSCSI_ENABLE) == TRUE - OvmfPkg/PvScsiDxe/PvScsiDxe.inf -!endif -!if $(MPT_SCSI_ENABLE) == TRUE - OvmfPkg/MptScsiDxe/MptScsiDxe.inf -!endif -!if $(LSI_SCSI_ENABLE) == TRUE - OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf -!endif MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf @@ -1036,6 +1025,7 @@ !include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc !include OvmfPkg/Include/Dsc/MorLock.dsc.inc !include OvmfPkg/Include/Dsc/OvmfRngComponents.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfOptHwComponents.dsc.inc !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 046d74f9b7..b332d3bb8e 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -278,15 +278,6 @@ INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf INF OvmfPkg/VirtioKeyboardDxe/VirtioKeyboard.inf -!if $(PVSCSI_ENABLE) == TRUE -INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf -!endif -!if $(MPT_SCSI_ENABLE) == TRUE -INF OvmfPkg/MptScsiDxe/MptScsiDxe.inf -!endif -!if $(LSI_SCSI_ENABLE) == TRUE -INF OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf -!endif !if $(SECURE_BOOT_ENABLE) == TRUE INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -449,6 +440,7 @@ INF OvmfPkg/Tcg/TdTcg2Dxe/TdTcg2Dxe.inf !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc !include OvmfPkg/Include/Fdf/MorLock.fdf.inc !include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc +!include OvmfPkg/Include/Fdf/OvmfOptHw.fdf.inc # # Smbios Measurement support