f1fb020ba0
- Rebase to latest upstream release [bz#2018388] - Resolves: bz#2018388 ([rebase] update edk2 to nov '21 release (edk2-stable202111xx))
142 lines
4.6 KiB
Diff
142 lines
4.6 KiB
Diff
From 5f2032eca0be1191d8485eeba4005f4d0a3af879 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
Date: Fri, 2 Jul 2021 20:15:40 +0200
|
|
Subject: OvmfPkg: Remove QemuRamfbDxe display 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: [5/19] 657c6d4406600a34ad57cd0f93018716d73f2cd1
|
|
RH-Bugzilla: 1967747
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
The ramfb display device driver is not needed for RHEL.
|
|
|
|
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ----
|
|
OvmfPkg/AmdSev/AmdSevX64.fdf | 1 -
|
|
OvmfPkg/OvmfPkgIa32.dsc | 4 ----
|
|
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
|
|
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
OvmfPkg/OvmfPkgX64.dsc | 4 ----
|
|
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
8 files changed, 20 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
index 74e87f1b08..154e318e87 100644
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
@@ -755,10 +755,6 @@
|
|
<PcdsFixedAtBuild>
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
|
|
- <PcdsFixedAtBuild>
|
|
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
- }
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
index d09a193d09..cd86f60270 100644
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
@@ -298,7 +298,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
|
|
|
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
|
|
-INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
index f8ff1c2792..3061d0d796 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
@@ -852,10 +852,6 @@
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
!endif
|
|
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
|
|
- <PcdsFixedAtBuild>
|
|
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
- }
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
index ea7a3f893c..e55c88c84d 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
@@ -323,7 +323,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
|
|
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
!endif
|
|
|
|
-INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
index 4b5f362780..01adc7b648 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
@@ -866,10 +866,6 @@
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
!endif
|
|
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
|
|
- <PcdsFixedAtBuild>
|
|
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
- }
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
index 3c33f0eadd..43a96cc78a 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
@@ -332,7 +332,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
|
|
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
!endif
|
|
|
|
-INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
index 89dcdb8bba..bcbc17fba4 100644
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
@@ -864,10 +864,6 @@
|
|
gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
}
|
|
!endif
|
|
- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf {
|
|
- <PcdsFixedAtBuild>
|
|
- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F
|
|
- }
|
|
|
|
#
|
|
# ISA Support
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
index e7bf0da02b..e992ed5f37 100644
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
@@ -348,7 +348,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
|
|
INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
|
|
!endif
|
|
|
|
-INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf
|
|
INF OvmfPkg/PlatformDxe/Platform.inf
|
|
INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf
|
|
INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf
|
|
--
|
|
2.27.0
|
|
|