2024-05-15 07:15:17 +00:00
|
|
|
From ce3ac92a202a0b845654c05449107840edf5d2f9 Mon Sep 17 00:00:00 2001
|
2022-05-17 08:46:22 +00:00
|
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
|
|
Date: Thu, 1 Jul 2021 20:28:49 +0200
|
2024-05-15 07:15:17 +00:00
|
|
|
Subject: [PATCH] OvmfPkg: Remove EbcDxe (RHEL only)
|
2022-05-17 08:46:22 +00:00
|
|
|
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: [2/19] 6777c3dc453e4aecddc20216f783ba2a5acccaa0
|
|
|
|
|
RH-Bugzilla: 1967747
|
|
|
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
|
|
|
|
|
|
Remove EFI Byte Code interpreter.
|
|
|
|
|
|
|
|
|
|
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 | 1 -
|
|
|
|
|
OvmfPkg/AmdSev/AmdSevX64.fdf | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgIa32.dsc | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgX64.dsc | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
|
|
|
8 files changed, 8 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
index a0319c1f0a..906c1a4332 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
|
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
@@ -613,7 +613,6 @@
|
2023-11-08 12:25:58 +00:00
|
|
|
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
2022-05-17 08:46:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
|
|
|
|
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
2024-05-15 07:15:17 +00:00
|
|
|
index b2ab0c7773..20d31d0e2d 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
|
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
|
|
|
@@ -205,7 +205,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
|
|
|
|
|
|
|
|
|
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
|
|
|
|
|
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
|
|
|
|
|
-INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
|
|
|
|
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
index 34ad4f2777..d664b42c67 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
@@ -753,7 +753,6 @@
|
2023-11-08 12:25:58 +00:00
|
|
|
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
2022-05-17 08:46:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
|
|
|
|
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
!ifdef $(CSM_ENABLE)
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
2024-05-15 07:15:17 +00:00
|
|
|
index 383613e54b..236680dec2 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
2022-11-15 06:26:23 +00:00
|
|
|
@@ -216,7 +216,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
|
|
|
|
|
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
|
|
|
|
|
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
|
|
|
|
|
-INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
|
|
|
|
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
!ifdef $(CSM_ENABLE)
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
index 4278ce5e1d..2e0af7698a 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
@@ -771,7 +771,6 @@
|
2023-11-08 12:25:58 +00:00
|
|
|
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
2022-05-17 08:46:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
|
|
|
|
UefiCpuPkg/CpuDxe/CpuDxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
!ifdef $(CSM_ENABLE)
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2024-05-15 07:15:17 +00:00
|
|
|
index 3cec3d0c87..3ad2fe5eee 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2022-11-15 06:26:23 +00:00
|
|
|
@@ -217,7 +217,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
|
|
|
|
|
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
|
|
|
|
|
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
|
|
|
|
|
-INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
|
|
|
|
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
!ifdef $(CSM_ENABLE)
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
index e41a1b976e..55f6760f4c 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
@@ -816,7 +816,6 @@
|
2023-11-08 12:25:58 +00:00
|
|
|
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
|
2022-05-17 08:46:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
|
|
|
|
|
UefiCpuPkg/CpuDxe/CpuDxe.inf {
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
2024-05-15 07:15:17 +00:00
|
|
|
index 9c35b6e848..da4541d747 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
2022-11-15 06:26:23 +00:00
|
|
|
@@ -239,7 +239,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
|
|
|
|
|
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
|
|
|
|
|
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
|
|
|
|
|
-INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
|
|
|
|
|
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf
|
2022-11-15 06:26:23 +00:00
|
|
|
|
2022-05-17 08:46:22 +00:00
|
|
|
INF UefiCpuPkg/CpuDxe/CpuDxe.inf
|
