diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2025-05-09 12:21:49 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2025-07-04 13:44:21 +0000 |
| commit | 55b48c85a8dcfbea0887acc68a7cff6059a1aaa6 (patch) | |
| tree | b6a200265caa2e1ed9dc57606e9c269043b6c384 | |
| parent | faf600ccc76cf235c399d866ba7db52da8cea46c (diff) | |
| download | edk2-55b48c85a8dcfbea0887acc68a7cff6059a1aaa6.zip edk2-55b48c85a8dcfbea0887acc68a7cff6059a1aaa6.tar.gz edk2-55b48c85a8dcfbea0887acc68a7cff6059a1aaa6.tar.bz2 | |
OvmfPkg: switch OvmfPkgIa32X64 to OptHw include files.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32X64.dsc | 14 | ||||
| -rw-r--r-- | OvmfPkg/OvmfPkgIa32X64.fdf | 10 |
2 files changed, 3 insertions, 21 deletions
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index bab9b91..836d9ff 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -56,9 +56,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
@@ -814,15 +812,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
@@ -902,6 +891,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/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 41981d5..081faa5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -244,15 +244,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
@@ -379,6 +370,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.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
################################################################################
|