diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2025-05-09 12:33:26 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2025-07-04 13:44:21 +0000 |
| commit | 3798da443eaba572ea432ebe2c576a9edfa5573e (patch) | |
| tree | 3c32d979560bca2b4bf9d6bee5a8e284b7888574 | |
| parent | 57b9a6235cf8571f65dbd2026e74940e0cff82f9 (diff) | |
| download | edk2-3798da443eaba572ea432ebe2c576a9edfa5573e.zip edk2-3798da443eaba572ea432ebe2c576a9edfa5573e.tar.gz edk2-3798da443eaba572ea432ebe2c576a9edfa5573e.tar.bz2 | |
OvmfPkg: switch IntelTdx to OptHw include files.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | OvmfPkg/IntelTdx/IntelTdxX64.dsc | 14 | ||||
| -rw-r--r-- | OvmfPkg/IntelTdx/IntelTdxX64.fdf | 10 |
2 files changed, 3 insertions, 21 deletions
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc index f1b85b2..637dc7d 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc @@ -39,9 +39,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
@@ -641,15 +639,6 @@ OvmfPkg/Virtio10Dxe/Virtio10.inf
OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
OvmfPkg/VirtioScsiDxe/VirtioScsi.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
@@ -724,6 +713,7 @@ !include OvmfPkg/Include/Dsc/ShellComponents.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/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX64.fdf index c05761a..da48f67 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -291,15 +291,6 @@ READ_LOCK_STATUS = TRUE #
INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
INF OvmfPkg/VirtioScsiDxe/VirtioScsi.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
INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf
INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
@@ -332,6 +323,7 @@ INF OvmfPkg/PlatformDxe/Platform.inf !include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
!include OvmfPkg/Include/Fdf/OvmfRngDxe.fdf.inc
+!include OvmfPkg/Include/Fdf/OvmfOptHw.fdf.inc
################################################################################
|