f1fb020ba0
- Rebase to latest upstream release [bz#2018388] - Resolves: bz#2018388 ([rebase] update edk2 to nov '21 release (edk2-stable202111xx))
77 lines
2.3 KiB
Diff
77 lines
2.3 KiB
Diff
From c165681779351c785d6e1946d6b861b71d07fb3f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Thu, 1 Jul 2021 20:29:10 +0200
|
|
Subject: ArmVirtPkg: Remove NvmExpressDxe device driver (RHEL only)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
RH-MergeRequest: 3: Disable features for RHEL9
|
|
RH-Commit: [8/19] d07dd11cb7a59c5af361ff5f801b7cfe421bce14
|
|
RH-Bugzilla: 1967747
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
There is no real known use case for the NVME driver.
|
|
|
|
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
ArmVirtPkg/ArmVirtQemu.dsc | 5 -----
|
|
ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 5 -----
|
|
ArmVirtPkg/ArmVirtQemuKernel.dsc | 5 -----
|
|
3 files changed, 15 deletions(-)
|
|
|
|
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
index 6677283c21..dff238fbdd 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemu.dsc
|
|
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
|
|
@@ -476,11 +476,6 @@
|
|
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
|
|
|
- #
|
|
- # NVME Driver
|
|
- #
|
|
- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
|
|
-
|
|
#
|
|
# SMBIOS Support
|
|
#
|
|
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
index 2b51ac4a6d..9449daa5af 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
|
|
@@ -127,11 +127,6 @@ READ_LOCK_STATUS = TRUE
|
|
INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
|
|
INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
|
|
|
- #
|
|
- # NVME Driver
|
|
- #
|
|
- INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
|
|
-
|
|
#
|
|
# SMBIOS Support
|
|
#
|
|
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
index 1ab8d6b999..1603a635a9 100644
|
|
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
|
|
@@ -405,11 +405,6 @@
|
|
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
|
|
|
- #
|
|
- # NVME Driver
|
|
- #
|
|
- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
|
|
-
|
|
#
|
|
# SMBIOS Support
|
|
#
|
|
--
|
|
2.27.0
|
|
|