diff options
| author | Pierre Gondois <pierre.gondois@arm.com> | 2026-05-13 10:15:23 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2026-06-03 18:55:50 +0000 |
| commit | 2d4217b17e0fd263e43b0b471c122a9ab8d47bba (patch) | |
| tree | a57abe41a119b6422132abdfc4533faf7ccdb49b /ArmVirtPkg | |
| parent | 81004b09c8cb7988a80a55d091c98d787f98504b (diff) | |
| download | edk2-2d4217b17e0fd263e43b0b471c122a9ab8d47bba.tar.gz edk2-2d4217b17e0fd263e43b0b471c122a9ab8d47bba.zip | |
ArmVirtPkg: Factorize SCSI Bus and Disk Driver components
Move the SCSI Bus and Disk Driver components to
the common ArmVirtPkg.dsc.inc file.
No functional change.
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Diffstat (limited to 'ArmVirtPkg')
| -rw-r--r-- | ArmVirtPkg/ArmVirt.dsc.inc | 10 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtCloudHv.dsc | 6 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtKvmTool.dsc | 5 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemu.dsc | 6 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 6 |
5 files changed, 10 insertions, 23 deletions
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 194be2891e..fcafba2dc8 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -20,8 +20,10 @@ !if $(PLAT_XEN) == TRUE
DEFINE ENABLE_VIRTIO = FALSE
+ DEFINE ENABLE_SCSI = FALSE
!else
DEFINE ENABLE_VIRTIO = TRUE
+ DEFINE ENABLE_SCSI = TRUE
!endif
# Various builds now exceed 2MB so choose 3MB as the default.
@@ -506,6 +508,14 @@ DEFINE FD_SIZE_IN_MB = 3 !endif
#
+ # SCSI Bus and Disk Driver
+ #
+!if $(ENABLE_SCSI)
+ MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
+ MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
+!endif
+
+ #
# ACPI Support
#
MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf {
diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index b7b88f2657..69ee646074 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -247,12 +247,6 @@ OvmfPkg/VirtioNetDxe/VirtioNet.inf
#
- # SCSI Bus and Disk Driver
- #
- MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-
- #
# PCI support
#
UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf {
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index df9d599a3c..f1a375300d 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -265,11 +265,6 @@ OvmfPkg/VirtioNetDxe/VirtioNet.inf
#
- # SCSI Bus and Disk Driver
- #
- MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
- #
# PCI support
#
UefiCpuPkg/CpuMmio2Dxe/CpuMmio2Dxe.inf {
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index ed370f2d2e..7e65df9e4c 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -454,12 +454,6 @@ !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
#
- # SCSI Bus and Disk Driver
- #
- MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-
- #
# NVME Driver
#
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index cfd6b2df5f..f2ab49e3c5 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -339,12 +339,6 @@ !include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
#
- # SCSI Bus and Disk Driver
- #
- MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
- MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
-
- #
# NVME Driver
#
MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
|