diff --git a/0002-Remove-submodules.patch b/0002-Remove-submodules.patch new file mode 100644 index 0000000..319ca19 --- /dev/null +++ b/0002-Remove-submodules.patch @@ -0,0 +1,90 @@ +From 6c54a6c652f1d61e4529f294e2572ea52b651e64 Mon Sep 17 00:00:00 2001 +From: Miroslav Rezanina +Date: Thu, 24 Mar 2022 03:23:02 -0400 +Subject: Remove submodules + +Upstream edk2 tracks several submodules we do not need in RHEL (removal +done by individual commits in previous RHEL versions): + +- openssl: We use RHEL specific openssl submodule later (commit 48f993088e) +- SoftFloat: required only for 32-bit ARM (commit 273787a5c2) +- cmocka: needed for UnitTestFrameworkPkg we do not use (commit a2dca9bcd2) +- oniguruma: rhel do not need this dependency (commit 73f4b42b3a) +- brotli: removed this dependency (commits fcd212ffce, cf62a90767 and ac5782e6ab) +- jansson: we do not depend on JSON parsing or formating (commit c84227659a) + +Signed-off-by: Miroslav Rezanina + +MdeModulePkg: remove package-private Brotli include path (RH only) + +Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> +RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: + +- no change + +Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] -> +RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase: + +- New patch. + +Originating from upstream commit 58802e02c41b +("MdeModulePkg/BrotliCustomDecompressLib: Make brotli a submodule", +2020-04-16), "MdeModulePkg/MdeModulePkg.dec" contains a package-internal +include path into a Brotli submodule. + +The edk2 build system requires such include paths to resolve successfully, +regardless of the firmware platform being built. Because +BrotliCustomDecompressLib is not consumed by any OvmfPkg or ArmVirtPkg +platforms, and we've removed the submodule earlier in this patch set, +remove the include path too. + +Signed-off-by: Laszlo Ersek +(cherry picked from commit e05e0de713c4a2b8adb6ff9809611f222bfe50ed) +--- + .gitmodules | 22 ------------------- + .../ArmSoftFloatLib/berkeley-softfloat-3 | 1 - + BaseTools/Source/C/BrotliCompress/brotli | 1 - + BaseTools/Source/C/GNUmakefile | 1 - + CryptoPkg/.gitignore | 1 + + CryptoPkg/Library/OpensslLib/openssl | 1 - + .../Library/BrotliCustomDecompressLib/brotli | 1 - + MdeModulePkg/MdeModulePkg.dec | 3 --- + .../Universal/RegularExpressionDxe/oniguruma | 1 - + RedfishPkg/Library/JsonLib/jansson | 1 - + UnitTestFrameworkPkg/Library/CmockaLib/cmocka | 1 - + 11 files changed, 1 insertion(+), 33 deletions(-) + delete mode 160000 ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 + delete mode 160000 BaseTools/Source/C/BrotliCompress/brotli + create mode 100644 CryptoPkg/.gitignore + delete mode 160000 CryptoPkg/Library/OpensslLib/openssl + delete mode 160000 MdeModulePkg/Library/BrotliCustomDecompressLib/brotli + delete mode 160000 MdeModulePkg/Universal/RegularExpressionDxe/oniguruma + delete mode 160000 RedfishPkg/Library/JsonLib/jansson + delete mode 160000 UnitTestFrameworkPkg/Library/CmockaLib/cmocka + +diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile +index 8c191e0c38..3eae824a1c 100644 +--- a/BaseTools/Source/C/GNUmakefile ++++ b/BaseTools/Source/C/GNUmakefile +@@ -48,7 +48,6 @@ all: makerootdir subdirs + LIBRARIES = Common + VFRAUTOGEN = VfrCompile/VfrLexer.h + APPLICATIONS = \ +- BrotliCompress \ + VfrCompile \ + EfiRom \ + GenFfs \ +diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec +index 463e889e9a..9d69fb86ed 100644 +--- a/MdeModulePkg/MdeModulePkg.dec ++++ b/MdeModulePkg/MdeModulePkg.dec +@@ -24,9 +24,6 @@ + [Includes] + Include + +-[Includes.Common.Private] +- Library/BrotliCustomDecompressLib/brotli/c/include +- + [LibraryClasses] + ## @libraryclass Defines a set of methods to reset whole system. + ResetSystemLib|Include/Library/ResetSystemLib.h diff --git a/0010-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch similarity index 96% rename from 0010-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch rename to 0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch index 014279b..6097f68 100644 --- a/0010-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch +++ b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch @@ -1,4 +1,4 @@ -From a5b59fe4517da90781a43accd05ce5b97ff5de63 Mon Sep 17 00:00:00 2001 +From b7cf93f965db141a2a2c4b22a82019ef70f105ec Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 20 Feb 2014 22:54:45 +0100 Subject: OvmfPkg: increase max debug message length to 512 (RHEL only) @@ -65,7 +65,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c -index dffb20822d..0577c43c3d 100644 +index 4e25f198aa..640627f38b 100644 --- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c +++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c @@ -21,7 +21,7 @@ @@ -78,5 +78,5 @@ index dffb20822d..0577c43c3d 100644 // // VA_LIST can not initialize to NULL for all compiler, so we use this to -- -2.27.0 +2.31.1 diff --git a/0011-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch similarity index 94% rename from 0011-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch rename to 0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch index ae3bfc9..deb5c81 100644 --- a/0011-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch +++ b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch @@ -1,8 +1,12 @@ -From 419ec8370d8da04c33622cf94cd92b086ec095cb Mon Sep 17 00:00:00 2001 +From 87a34da0ea42ec9809238a7907e89768b7568e48 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 18:40:35 +0100 Subject: MdeModulePkg: TerminalDxe: add other text resolutions (RHEL only) +Notes for rebase to edk2-stable202202: + +- Minor context changes due to 1436aea4d MdeModulePkg: Apply uncrustify changes + Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -112,16 +116,16 @@ Signed-off-by: Laszlo Ersek 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -index a98b690c8b..ded5513c74 100644 +index e2d779c783..dfd9c96773 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -@@ -115,9 +115,44 @@ TERMINAL_DEV mTerminalDevTemplate = { +@@ -112,9 +112,44 @@ TERMINAL_DEV mTerminalDevTemplate = { }; - TERMINAL_CONSOLE_MODE_DATA mTerminalConsoleModeData[] = { -- {80, 25}, -- {80, 50}, -- {100, 31}, + TERMINAL_CONSOLE_MODE_DATA mTerminalConsoleModeData[] = { +- { 80, 25 }, +- { 80, 50 }, +- { 100, 31 }, + { 80, 25 }, // from graphics resolution 640 x 480 + { 80, 50 }, // from graphics resolution 640 x 960 + { 100, 25 }, // from graphics resolution 800 x 480 @@ -164,5 +168,5 @@ index a98b690c8b..ded5513c74 100644 // New modes can be added here. // -- -2.27.0 +2.31.1 diff --git a/0012-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch similarity index 91% rename from 0012-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch rename to 0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index 1aebc4f..6885099 100644 --- a/0012-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,9 +1,13 @@ -From 88b490682aef3e351e757467999f60a9e6880b24 Mon Sep 17 00:00:00 2001 +From 959ce7766f18a33eee6840072efa232406f35677 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 Subject: MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH only) +Notes for rebase to edk2-stable202202: + +- Minor context changes due to 1436aea4d MdeModulePkg: Apply uncrustify changes + Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -102,7 +106,7 @@ index 9d69fb86ed..08d59dfb3e 100644 ## Specify memory size with page number for PEI code when # Loading Module at Fixed Address feature is enabled. diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c -index aae470e956..26156857aa 100644 +index 7809869e7d..0ce931d644 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -7,6 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -114,9 +118,9 @@ index aae470e956..26156857aa 100644 #include "Terminal.h" // -@@ -80,6 +82,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 - CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 }; - CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 }; +@@ -80,6 +82,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 + CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 }; + CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 }; +// +// Note that this is an ASCII format string, taking two INT32 arguments: @@ -131,7 +135,7 @@ index aae470e956..26156857aa 100644 // // Body of the ConOut functions // -@@ -506,6 +518,24 @@ TerminalConOutSetMode ( +@@ -498,6 +510,24 @@ TerminalConOutSetMode ( return EFI_DEVICE_ERROR; } @@ -153,9 +157,9 @@ index aae470e956..26156857aa 100644 + } + } + - This->Mode->Mode = (INT32) ModeNumber; + This->Mode->Mode = (INT32)ModeNumber; - Status = This->ClearScreen (This); + Status = This->ClearScreen (This); diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf index b2a8aeba85..eff6253465 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf @@ -177,5 +181,5 @@ index b2a8aeba85..eff6253465 100644 # [Event] # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout. -- -2.27.0 +2.31.1 diff --git a/0013-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch similarity index 91% rename from 0013-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch rename to 0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index 90e6575..fdc2ca8 100644 --- a/0013-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,4 +1,4 @@ -From 8528d0f734c0ad02120358a894e6fe59c6b9a9c2 Mon Sep 17 00:00:00 2001 +From 153b345b1542ece437bb137666a8e1f2ca02582a Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only) @@ -75,58 +75,58 @@ Signed-off-by: Laszlo Ersek 6 files changed, 6 insertions(+) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 5ee5445116..6ea3621225 100644 +index fd56176796..d1f9bc6d0d 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -534,6 +534,7 @@ +@@ -519,6 +519,7 @@ [PcdsDynamicDefault] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 6a5be97c05..4cacf0ea94 100644 +index 85abed24c1..6bcd222af7 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -594,6 +594,7 @@ +@@ -580,6 +580,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 71227d1b70..6225f8e095 100644 +index a9c1daecc1..0cce3b768e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -600,6 +600,7 @@ +@@ -586,6 +586,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 52f7598cf1..b66fc67563 100644 +index 718399299f..847cf6a466 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -600,6 +600,7 @@ +@@ -585,6 +585,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index df2d9ad015..d0e2c08de9 100644 +index d0323c6451..9011a55d0f 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c -@@ -752,6 +752,7 @@ InitializePlatform ( +@@ -851,6 +851,7 @@ InitializePlatform ( MemTypeInfoInitialization (); MemMapInitialization (); NoexecDxeInitialization (); @@ -135,10 +135,10 @@ index df2d9ad015..d0e2c08de9 100644 InstallClearCacheCallback (); diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index 67eb7aa716..69eb3edad3 100644 +index 8ef404168c..80bcb9f00b 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf -@@ -93,6 +93,7 @@ +@@ -95,6 +95,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved @@ -147,5 +147,5 @@ index 67eb7aa716..69eb3edad3 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack -- -2.27.0 +2.31.1 diff --git a/0014-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch similarity index 97% rename from 0014-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch rename to 0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index c478b27..43e7464 100644 --- a/0014-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,4 +1,4 @@ -From 2ea50cb9ad392b2df09bfb20d64c7c3c1863e867 Mon Sep 17 00:00:00 2001 +From e04bca0b35055d250b5cbcc157ce48374464981b Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 Subject: ArmVirtPkg: take PcdResizeXterm from the QEMU command line (RH only) @@ -95,7 +95,7 @@ Signed-off-by: Laszlo Ersek create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 891e065311..e0476ede4f 100644 +index b2b0d304d3..6960df62b0 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -282,6 +282,8 @@ @@ -199,5 +199,5 @@ index 0000000000..a51dbd1670 +[Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES -- -2.27.0 +2.31.1 diff --git a/0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch b/0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch deleted file mode 100644 index df8d529..0000000 --- a/0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cf62a9076777789bc8fef1d6769faeda26615aea Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 4 Jun 2020 13:34:12 +0200 -Subject: BaseTools: do not build BrotliCompress (RH only) - -Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> -RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: - -- no change - -Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] -> -RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase: - -- New patch. - -BrotliCompress is not used for building ArmVirtPkg or OvmfPkg platforms. -It depends on one of the upstream Brotli git submodules that we removed -earlier in this rebase series. (See patch "remove upstream edk2's Brotli -submodules (RH only"). - -Do not attempt to build BrotliCompress. - -Signed-off-by: Laszlo Ersek -(cherry picked from commit db8ccca337e2c5722c1d408d2541cf653d3371a2) ---- - BaseTools/Source/C/GNUmakefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile -index 8c191e0c38..3eae824a1c 100644 ---- a/BaseTools/Source/C/GNUmakefile -+++ b/BaseTools/Source/C/GNUmakefile -@@ -48,7 +48,6 @@ all: makerootdir subdirs - LIBRARIES = Common - VFRAUTOGEN = VfrCompile/VfrLexer.h - APPLICATIONS = \ -- BrotliCompress \ - VfrCompile \ - EfiRom \ - GenFfs \ --- -2.27.0 - diff --git a/0015-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch similarity index 94% rename from 0015-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch rename to 0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch index 66af3b3..16abff5 100644 --- a/0015-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch +++ b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch @@ -1,4 +1,4 @@ -From ed122866ad1a15f29e0ba570ddb9309917cb0370 Mon Sep 17 00:00:00 2001 +From 92c3ba455a5915219d04b79d5973421cd312c1f3 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:53 +0100 Subject: OvmfPkg: allow exclusion of the shell from the firmware image (RH @@ -111,10 +111,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 775ea2d710..00ea14adf0 100644 +index a6b2142ccd..b5bc8407e7 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -290,12 +290,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -283,12 +283,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -130,10 +130,10 @@ index 775ea2d710..00ea14adf0 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 9d8695922f..e33a40c44e 100644 +index 49266dd467..f4fa19bb01 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -294,12 +294,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -287,12 +287,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -149,10 +149,10 @@ index 9d8695922f..e33a40c44e 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index b6cc3cabdd..85b4b23857 100644 +index ba7f26d01d..dfd17804c2 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -310,12 +310,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -309,12 +309,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -168,5 +168,5 @@ index b6cc3cabdd..85b4b23857 100644 INF MdeModulePkg/Logo/LogoDxe.inf -- -2.27.0 +2.31.1 diff --git a/0016-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch similarity index 97% rename from 0016-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch rename to 0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch index 7f9c554..7700ea4 100644 --- a/0016-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch +++ b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch @@ -1,4 +1,4 @@ -From 03a7ff7a8ab80c740dc1ab64b74bb691cadbf84e Mon Sep 17 00:00:00 2001 +From b39609b03bd62b77344685e57ea62fb3616554a3 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:49:43 +0200 Subject: ArmPlatformPkg: introduce fixed PCD for early hello message (RH only) @@ -89,5 +89,5 @@ index 3a25ddcdc8..b2b58553c7 100644 ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024 -- -2.27.0 +2.31.1 diff --git a/0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch b/0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch deleted file mode 100644 index 747e984..0000000 --- a/0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 0c26077c3c5265a39ae204ba77843274ff922085 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 4 Jun 2020 13:39:08 +0200 -Subject: MdeModulePkg: remove package-private Brotli include path (RH only) - -Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> -RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: - -- no change - -Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] -> -RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase: - -- New patch. - -Originating from upstream commit 58802e02c41b -("MdeModulePkg/BrotliCustomDecompressLib: Make brotli a submodule", -2020-04-16), "MdeModulePkg/MdeModulePkg.dec" contains a package-internal -include path into a Brotli submodule. - -The edk2 build system requires such include paths to resolve successfully, -regardless of the firmware platform being built. Because -BrotliCustomDecompressLib is not consumed by any OvmfPkg or ArmVirtPkg -platforms, and we've removed the submodule earlier in this patch set, -remove the include path too. - -Signed-off-by: Laszlo Ersek -(cherry picked from commit e05e0de713c4a2b8adb6ff9809611f222bfe50ed) ---- - MdeModulePkg/MdeModulePkg.dec | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 463e889e9a..9d69fb86ed 100644 ---- a/MdeModulePkg/MdeModulePkg.dec -+++ b/MdeModulePkg/MdeModulePkg.dec -@@ -24,9 +24,6 @@ - [Includes] - Include - --[Includes.Common.Private] -- Library/BrotliCustomDecompressLib/brotli/c/include -- - [LibraryClasses] - ## @libraryclass Defines a set of methods to reset whole system. - ResetSystemLib|Include/Library/ResetSystemLib.h --- -2.27.0 - diff --git a/0017-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch similarity index 91% rename from 0017-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch rename to 0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch index 07079ad..0ab93ff 100644 --- a/0017-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +++ b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch @@ -1,4 +1,4 @@ -From c82c22df8ab7d2c7078421f4da4ad99e5c04d364 Mon Sep 17 00:00:00 2001 +From 589072612e6d60fff3ed162b6b79421f3afd6e37 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:59:20 +0200 Subject: ArmPlatformPkg: PrePeiCore: write early hello message to the serial @@ -73,12 +73,12 @@ Signed-off-by: Laszlo Ersek 5 files changed, 15 insertions(+) diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c -index 859f1adf20..cf9e65bb7c 100644 +index b5d0d3a644..5126a6dfb0 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c -@@ -111,6 +111,11 @@ PrimaryMain ( - UINTN TemporaryRamBase; - UINTN TemporaryRamSize; +@@ -116,6 +116,11 @@ PrimaryMain ( + UINTN TemporaryRamBase; + UINTN TemporaryRamSize; + if (FixedPcdGetSize (PcdEarlyHelloMessage) > 1) { + SerialPortWrite (FixedPcdGetPtr (PcdEarlyHelloMessage), @@ -89,12 +89,12 @@ index 859f1adf20..cf9e65bb7c 100644 // Enable the GIC Distributor diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c -index 220f9b5680..158cc34c77 100644 +index 1c2580eb92..2a7580dbb4 100644 --- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c @@ -29,6 +29,11 @@ PrimaryMain ( - UINTN TemporaryRamBase; - UINTN TemporaryRamSize; + UINTN TemporaryRamBase; + UINTN TemporaryRamSize; + if (FixedPcdGetSize (PcdEarlyHelloMessage) > 1) { + SerialPortWrite (FixedPcdGetPtr (PcdEarlyHelloMessage), @@ -105,10 +105,10 @@ index 220f9b5680..158cc34c77 100644 // Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h -index 7b155a8a61..e9e283f9ec 100644 +index 0345dd7bdd..ae8302becd 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h -@@ -15,6 +15,7 @@ +@@ -16,6 +16,7 @@ #include #include #include @@ -141,5 +141,5 @@ index e9eb092d3a..c98dc82f0c 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack -- -2.27.0 +2.31.1 diff --git a/0018-ArmVirtPkg-set-early-hello-message-RH-only.patch b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch similarity index 96% rename from 0018-ArmVirtPkg-set-early-hello-message-RH-only.patch rename to 0011-ArmVirtPkg-set-early-hello-message-RH-only.patch index c8b8361..eaec260 100644 --- a/0018-ArmVirtPkg-set-early-hello-message-RH-only.patch +++ b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch @@ -1,4 +1,4 @@ -From 71a097feaba670e5d6eaebfc593394dee6e71cc9 Mon Sep 17 00:00:00 2001 +From 95106e31861778d5841a0e7854166441e602d443 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 14:07:17 +0200 Subject: ArmVirtPkg: set early hello message (RH only) @@ -66,7 +66,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 1 insertion(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index e0476ede4f..ec0edf6e7b 100644 +index 6960df62b0..847a82ac52 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -134,6 +134,7 @@ @@ -78,5 +78,5 @@ index e0476ede4f..ec0edf6e7b 100644 gArmTokenSpaceGuid.PcdVFPEnabled|1 !endif -- -2.27.0 +2.31.1 diff --git a/0019-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch similarity index 93% rename from 0019-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch rename to 0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch index 764e1a6..c51e20d 100644 --- a/0019-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,4 +1,4 @@ -From 1ac092c4fa4fef5f1dfe02b4179eb18830564854 Mon Sep 17 00:00:00 2001 +From 649b84c7d662d78cc09a66aac662b74809464452 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:45 +0100 Subject: OvmfPkg: enable DEBUG_VERBOSE (RHEL only) @@ -65,10 +65,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 6ea3621225..366fa79f62 100644 +index d1f9bc6d0d..538a0c77f6 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -486,7 +486,7 @@ +@@ -471,7 +471,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -78,10 +78,10 @@ index 6ea3621225..366fa79f62 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 4cacf0ea94..2aacf1a5ff 100644 +index 6bcd222af7..91a3c8f9dd 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -534,7 +534,7 @@ +@@ -520,7 +520,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -91,10 +91,10 @@ index 4cacf0ea94..2aacf1a5ff 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 6225f8e095..2613c83adb 100644 +index 0cce3b768e..1a7ba6e6ea 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -538,7 +538,7 @@ +@@ -524,7 +524,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -104,10 +104,10 @@ index 6225f8e095..2613c83adb 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index b66fc67563..d7d34eeef2 100644 +index 847cf6a466..1a7afc7646 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -540,7 +540,7 @@ +@@ -525,7 +525,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -117,5 +117,5 @@ index b66fc67563..d7d34eeef2 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 -- -2.27.0 +2.31.1 diff --git a/0020-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch similarity index 94% rename from 0020-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch rename to 0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index 3557ef7..a6f234e 100644 --- a/0020-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +++ b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch @@ -1,4 +1,4 @@ -From 7e02a1017ef2f0c798c195c1adcb516c9461d22a Mon Sep 17 00:00:00 2001 +From 37fda72f5894c81a8c67441a17c98ed4e20a9261 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:46 +0100 Subject: OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in @@ -82,10 +82,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 366fa79f62..a289d8a573 100644 +index 538a0c77f6..ea4070eedb 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -750,8 +750,14 @@ +@@ -715,8 +715,14 @@ MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf @@ -103,10 +103,10 @@ index 366fa79f62..a289d8a573 100644 # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 2aacf1a5ff..1a5cfa4c6d 100644 +index 91a3c8f9dd..37d1d4b9a5 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -846,9 +846,15 @@ +@@ -812,9 +812,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -125,10 +125,10 @@ index 2aacf1a5ff..1a5cfa4c6d 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 2613c83adb..11002ffd95 100644 +index 1a7ba6e6ea..948e1a5ba5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -860,9 +860,15 @@ +@@ -826,9 +826,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -147,10 +147,10 @@ index 2613c83adb..11002ffd95 100644 # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index d7d34eeef2..f176aa4061 100644 +index 1a7afc7646..46799406b6 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -858,9 +858,15 @@ +@@ -823,9 +823,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -169,5 +169,5 @@ index d7d34eeef2..f176aa4061 100644 # -- -2.27.0 +2.31.1 diff --git a/0021-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch similarity index 95% rename from 0021-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch rename to 0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index 1e8f626..c326370 100644 --- a/0021-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +++ b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch @@ -1,4 +1,4 @@ -From e90b3928d862a2dadda7d5c7c8f680f05854bc6f Mon Sep 17 00:00:00 2001 +From f2bac25df3fdd03d496f7671baf72897b743e0e3 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 Subject: ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in QemuRamfbDxe (RH @@ -61,7 +61,7 @@ Signed-off-by: Laszlo Ersek 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index ec0edf6e7b..e6fad9f066 100644 +index 847a82ac52..d94a8cdd69 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -509,7 +509,10 @@ @@ -77,7 +77,7 @@ index ec0edf6e7b..e6fad9f066 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index a8bb83b288..656c9d99a3 100644 +index 36343f347b..99189055d8 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -438,7 +438,10 @@ @@ -93,5 +93,5 @@ index a8bb83b288..656c9d99a3 100644 OvmfPkg/PlatformDxe/Platform.inf -- -2.27.0 +2.31.1 diff --git a/0022-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch similarity index 93% rename from 0022-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch rename to 0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch index a9b6cf4..d52705f 100644 --- a/0022-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +++ b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch @@ -1,4 +1,4 @@ -From 619fb46a6790720fa1bd9a1a758471b9d5c018ef Mon Sep 17 00:00:00 2001 +From b7026b8a2e60f964a3c970e4e8cbfe4c8667dee5 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Thu, 1 Aug 2019 20:43:48 +0200 Subject: OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64 silent @@ -47,7 +47,7 @@ Signed-off-by: Laszlo Ersek 2 files changed, 15 insertions(+) diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c -index 0d49d8bbab..dbf9bcbe16 100644 +index f5113fbc78..0015c4fc9c 100644 --- a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c +++ b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c @@ -13,6 +13,7 @@ @@ -58,7 +58,7 @@ index 0d49d8bbab..dbf9bcbe16 100644 #include #include #include -@@ -242,6 +243,19 @@ InitializeQemuRamfb ( +@@ -259,6 +260,19 @@ InitializeQemuRamfb ( Status = QemuFwCfgFindFile ("etc/ramfb", &mRamfbFwCfgItem, &FwCfgSize); if (EFI_ERROR (Status)) { @@ -77,7 +77,7 @@ index 0d49d8bbab..dbf9bcbe16 100644 +#endif return EFI_NOT_FOUND; } - if (FwCfgSize != sizeof (RAMFB_CONFIG)) { + diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf index e3890b8c20..6ffee5acb2 100644 --- a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -91,5 +91,5 @@ index e3890b8c20..6ffee5acb2 100644 FrameBufferBltLib MemoryAllocationLib -- -2.27.0 +2.31.1 diff --git a/0023-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch similarity index 93% rename from 0023-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch rename to 0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index ecebb4e..4cf087e 100644 --- a/0023-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,4 +1,4 @@ -From 009210d2d36584215d31bdbeb7071cf8ff4f1fa5 Mon Sep 17 00:00:00 2001 +From 3b349bdd364d83f79fb5b91cc8ddb078efd7276f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:47 +0100 Subject: OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe (RH @@ -63,10 +63,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index a289d8a573..ccdf9b8ce0 100644 +index ea4070eedb..b9718ff03f 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -744,7 +744,10 @@ +@@ -709,7 +709,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -79,10 +79,10 @@ index a289d8a573..ccdf9b8ce0 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 1a5cfa4c6d..a0666930d6 100644 +index 37d1d4b9a5..4dfd338531 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -839,7 +839,10 @@ +@@ -805,7 +805,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -95,10 +95,10 @@ index 1a5cfa4c6d..a0666930d6 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 11002ffd95..5efeb42bf3 100644 +index 948e1a5ba5..63721e5d17 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -853,7 +853,10 @@ +@@ -819,7 +819,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -111,10 +111,10 @@ index 11002ffd95..5efeb42bf3 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f176aa4061..10fb7d7069 100644 +index 46799406b6..cac0391c08 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -851,7 +851,10 @@ +@@ -816,7 +816,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -127,5 +127,5 @@ index f176aa4061..10fb7d7069 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -- -2.27.0 +2.31.1 diff --git a/0024-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch similarity index 98% rename from 0024-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch rename to 0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch index 15024d8..c954559 100644 --- a/0024-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +++ b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch @@ -1,4 +1,4 @@ -From 7e6632fecb119feaf6c34c794e72a8424792fd3f Mon Sep 17 00:00:00 2001 +From 25bb2c2ae96229dfe64663e8a4870063c3ece80e Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 16 Nov 2019 17:11:27 +0100 Subject: CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files in the INFs @@ -175,5 +175,5 @@ index cdeed0d073..5057857e8d 100644 ossl_store.c rand_pool.c -- -2.27.0 +2.31.1 diff --git a/0025-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch similarity index 93% rename from 0025-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch rename to 0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index 0cbb9cf..406e9cc 100644 --- a/0025-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +++ b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch @@ -1,4 +1,4 @@ -From 9e7da28d166fb4b5b434b444c655d522c9f32b1a Mon Sep 17 00:00:00 2001 +From c6748cfa88c31d43540a9ac512e149a359161b94 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:31:36 +0200 Subject: OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" in @@ -32,7 +32,7 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 18 insertions(+) diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c -index 6832d563bc..08ed67f5ff 100644 +index d4f3cd9225..416be93fb7 100644 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c @@ -19,6 +19,7 @@ @@ -43,7 +43,7 @@ index 6832d563bc..08ed67f5ff 100644 #include #include #include -@@ -1054,6 +1055,22 @@ QemuKernelLoaderFsDxeEntrypoint ( +@@ -1081,6 +1082,22 @@ QemuKernelLoaderFsDxeEntrypoint ( if (KernelBlob->Data == NULL) { Status = EFI_NOT_FOUND; @@ -79,5 +79,5 @@ index 7b35adb8e0..e0331c6e2c 100644 MemoryAllocationLib QemuFwCfgLib -- -2.27.0 +2.31.1 diff --git a/0026-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch similarity index 89% rename from 0026-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch rename to 0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch index 826dab6..bdd76e7 100644 --- a/0026-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +++ b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch @@ -1,4 +1,4 @@ -From 2b01209a816fce5004012a033c1e9f679f8768db Mon Sep 17 00:00:00 2001 +From 4285894bcd3ee256708458345562b637804c946a Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:40:09 +0200 Subject: SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent aa64 build @@ -31,7 +31,7 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 18 insertions(+) diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c -index 6d17616c1c..f1a97d4b2d 100644 +index f6ea8b2bbf..681eb7e08b 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -28,6 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -42,9 +42,9 @@ index 6d17616c1c..f1a97d4b2d 100644 #include #include #include -@@ -2642,6 +2643,22 @@ DriverEntry ( - if (CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceNoneGuid) || - CompareGuid (PcdGetPtr(PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)){ +@@ -2691,6 +2692,22 @@ DriverEntry ( + CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)) + { DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); +#if defined (MDE_CPU_AARCH64) + // @@ -78,5 +78,5 @@ index 7dc7a2683d..3bc8833931 100644 PrintLib UefiLib -- -2.27.0 +2.31.1 diff --git a/0030-OvmfPkg-Remove-EbcDxe-RHEL-only.patch b/0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch similarity index 84% rename from 0030-OvmfPkg-Remove-EbcDxe-RHEL-only.patch rename to 0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch index d7cbdfa..a370b59 100644 --- a/0030-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From ff2f54341791a5b95edc7b782f5f2713e4c12588 Mon Sep 17 00:00:00 2001 +From 990e2b3467164922bdd49c3182e56e04911a436e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:49 +0200 Subject: OvmfPkg: Remove EbcDxe (RHEL only) @@ -29,11 +29,11 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 0cd0a50090..d72a995159 100644 +index b9718ff03f..358ff978c2 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -670,7 +670,6 @@ - !endif +@@ -636,7 +636,6 @@ + !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -41,10 +41,10 @@ index 0cd0a50090..d72a995159 100644 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 5a84393b00..2a077ac5bd 100644 +index 14b5b5593f..2c1dfe5fae 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -205,7 +205,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -199,7 +199,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -53,11 +53,11 @@ index 5a84393b00..2a077ac5bd 100644 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index d729a7bef7..e847cfad96 100644 +index 4dfd338531..cdd86f22ec 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -753,7 +753,6 @@ - !endif +@@ -720,7 +720,6 @@ + !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -65,10 +65,10 @@ index d729a7bef7..e847cfad96 100644 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index bf76546356..b65f7306a8 100644 +index b5bc8407e7..fd26488ee4 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -211,7 +211,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -205,7 +205,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -77,11 +77,11 @@ index bf76546356..b65f7306a8 100644 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index ad18b3f365..b00b7682dd 100644 +index 63721e5d17..9c18028d9e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -767,7 +767,6 @@ - !endif +@@ -734,7 +734,6 @@ + !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -89,10 +89,10 @@ index ad18b3f365..b00b7682dd 100644 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 2523aa2d52..b145c0ca3e 100644 +index f4fa19bb01..b3533abce9 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -215,7 +215,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -209,7 +209,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf @@ -101,10 +101,10 @@ index 2523aa2d52..b145c0ca3e 100644 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 161de784ac..2f61405fbf 100644 +index cac0391c08..9a882226de 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -765,7 +765,6 @@ +@@ -731,7 +731,6 @@ !endif } @@ -113,7 +113,7 @@ index 161de784ac..2f61405fbf 100644 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index f9249b0b5f..f82cba3934 100644 +index dfd17804c2..588b2deb7f 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -231,7 +231,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -125,5 +125,5 @@ index f9249b0b5f..f82cba3934 100644 INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf -- -2.27.0 +2.31.1 diff --git a/0031-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch b/0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch similarity index 86% rename from 0031-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch rename to 0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch index 46de278..f4864bf 100644 --- a/0031-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From 550baa5312b42e21332da86982a7f291528150e8 Mon Sep 17 00:00:00 2001 +From c435ca7c8549b3ef71e29c9d1b731a65760e177a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:54 +0200 Subject: ArmVirtPkg: Remove EbcDxe (RHEL only) @@ -23,10 +23,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 10 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 5a1598d90c..2fd8d31611 100644 +index ba711deac0..e64acbc5cf 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -420,8 +420,3 @@ +@@ -423,8 +423,3 @@ NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf } @@ -36,13 +36,13 @@ index 5a1598d90c..2fd8d31611 100644 - # - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index f6a538df72..520d531518 100644 +index d4df6dede0..7872861330 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -146,11 +146,6 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf - INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf + INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf - - # - # EBC support @@ -52,5 +52,5 @@ index f6a538df72..520d531518 100644 # -- -2.27.0 +2.31.1 diff --git a/0032-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch b/0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch similarity index 84% rename from 0032-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch rename to 0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch index 98de3a3..41dcfb3 100644 --- a/0032-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +++ b/0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From caf276302ed4b008e99749ed858db3bcf6501640 Mon Sep 17 00:00:00 2001 +From fe9c142814935e1c492f6cd98857559211f75123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:59 +0200 Subject: OvmfPkg: Remove VirtioGpu device driver (RHEL only) @@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index d72a995159..74e87f1b08 100644 +index 358ff978c2..32e27664a6 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -759,7 +759,6 @@ +@@ -725,7 +725,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -41,10 +41,10 @@ index d72a995159..74e87f1b08 100644 # # ISA Support diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 2a077ac5bd..d09a193d09 100644 +index 2c1dfe5fae..b264128da4 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -299,7 +299,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -293,7 +293,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -53,10 +53,10 @@ index 2a077ac5bd..d09a193d09 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index e847cfad96..f8ff1c2792 100644 +index cdd86f22ec..480c5212a1 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -856,7 +856,6 @@ +@@ -823,7 +823,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -65,10 +65,10 @@ index e847cfad96..f8ff1c2792 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index b65f7306a8..ea7a3f893c 100644 +index fd26488ee4..cddab565ac 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -324,7 +324,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -318,7 +318,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf !endif INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -77,10 +77,10 @@ index b65f7306a8..ea7a3f893c 100644 INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index b00b7682dd..4b5f362780 100644 +index 9c18028d9e..510e4502f2 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -870,7 +870,6 @@ +@@ -837,7 +837,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -89,10 +89,10 @@ index b00b7682dd..4b5f362780 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index b145c0ca3e..3c33f0eadd 100644 +index b3533abce9..73eb4e10d9 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -333,7 +333,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -327,7 +327,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf !endif INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -101,10 +101,10 @@ index b145c0ca3e..3c33f0eadd 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 2f61405fbf..89dcdb8bba 100644 +index 9a882226de..9db7c98ff8 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -868,7 +868,6 @@ +@@ -834,7 +834,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -113,7 +113,7 @@ index 2f61405fbf..89dcdb8bba 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index f82cba3934..e7bf0da02b 100644 +index 588b2deb7f..5716783d23 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -349,7 +349,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf @@ -125,5 +125,5 @@ index f82cba3934..e7bf0da02b 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -- -2.27.0 +2.31.1 diff --git a/0033-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch b/0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch similarity index 85% rename from 0033-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch rename to 0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch index 02318a9..30efe84 100644 --- a/0033-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch +++ b/0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch @@ -1,4 +1,4 @@ -From 5f2032eca0be1191d8485eeba4005f4d0a3af879 Mon Sep 17 00:00:00 2001 +From 551cf28aeedca3c7cb5b08dcd23b37a473d85265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Fri, 2 Jul 2021 20:15:40 +0200 Subject: OvmfPkg: Remove QemuRamfbDxe display device driver (RHEL only) @@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 20 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 74e87f1b08..154e318e87 100644 +index 32e27664a6..0204812c4d 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -755,10 +755,6 @@ +@@ -721,10 +721,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -44,10 +44,10 @@ index 74e87f1b08..154e318e87 100644 # # ISA Support diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index d09a193d09..cd86f60270 100644 +index b264128da4..1aa387dbd4 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -298,7 +298,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -292,7 +292,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf @@ -56,10 +56,10 @@ index d09a193d09..cd86f60270 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index f8ff1c2792..3061d0d796 100644 +index 480c5212a1..c204f893b5 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -852,10 +852,6 @@ +@@ -819,10 +819,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } !endif @@ -71,10 +71,10 @@ index f8ff1c2792..3061d0d796 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index ea7a3f893c..e55c88c84d 100644 +index cddab565ac..279db25da1 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -323,7 +323,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf +@@ -317,7 +317,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf !endif @@ -83,10 +83,10 @@ index ea7a3f893c..e55c88c84d 100644 INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4b5f362780..01adc7b648 100644 +index 510e4502f2..1197f17848 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -866,10 +866,6 @@ +@@ -833,10 +833,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } !endif @@ -98,10 +98,10 @@ index 4b5f362780..01adc7b648 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 3c33f0eadd..43a96cc78a 100644 +index 73eb4e10d9..8cebb4049e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -332,7 +332,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf +@@ -326,7 +326,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf !endif @@ -110,10 +110,10 @@ index 3c33f0eadd..43a96cc78a 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 89dcdb8bba..bcbc17fba4 100644 +index 9db7c98ff8..b09ac55f41 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -864,10 +864,6 @@ +@@ -830,10 +830,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } !endif @@ -125,7 +125,7 @@ index 89dcdb8bba..bcbc17fba4 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index e7bf0da02b..e992ed5f37 100644 +index 5716783d23..6e7db8164c 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -348,7 +348,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf @@ -137,5 +137,5 @@ index e7bf0da02b..e992ed5f37 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -- -2.27.0 +2.31.1 diff --git a/0034-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch b/0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch similarity index 91% rename from 0034-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch rename to 0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch index 28c535a..bfc6b43 100644 --- a/0034-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch +++ b/0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch @@ -1,4 +1,4 @@ -From 9dc5af1a38fffff9f377c8eddf517be621bb6cda Mon Sep 17 00:00:00 2001 +From 3c3aea0f37377981dbfc1470c188fbd370ddeeb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:02 +0200 Subject: ArmVirtPkg: Remove QemuRamfbDxe display device driver (RHEL only) @@ -25,7 +25,7 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 9 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index e6fad9f066..6677283c21 100644 +index d94a8cdd69..8d820d5772 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -509,10 +509,6 @@ @@ -40,7 +40,7 @@ index e6fad9f066..6677283c21 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 520d531518..2b51ac4a6d 100644 +index 7872861330..7d5d5ffebb 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -161,7 +161,6 @@ READ_LOCK_STATUS = TRUE @@ -52,7 +52,7 @@ index 520d531518..2b51ac4a6d 100644 INF OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 656c9d99a3..1ab8d6b999 100644 +index 99189055d8..85e155127f 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -438,10 +438,6 @@ @@ -67,5 +67,5 @@ index 656c9d99a3..1ab8d6b999 100644 OvmfPkg/PlatformDxe/Platform.inf -- -2.27.0 +2.31.1 diff --git a/0037-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch b/0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch similarity index 85% rename from 0037-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch rename to 0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch index ea21ce1..8757b8b 100644 --- a/0037-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +++ b/0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch @@ -1,4 +1,4 @@ -From a1872bcc0413a84cebe61b52fe99e5ef0d6ccca5 Mon Sep 17 00:00:00 2001 +From 23546fcbb2e18773f450b5029fe68d15a31d6919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:13 +0200 Subject: OvmfPkg: Remove VirtioFsDxe filesystem driver (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index b947e817a5..7ed4218f3f 100644 +index c204f893b5..fc8f07d15f 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -831,7 +831,6 @@ +@@ -798,7 +798,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -39,10 +39,10 @@ index b947e817a5..7ed4218f3f 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index bfed32ddd3..0c90dc9ddf 100644 +index 279db25da1..6998f242ad 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -285,7 +285,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -280,7 +280,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -51,10 +51,10 @@ index bfed32ddd3..0c90dc9ddf 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 7e86a9872e..080351bfe4 100644 +index 1197f17848..857221b475 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -845,7 +845,6 @@ +@@ -812,7 +812,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -63,10 +63,10 @@ index 7e86a9872e..080351bfe4 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 5965d4367a..0d23401372 100644 +index 8cebb4049e..e454f9cd70 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -289,7 +289,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -284,7 +284,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -75,10 +75,10 @@ index 5965d4367a..0d23401372 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 952b831548..fa2e439c39 100644 +index b09ac55f41..8c9f8c7cca 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -843,7 +843,6 @@ +@@ -809,7 +809,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -87,10 +87,10 @@ index 952b831548..fa2e439c39 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 4e382f7912..244c1d6ef2 100644 +index 6e7db8164c..d0b8eb362f 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -305,7 +305,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -306,7 +306,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -99,5 +99,5 @@ index 4e382f7912..244c1d6ef2 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" -- -2.27.0 +2.31.1 diff --git a/0038-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch b/0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch similarity index 91% rename from 0038-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch rename to 0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch index 8990611..dafc612 100644 --- a/0038-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +++ b/0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch @@ -1,4 +1,4 @@ -From 772e5687d7ffeb88e98f49d8aa499180114d3c32 Mon Sep 17 00:00:00 2001 +From f0fa2fa860196279b7c4477893e6baf097c250a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:16 +0200 Subject: ArmVirtPkg: Remove VirtioFsDxe filesystem driver (RHEL only) @@ -24,7 +24,7 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index dff238fbdd..feac352b65 100644 +index 8d820d5772..f19b7c042d 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -427,7 +427,6 @@ @@ -36,7 +36,7 @@ index dff238fbdd..feac352b65 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 9449daa5af..8cab9bec9a 100644 +index 7d5d5ffebb..27ed97afc5 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -84,7 +84,6 @@ READ_LOCK_STATUS = TRUE @@ -48,7 +48,7 @@ index 9449daa5af..8cab9bec9a 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 1603a635a9..b365ac0f99 100644 +index 85e155127f..c00f3bfa47 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -356,7 +356,6 @@ @@ -60,5 +60,5 @@ index 1603a635a9..b365ac0f99 100644 # # Bds -- -2.27.0 +2.31.1 diff --git a/0039-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch similarity index 86% rename from 0039-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch rename to 0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index 18e3377..d32c3ba 100644 --- a/0039-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 5c6129a2e68f7914a374f8efadc71a959ac2cc0b Mon Sep 17 00:00:00 2001 +From b3e7dfb9cf751a677f1c15b8b9ac4f89051658d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:19 +0200 Subject: OvmfPkg: Remove UdfDxe filesystem driver (RHEL only) @@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 7d69eba83b..35691989bd 100644 +index 0204812c4d..9f75ce90c2 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -736,7 +736,6 @@ +@@ -702,7 +702,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -41,10 +41,10 @@ index 7d69eba83b..35691989bd 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 45e9a345b7..52cb301d43 100644 +index 1aa387dbd4..0a09246f47 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -272,7 +272,6 @@ INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf +@@ -267,7 +267,6 @@ INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -53,10 +53,10 @@ index 45e9a345b7..52cb301d43 100644 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 7ed4218f3f..47dc58b2f2 100644 +index fc8f07d15f..5ef39dcc46 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -830,7 +830,6 @@ +@@ -797,7 +797,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -65,10 +65,10 @@ index 7ed4218f3f..47dc58b2f2 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 0c90dc9ddf..04bd804471 100644 +index 6998f242ad..d9689ecca0 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -284,7 +284,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -279,7 +279,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -77,10 +77,10 @@ index 0c90dc9ddf..04bd804471 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 080351bfe4..dc5c6681c5 100644 +index 857221b475..6fbc78fa06 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -844,7 +844,6 @@ +@@ -811,7 +811,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -89,10 +89,10 @@ index 080351bfe4..dc5c6681c5 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 0d23401372..36433d984c 100644 +index e454f9cd70..9b41cdeff4 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -288,7 +288,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -283,7 +283,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -101,10 +101,10 @@ index 0d23401372..36433d984c 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index fa2e439c39..17a11f81ae 100644 +index 8c9f8c7cca..525f4c9e32 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -842,7 +842,6 @@ +@@ -808,7 +808,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -113,10 +113,10 @@ index fa2e439c39..17a11f81ae 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 244c1d6ef2..ed0d60b5e0 100644 +index d0b8eb362f..7b409d5c35 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -304,7 +304,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -305,7 +305,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -125,5 +125,5 @@ index 244c1d6ef2..ed0d60b5e0 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" -- -2.27.0 +2.31.1 diff --git a/0040-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch similarity index 91% rename from 0040-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch rename to 0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index be8a548..6481c20 100644 --- a/0040-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From f5f031cd20029999856279428960eec8cb70b833 Mon Sep 17 00:00:00 2001 +From 98d6ed1341d7f2cb8f14334250c25b940eef28fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:22 +0200 Subject: ArmVirtPkg: Remove UdfDxe filesystem driver (RHEL only) @@ -24,7 +24,7 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index feac352b65..07d3723589 100644 +index f19b7c042d..a9733583b2 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -426,7 +426,6 @@ @@ -36,7 +36,7 @@ index feac352b65..07d3723589 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 8cab9bec9a..41392521a1 100644 +index 27ed97afc5..192b0d4a3f 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -83,7 +83,6 @@ READ_LOCK_STATUS = TRUE @@ -48,7 +48,7 @@ index 8cab9bec9a..41392521a1 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index b365ac0f99..609f44dc24 100644 +index c00f3bfa47..fb0792525d 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -355,7 +355,6 @@ @@ -60,5 +60,5 @@ index b365ac0f99..609f44dc24 100644 # # Bds -- -2.27.0 +2.31.1 diff --git a/0029-OvmfPkg-Remove-PrintDxe-RHEL-only.patch b/0029-OvmfPkg-Remove-PrintDxe-RHEL-only.patch deleted file mode 100644 index 588ad08..0000000 --- a/0029-OvmfPkg-Remove-PrintDxe-RHEL-only.patch +++ /dev/null @@ -1,129 +0,0 @@ -From ec59dc81bfaeb07ff114a956359161b29ca128fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= -Date: Thu, 1 Jul 2021 20:28:43 +0200 -Subject: OvmfPkg: Remove PrintDxe (RHEL only) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Philippe Mathieu-Daudé -RH-MergeRequest: 3: Disable features for RHEL9 -RH-Commit: [1/19] 84921eec8867fc1986401a301700baf31ba66293 -RH-Bugzilla: 1967747 -RH-Acked-by: Laszlo Ersek - -The Print service driver is not used by OVMF, remove it. - -Suggested-by: Laszlo Ersek -Signed-off-by: Philippe Mathieu-Daudé -Signed-off-by: Miroslav Rezanina ---- - 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 -index ccdf9b8ce0..0cd0a50090 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -732,7 +732,6 @@ - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - } -- MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 5662609886..5a84393b00 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -245,7 +245,6 @@ INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf - INF MdeModulePkg/Application/UiApp/UiApp.inf - INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf - INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf --INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index a0666930d6..d729a7bef7 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -826,7 +826,6 @@ - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - } -- MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 00ea14adf0..bf76546356 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -255,7 +255,6 @@ INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf - INF MdeModulePkg/Application/UiApp/UiApp.inf - INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf - INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf --INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 5efeb42bf3..ad18b3f365 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -840,7 +840,6 @@ - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - } -- MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index e33a40c44e..2523aa2d52 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -259,7 +259,6 @@ INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf - INF MdeModulePkg/Application/UiApp/UiApp.inf - INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf - INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf --INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 10fb7d7069..161de784ac 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -838,7 +838,6 @@ - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - } -- MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 85b4b23857..f9249b0b5f 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -275,7 +275,6 @@ INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf - INF MdeModulePkg/Application/UiApp/UiApp.inf - INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf - INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf --INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf - INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf - INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf - INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf --- -2.27.0 - diff --git a/0041-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch b/0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch similarity index 86% rename from 0041-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch rename to 0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch index a790794..cfd95d2 100644 --- a/0041-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +++ b/0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From db62fdc2ea07ba0796820c0f4aaa02e3a36c0b27 Mon Sep 17 00:00:00 2001 +From 49657fe4a687caf9e87819c943ca9a46904c4086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:25 +0200 Subject: OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 15 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 47dc58b2f2..3e7cd1f0ff 100644 +index 5ef39dcc46..cc37177297 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -910,10 +910,6 @@ +@@ -881,10 +881,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -42,10 +42,10 @@ index 47dc58b2f2..3e7cd1f0ff 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 04bd804471..61c3db7a13 100644 +index d9689ecca0..22079c83cc 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -287,7 +287,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -282,7 +282,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -54,10 +54,10 @@ index 04bd804471..61c3db7a13 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index dc5c6681c5..450db0b473 100644 +index 6fbc78fa06..ea0c338b9b 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -924,10 +924,6 @@ +@@ -895,10 +895,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -69,10 +69,10 @@ index dc5c6681c5..450db0b473 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 36433d984c..56781d84e4 100644 +index 9b41cdeff4..d851e47180 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -291,7 +291,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -286,7 +286,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -81,10 +81,10 @@ index 36433d984c..56781d84e4 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 17a11f81ae..07d028b294 100644 +index 525f4c9e32..591b4cb430 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -922,10 +922,6 @@ +@@ -892,10 +892,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -96,10 +96,10 @@ index 17a11f81ae..07d028b294 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index ed0d60b5e0..959736a1be 100644 +index 7b409d5c35..4e7be9f2e7 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -307,7 +307,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -308,7 +308,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -108,5 +108,5 @@ index ed0d60b5e0..959736a1be 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif -- -2.27.0 +2.31.1 diff --git a/0042-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch b/0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch similarity index 92% rename from 0042-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch rename to 0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch index 4c7024d..e231ecc 100644 --- a/0042-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +++ b/0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From 94302ccc1de9b13cb6dc28af3e077e0b09052460 Mon Sep 17 00:00:00 2001 +From 3b983b889b2482adff0f6e275908aaaa95a17edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:28 +0200 Subject: ArmVirtPkg: Remove TftpDynamicCommand from shell (RHEL only) @@ -23,7 +23,7 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 2fd8d31611..56c55eb473 100644 +index e64acbc5cf..560979f1d2 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -377,10 +377,9 @@ @@ -41,7 +41,7 @@ index 2fd8d31611..56c55eb473 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 41392521a1..89e0bad645 100644 +index 192b0d4a3f..04f2a838ca 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE @@ -53,5 +53,5 @@ index 41392521a1..89e0bad645 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf -- -2.27.0 +2.31.1 diff --git a/0043-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch b/0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch similarity index 86% rename from 0043-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch rename to 0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch index 0701c9b..f3eb1e1 100644 --- a/0043-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +++ b/0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From 266042abbae5f40f3a45e88601a27096734163da Mon Sep 17 00:00:00 2001 +From 58473c715a0091df93972e117f8adddb8d527f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:31 +0200 Subject: OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 15 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 3e7cd1f0ff..1a14d8125b 100644 +index cc37177297..18349c4652 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -910,10 +910,6 @@ +@@ -881,10 +881,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -42,10 +42,10 @@ index 3e7cd1f0ff..1a14d8125b 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 61c3db7a13..bdb8bd2388 100644 +index 22079c83cc..89f91bd08e 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -287,7 +287,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -282,7 +282,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -54,10 +54,10 @@ index 61c3db7a13..bdb8bd2388 100644 !endif INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 450db0b473..a528e35e99 100644 +index ea0c338b9b..4189be2ff2 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -924,10 +924,6 @@ +@@ -895,10 +895,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -69,10 +69,10 @@ index 450db0b473..a528e35e99 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 56781d84e4..2bb9c91909 100644 +index d851e47180..d89ecd32a8 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -291,7 +291,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -286,7 +286,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -81,10 +81,10 @@ index 56781d84e4..2bb9c91909 100644 !endif INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 07d028b294..8b4963b022 100644 +index 591b4cb430..d46db1208d 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -922,10 +922,6 @@ +@@ -892,10 +892,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -96,10 +96,10 @@ index 07d028b294..8b4963b022 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 959736a1be..9d1dfb1cee 100644 +index 4e7be9f2e7..90773a6de7 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -307,7 +307,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -308,7 +308,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -108,5 +108,5 @@ index 959736a1be..9d1dfb1cee 100644 !endif INF ShellPkg/Application/Shell/Shell.inf -- -2.27.0 +2.31.1 diff --git a/0044-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch b/0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch similarity index 92% rename from 0044-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch rename to 0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch index 4092e92..7264e1c 100644 --- a/0044-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +++ b/0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From e2844c290619d4a0d835a0e0756d07eca0493ddb Mon Sep 17 00:00:00 2001 +From 35acf33fae0c594ec92ba1ba9c2b898b45a522e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:34 +0200 Subject: ArmVirtPkg: Remove HttpDynamicCommand from shell (RHEL only) @@ -23,7 +23,7 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 56c55eb473..0e221c22c9 100644 +index 560979f1d2..7a0c507528 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -380,10 +380,6 @@ @@ -38,7 +38,7 @@ index 56c55eb473..0e221c22c9 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 89e0bad645..add13fc39d 100644 +index 04f2a838ca..d42781d967 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE @@ -50,5 +50,5 @@ index 89e0bad645..add13fc39d 100644 # -- -2.27.0 +2.31.1 diff --git a/0045-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch b/0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch similarity index 85% rename from 0045-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch rename to 0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch index 19509d0..41cd9a7 100644 --- a/0045-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +++ b/0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch @@ -1,4 +1,4 @@ -From 855afbe9bf9ebb68f9cdb3ace57ce99e5614375f Mon Sep 17 00:00:00 2001 +From 53060371fbc07acf0f490cbeab48c221c3e93ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:39 +0200 Subject: OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) @@ -34,10 +34,10 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 20 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 35691989bd..88b65b9f59 100644 +index 9f75ce90c2..7b14dfd1ae 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -785,10 +785,6 @@ +@@ -755,10 +755,6 @@ MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -49,10 +49,10 @@ index 35691989bd..88b65b9f59 100644 OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 52cb301d43..325570c5a3 100644 +index 0a09246f47..29d9827294 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -274,7 +274,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -269,7 +269,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -61,10 +61,10 @@ index 52cb301d43..325570c5a3 100644 INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf INF OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 1a14d8125b..fa42d919be 100644 +index 18349c4652..f5314a3862 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -910,10 +910,6 @@ +@@ -881,10 +881,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -76,10 +76,10 @@ index 1a14d8125b..fa42d919be 100644 ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index bdb8bd2388..51433836d6 100644 +index 89f91bd08e..818d894262 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -287,7 +287,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -282,7 +282,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -88,10 +88,10 @@ index bdb8bd2388..51433836d6 100644 INF ShellPkg/Application/Shell/Shell.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index a528e35e99..ef962565f8 100644 +index 4189be2ff2..6116654aa8 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -924,10 +924,6 @@ +@@ -895,10 +895,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -103,10 +103,10 @@ index a528e35e99..ef962565f8 100644 ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 2bb9c91909..a50f80e1e9 100644 +index d89ecd32a8..5bf9ce771f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -291,7 +291,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -286,7 +286,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -115,10 +115,10 @@ index 2bb9c91909..a50f80e1e9 100644 INF ShellPkg/Application/Shell/Shell.inf !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 8b4963b022..ba9f9833b0 100644 +index d46db1208d..e7cbee5d08 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -922,10 +922,6 @@ +@@ -892,10 +892,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -130,10 +130,10 @@ index 8b4963b022..ba9f9833b0 100644 ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 9d1dfb1cee..dd1c6eded9 100644 +index 90773a6de7..c894db8c3b 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -307,7 +307,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -308,7 +308,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -142,5 +142,5 @@ index 9d1dfb1cee..dd1c6eded9 100644 INF ShellPkg/Application/Shell/Shell.inf !endif -- -2.27.0 +2.31.1 diff --git a/0046-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch b/0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch similarity index 92% rename from 0046-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch rename to 0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch index b113e6d..787a554 100644 --- a/0046-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch +++ b/0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch @@ -1,4 +1,4 @@ -From 74043040b2535bd098ab6089d0ec2ef19c6abeea Mon Sep 17 00:00:00 2001 +From 275d3be82ff8cace8921c1f299a1b053b74acd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:46 +0200 Subject: ArmVirtPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) @@ -24,7 +24,7 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 0e221c22c9..040878939b 100644 +index 7a0c507528..2a8c978d96 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -380,10 +380,6 @@ @@ -39,7 +39,7 @@ index 0e221c22c9..040878939b 100644 ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index add13fc39d..82b015d77d 100644 +index d42781d967..a5c7769455 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE @@ -51,5 +51,5 @@ index add13fc39d..82b015d77d 100644 # # Bds -- -2.27.0 +2.31.1 diff --git a/0035-OvmfPkg-Remove-NvmExpressDxe-device-driver-RHEL-only.patch b/0035-OvmfPkg-Remove-NvmExpressDxe-device-driver-RHEL-only.patch deleted file mode 100644 index 669de2c..0000000 --- a/0035-OvmfPkg-Remove-NvmExpressDxe-device-driver-RHEL-only.patch +++ /dev/null @@ -1,141 +0,0 @@ -From a66385d84b6b156d09fc6c8a62297a684b4c39d9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= -Date: Thu, 1 Jul 2021 20:29:06 +0200 -Subject: OvmfPkg: 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é -RH-MergeRequest: 3: Disable features for RHEL9 -RH-Commit: [7/19] 9af37e4e6ad4604d5ebe67ff77cc236664590fe2 -RH-Bugzilla: 1967747 -RH-Acked-by: Laszlo Ersek - -There is no real known use case for the NVME driver. - -Suggested-by: Laszlo Ersek -Signed-off-by: Philippe Mathieu-Daudé -Signed-off-by: Miroslav Rezanina ---- - 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 154e318e87..7d69eba83b 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -742,10 +742,6 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index cd86f60270..45e9a345b7 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -253,7 +253,6 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf --INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 3061d0d796..b947e817a5 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -837,10 +837,6 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index e55c88c84d..bfed32ddd3 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -263,7 +263,6 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf --INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 01adc7b648..7e86a9872e 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -851,10 +851,6 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 43a96cc78a..5965d4367a 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -267,7 +267,6 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf --INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index bcbc17fba4..952b831548 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -849,10 +849,6 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index e992ed5f37..4e382f7912 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -283,7 +283,6 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf --INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf --- -2.27.0 - diff --git a/0036-ArmVirtPkg-Remove-NvmExpressDxe-device-driver-RHEL-o.patch b/0036-ArmVirtPkg-Remove-NvmExpressDxe-device-driver-RHEL-o.patch deleted file mode 100644 index 8ddc0ab..0000000 --- a/0036-ArmVirtPkg-Remove-NvmExpressDxe-device-driver-RHEL-o.patch +++ /dev/null @@ -1,76 +0,0 @@ -From c165681779351c785d6e1946d6b861b71d07fb3f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= -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é -RH-MergeRequest: 3: Disable features for RHEL9 -RH-Commit: [8/19] d07dd11cb7a59c5af361ff5f801b7cfe421bce14 -RH-Bugzilla: 1967747 -RH-Acked-by: Laszlo Ersek - -There is no real known use case for the NVME driver. - -Suggested-by: Laszlo Ersek -Signed-off-by: Philippe Mathieu-Daudé -Signed-off-by: Miroslav Rezanina ---- - 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 - diff --git a/edk2-OvmfPkg-AmdSev-SecretPei-Mark-SEV-launch-secret-area.patch b/edk2-OvmfPkg-AmdSev-SecretPei-Mark-SEV-launch-secret-area.patch deleted file mode 100644 index 2a92c02..0000000 --- a/edk2-OvmfPkg-AmdSev-SecretPei-Mark-SEV-launch-secret-area.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c4096f74a41bde4fc62576222e0c9622152d7701 Mon Sep 17 00:00:00 2001 -From: Pawel Polawski -Date: Tue, 4 Jan 2022 15:16:40 +0800 -Subject: [PATCH 2/2] OvmfPkg/AmdSev/SecretPei: Mark SEV launch secret area as - reserved - -RH-Author: Pawel Polawski -RH-MergeRequest: 10: OvmfPkg/AmdSev/SecretPei: Mark SEV launch secret area as reserved -RH-Commit: [1/1] a8f099d508e2e7b39697945acaa767c43577b1e6 (elkoniu/edk2) -RH-Bugzilla: 2041754 -RH-Acked-by: Oliver Steffen -RH-Acked-by: Gerd Hoffmann - -Mark the SEV launch secret MEMFD area as reserved, which will allow the -guest OS to use it during the lifetime of the OS, without creating -copies of the sensitive content. - -Cc: Ard Biesheuvel -Cc: Jordan Justen -Cc: Gerd Hoffmann -Cc: Brijesh Singh -Cc: Erdem Aktas -Cc: James Bottomley -Cc: Jiewen Yao -Cc: Min Xu -Cc: Tom Lendacky -Cc: Tobin Feldman-Fitzthum -Signed-off-by: Dov Murik -Acked-by: Gerd Hoffmann -Acked-by: Jiewen Yao -Reviewed-by: Brijesh Singh ---- - OvmfPkg/AmdSev/SecretPei/SecretPei.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/OvmfPkg/AmdSev/SecretPei/SecretPei.c b/OvmfPkg/AmdSev/SecretPei/SecretPei.c -index db94c26b54..6bf1a55dea 100644 ---- a/OvmfPkg/AmdSev/SecretPei/SecretPei.c -+++ b/OvmfPkg/AmdSev/SecretPei/SecretPei.c -@@ -19,7 +19,7 @@ InitializeSecretPei ( - BuildMemoryAllocationHob ( - PcdGet32 (PcdSevLaunchSecretBase), - ALIGN_VALUE (PcdGet32 (PcdSevLaunchSecretSize), EFI_PAGE_SIZE), -- EfiBootServicesData -+ EfiReservedMemoryType - ); - - return EFI_SUCCESS; --- -2.27.0 - diff --git a/edk2-OvmfPkg-create-Tcg12ConfigPei.inf.patch b/edk2-OvmfPkg-create-Tcg12ConfigPei.inf.patch deleted file mode 100644 index 44dc3e4..0000000 --- a/edk2-OvmfPkg-create-Tcg12ConfigPei.inf.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 0ecb863aaca8d71a35763645ced278589666ada2 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 15 Dec 2021 12:39:19 +0100 -Subject: [PATCH 4/6] OvmfPkg: create Tcg12ConfigPei.inf - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 9: backport tpm build updates, disable tpm 1.2 support -RH-Commit: [4/6] 92926b9a05aaff38aab9a2aeee211be736863ab9 (kraxel/centos-edk2) -RH-Bugzilla: 1935497 -RH-Acked-by: Oliver Steffen - -Split Tcg2ConfigPei.inf into two variants: Tcg12ConfigPei.inf with -TPM 1.2 support included and Tcg2ConfigPei.inf supporting TPM 2.0 only. -This allows x86 builds to choose whenever TPM 1.2 support should be -included or not by picking the one or the other inf file. - -Switch x86 builds to Tcg12ConfigPei.inf, so they continue to -have TPM 1.2 support. - -No functional change. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Stefan Berger -Tested-by: Stefan Berger -(cherry picked from commit b81938877276e808b6535e612b320eee559c4c2f) ---- - OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 2 +- - OvmfPkg/OvmfTpmPei.fdf.inc | 2 +- - OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf | 56 +++++++++++++++++++++++ - OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf | 11 +---- - 4 files changed, 59 insertions(+), 12 deletions(-) - create mode 100644 OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf - -diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -index 99fa7c13b3..87d491da50 100644 ---- a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -+++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -@@ -4,7 +4,7 @@ - - !if $(TPM_ENABLE) == TRUE - OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -+ OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf - SecurityPkg/Tcg/TcgPei/TcgPei.inf - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { - -diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc -index 9aefd73d21..709a608cc3 100644 ---- a/OvmfPkg/OvmfTpmPei.fdf.inc -+++ b/OvmfPkg/OvmfTpmPei.fdf.inc -@@ -4,7 +4,7 @@ - - !if $(TPM_ENABLE) == TRUE - INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf --INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -+INF OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf - INF SecurityPkg/Tcg/TcgPei/TcgPei.inf - INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf - INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf -diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf -new file mode 100644 -index 0000000000..e8e0b88e60 ---- /dev/null -+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf -@@ -0,0 +1,56 @@ -+## @file -+# Set TPM device type - supports TPM 1.2 and 2.0 -+# -+# In SecurityPkg, this module initializes the TPM device type based on a UEFI -+# variable and/or hardware detection. In OvmfPkg, the module only performs TPM -+# hardware detection. -+# -+# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
-+# Copyright (C) 2018, Red Hat, Inc. -+# -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+[Defines] -+ INF_VERSION = 0x00010005 -+ BASE_NAME = Tcg2ConfigPei -+ FILE_GUID = 8AD3148F-945F-46B4-8ACD-71469EA73945 -+ MODULE_TYPE = PEIM -+ VERSION_STRING = 1.0 -+ ENTRY_POINT = Tcg2ConfigPeimEntryPoint -+ -+[Sources] -+ Tcg2ConfigPeim.c -+ Tpm12Support.h -+ Tpm12Support.c -+ -+[Packages] -+ MdePkg/MdePkg.dec -+ MdeModulePkg/MdeModulePkg.dec -+ OvmfPkg/OvmfPkg.dec -+ SecurityPkg/SecurityPkg.dec -+ -+[LibraryClasses] -+ PeimEntryPoint -+ DebugLib -+ PeiServicesLib -+ Tpm2DeviceLib -+ BaseLib -+ Tpm12DeviceLib -+ -+[Guids] -+ gEfiTpmDeviceSelectedGuid ## PRODUCES ## GUID # Used as a PPI GUID -+ gEfiTpmDeviceInstanceTpm20DtpmGuid ## SOMETIMES_CONSUMES -+ gEfiTpmDeviceInstanceTpm12Guid ## SOMETIMES_CONSUMES -+ -+[Ppis] -+ gPeiTpmInitializationDonePpiGuid ## SOMETIMES_PRODUCES -+ -+[Pcd] -+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid ## PRODUCES -+ -+[Depex.IA32, Depex.X64] -+ gOvmfTpmMmioAccessiblePpiGuid -+ -+[Depex.ARM, Depex.AARCH64] -+ gOvmfTpmDiscoveredPpiGuid -diff --git a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -index 39d1deeed1..51078c9813 100644 ---- a/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -+++ b/OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -@@ -1,5 +1,5 @@ - ## @file --# Set TPM device type -+# Set TPM device type - supports TPM 2.0 only - # - # In SecurityPkg, this module initializes the TPM device type based on a UEFI - # variable and/or hardware detection. In OvmfPkg, the module only performs TPM -@@ -22,11 +22,6 @@ - [Sources] - Tcg2ConfigPeim.c - Tpm12Support.h -- --[Sources.IA32, Sources.X64] -- Tpm12Support.c -- --[Sources.ARM, Sources.AARCH64] - Tpm12SupportNull.c - - [Packages] -@@ -41,10 +36,6 @@ - PeiServicesLib - Tpm2DeviceLib - --[LibraryClasses.IA32, LibraryClasses.X64] -- BaseLib -- Tpm12DeviceLib -- - [Guids] - gEfiTpmDeviceSelectedGuid ## PRODUCES ## GUID # Used as a PPI GUID - gEfiTpmDeviceInstanceTpm20DtpmGuid ## SOMETIMES_CONSUMES --- -2.27.0 - diff --git a/edk2-OvmfPkg-drop-TPM_CONFIG_ENABLE.patch b/edk2-OvmfPkg-drop-TPM_CONFIG_ENABLE.patch deleted file mode 100644 index d77387a..0000000 --- a/edk2-OvmfPkg-drop-TPM_CONFIG_ENABLE.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 505473655db4b91e4a0ac732069968f9eddabc51 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 15 Dec 2021 12:39:18 +0100 -Subject: [PATCH 3/6] OvmfPkg: drop TPM_CONFIG_ENABLE - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 9: backport tpm build updates, disable tpm 1.2 support -RH-Commit: [3/6] be335526f74358d4af21fbd35cc7008b227ebb23 (kraxel/centos-edk2) -RH-Bugzilla: 1935497 -RH-Acked-by: Oliver Steffen - -Drop TPM_CONFIG_ENABLE config option. Including TPM support in the -build without also including the TPM configuration menu is not useful. - -Suggested-by: Stefan Berger -Signed-off-by: Gerd Hoffmann -Tested-by: Stefan Berger -(cherry picked from commit 5711ff4d0b56ff4c58dc7a780e706bc58aed2253) ---- - OvmfPkg/OvmfTpmComponentsDxe.dsc.inc | 2 -- - OvmfPkg/OvmfTpmDefines.dsc.inc | 1 - - OvmfPkg/OvmfTpmDxe.fdf.inc | 2 -- - OvmfPkg/OvmfTpmPcdsHii.dsc.inc | 2 +- - OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 +++--- - OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 6 +++--- - OvmfPkg/PlatformCI/ReadMe.md | 2 +- - 7 files changed, 8 insertions(+), 13 deletions(-) - -diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -index d5c2586118..e025d85a58 100644 ---- a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -+++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -@@ -14,9 +14,7 @@ - NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf - NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf - } --!if $(TPM_CONFIG_ENABLE) == TRUE - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif - SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { - - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/OvmfTpmDefines.dsc.inc -index 51da7508b3..5df4a331fb 100644 ---- a/OvmfPkg/OvmfTpmDefines.dsc.inc -+++ b/OvmfPkg/OvmfTpmDefines.dsc.inc -@@ -3,4 +3,3 @@ - ## - - DEFINE TPM_ENABLE = FALSE -- DEFINE TPM_CONFIG_ENABLE = FALSE -diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc -index 9dcdaaf01c..32eef24638 100644 ---- a/OvmfPkg/OvmfTpmDxe.fdf.inc -+++ b/OvmfPkg/OvmfTpmDxe.fdf.inc -@@ -6,7 +6,5 @@ - INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf - INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf - INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf --!if $(TPM_CONFIG_ENABLE) == TRUE - INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf - !endif --!endif -diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -index 164bc9c7fc..2e02a5b4cb 100644 ---- a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -+++ b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -@@ -2,7 +2,7 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE -+!if $(TPM_ENABLE) == TRUE - gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS - !endif -diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml -index 7117b86b81..1774423580 100644 ---- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml -+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml -@@ -95,21 +95,21 @@ jobs: - OVMF_IA32X64_FULL_DEBUG: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "DEBUG" - Run.Flags: $(run_flags) - Run: $(should_run) - OVMF_IA32X64_FULL_RELEASE: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "RELEASE" - Run.Flags: $(run_flags) - Run: $(should_run) - OVMF_IA32X64_FULL_NOOPT: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "NOOPT" - Run.Flags: $(run_flags) - Run: $(should_run) -diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml -index 2e07a3d889..09f9851312 100644 ---- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml -+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml -@@ -94,14 +94,14 @@ jobs: - OVMF_IA32X64_FULL_DEBUG: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "DEBUG" - Run.Flags: $(run_flags) - Run: $(should_run) - OVMF_IA32X64_FULL_RELEASE: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "RELEASE" - Run.Flags: $(run_flags) - Run: $(should_run) -@@ -112,7 +112,7 @@ jobs: - # OVMF_IA32X64_FULL_NOOPT: - # Build.File: "$(package)/PlatformCI/PlatformBuild.py" - # Build.Arch: "IA32,X64" -- # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_TPM_CONFIG_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - # Build.Target: "NOOPT" - # Run.Flags: $(run_flags) - # Run: $(should_run) -diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md -index 2ce9007dbe..44aa7c4a9d 100644 ---- a/OvmfPkg/PlatformCI/ReadMe.md -+++ b/OvmfPkg/PlatformCI/ReadMe.md -@@ -14,7 +14,7 @@ supported and are described below. - | IA32 | IA32 | OvmfPkgIa32.dsc | None | - | X64 | X64 | OvmfPkgIa64.dsc | None | - | IA32 X64 | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | None | --| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM_ENABLE=1 TPM_CONFIG_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 | -+| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 | - - ## EDK2 Developer environment - --- -2.27.0 - diff --git a/edk2-OvmfPkg-move-tcg-configuration-to-dsc-and-fdf-includ.patch b/edk2-OvmfPkg-move-tcg-configuration-to-dsc-and-fdf-includ.patch deleted file mode 100644 index cc6af03..0000000 --- a/edk2-OvmfPkg-move-tcg-configuration-to-dsc-and-fdf-includ.patch +++ /dev/null @@ -1,993 +0,0 @@ -From 02544e617ce4dfffff15dab47463484ccdc9a51f Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 15 Dec 2021 12:39:17 +0100 -Subject: [PATCH 2/6] OvmfPkg: move tcg configuration to dsc and fdf include - files - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 9: backport tpm build updates, disable tpm 1.2 support -RH-Commit: [2/6] d811b2cf266baa0fa3f958af0b80bb208f3fe27c (kraxel/centos-edk2) -RH-Bugzilla: 1935497 -RH-Acked-by: Oliver Steffen - -With this in place the tpm configuration is not duplicated for each of -our four ovmf config variants (ia32, ia32x64, x64, amdsev) and it is -easier to keep them all in sync when updating the tpm configuration. - -No functional change. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Stefan Berger -(cherry picked from commit b47575801e1903e8b316d01840572ce2681cf2c6) - -[ kraxel: solve conflict in OvmfPkg/AmdSev/AmdSevX64.dsc ] ---- - OvmfPkg/AmdSev/AmdSevX64.dsc | 85 ++++----------------------- - OvmfPkg/AmdSev/AmdSevX64.fdf | 17 +----- - OvmfPkg/OvmfPkgIa32.dsc | 88 ++++------------------------ - OvmfPkg/OvmfPkgIa32.fdf | 17 +----- - OvmfPkg/OvmfPkgIa32X64.dsc | 85 ++++----------------------- - OvmfPkg/OvmfPkgIa32X64.fdf | 17 +----- - OvmfPkg/OvmfPkgX64.dsc | 85 ++++----------------------- - OvmfPkg/OvmfPkgX64.fdf | 17 +----- - OvmfPkg/OvmfTpmComponentsDxe.dsc.inc | 28 +++++++++ - OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 22 +++++++ - OvmfPkg/OvmfTpmDefines.dsc.inc | 6 ++ - OvmfPkg/OvmfTpmDxe.fdf.inc | 12 ++++ - OvmfPkg/OvmfTpmLibs.dsc.inc | 14 +++++ - OvmfPkg/OvmfTpmLibsDxe.dsc.inc | 8 +++ - OvmfPkg/OvmfTpmLibsPeim.dsc.inc | 9 +++ - OvmfPkg/OvmfTpmPcds.dsc.inc | 7 +++ - OvmfPkg/OvmfTpmPcdsHii.dsc.inc | 8 +++ - OvmfPkg/OvmfTpmPei.fdf.inc | 11 ++++ - OvmfPkg/OvmfTpmSecurityStub.dsc.inc | 8 +++ - 19 files changed, 185 insertions(+), 359 deletions(-) - create mode 100644 OvmfPkg/OvmfTpmComponentsDxe.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmComponentsPei.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmDefines.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmDxe.fdf.inc - create mode 100644 OvmfPkg/OvmfTpmLibs.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmLibsDxe.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmLibsPeim.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmPcds.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmPcdsHii.dsc.inc - create mode 100644 OvmfPkg/OvmfTpmPei.fdf.inc - create mode 100644 OvmfPkg/OvmfTpmSecurityStub.dsc.inc - -diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 88b65b9f59..8610602ddb 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -32,8 +32,8 @@ - # -D FLAG=VALUE - # - DEFINE SOURCE_DEBUG_ENABLE = FALSE -- DEFINE TPM_ENABLE = FALSE -- DEFINE TPM_CONFIG_ENABLE = FALSE -+ -+!include OvmfPkg/OvmfTpmDefines.dsc.inc - - # - # Shell can be useful for debugging but should not be enabled for production -@@ -203,16 +203,7 @@ - SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf - OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf - --!if $(TPM_ENABLE) == TRUE -- Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf -- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf -- Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf -- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf --!else -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf -- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf --!endif -+!include OvmfPkg/OvmfTpmLibs.dsc.inc - - [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -@@ -286,11 +277,7 @@ - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf - --!if $(TPM_ENABLE) == TRUE -- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf --!endif -+!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc - - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf - -@@ -371,10 +358,8 @@ - MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf - QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf - QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf --!if $(TPM_ENABLE) == TRUE -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf --!endif -+ -+!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc - - [LibraryClasses.common.UEFI_APPLICATION] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf -@@ -576,15 +561,10 @@ - - gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 - --!if $(TPM_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} --!endif -+!include OvmfPkg/OvmfTpmPcds.dsc.inc - - [PcdsDynamicHii] --!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS -- gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS --!endif -+!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc - - ################################################################################ - # -@@ -625,24 +605,7 @@ - UefiCpuPkg/CpuMpPei/CpuMpPei.inf - OvmfPkg/AmdSev/SecretPei/SecretPei.inf - --!if $(TPM_ENABLE) == TRUE -- OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -- SecurityPkg/Tcg/TcgPei/TcgPei.inf -- SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { -- -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc - - # - # DXE Phase modules -@@ -664,10 +627,7 @@ - - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { - --!if $(TPM_ENABLE) == TRUE -- NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf -- NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf --!endif -+!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc - } - - OvmfPkg/8259InterruptControllerDxe/8259.inf -@@ -830,27 +790,4 @@ - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { -- -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf -- NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } --!if $(TPM_CONFIG_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif -- SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { -- -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 325570c5a3..3f2329dab4 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -156,13 +156,7 @@ INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf - INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf - INF OvmfPkg/AmdSev/SecretPei/SecretPei.inf - --!if $(TPM_ENABLE) == TRUE --INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf --INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf --INF SecurityPkg/Tcg/TcgPei/TcgPei.inf --INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf --INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf --!endif -+!include OvmfPkg/OvmfTpmPei.fdf.inc - - ################################################################################ - -@@ -311,14 +305,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE --INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf --INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf --INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf --!if $(TPM_CONFIG_ENABLE) == TRUE --INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif --!endif -+!include OvmfPkg/OvmfTpmDxe.fdf.inc - - ################################################################################ - -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index fa42d919be..904176ccfc 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -32,10 +32,10 @@ - DEFINE SECURE_BOOT_ENABLE = FALSE - DEFINE SMM_REQUIRE = FALSE - DEFINE SOURCE_DEBUG_ENABLE = FALSE -- DEFINE TPM_ENABLE = FALSE -- DEFINE TPM_CONFIG_ENABLE = FALSE - DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE - -+!include OvmfPkg/OvmfTpmDefines.dsc.inc -+ - # - # Network definition - # -@@ -229,16 +229,7 @@ - SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf - OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf - --!if $(TPM_ENABLE) == TRUE -- Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf -- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf -- Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf -- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf --!else -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf -- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf --!endif -+!include OvmfPkg/OvmfTpmLibs.dsc.inc - - [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -@@ -309,11 +300,7 @@ - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf - --!if $(TPM_ENABLE) == TRUE -- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf --!endif -+!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc - - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf - -@@ -401,10 +388,8 @@ - MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf - QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf - QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf --!if $(TPM_ENABLE) == TRUE -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf --!endif -+ -+!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc - - [LibraryClasses.common.UEFI_APPLICATION] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf -@@ -643,19 +628,14 @@ - - gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 - --!if $(TPM_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} --!endif -+!include OvmfPkg/OvmfTpmPcds.dsc.inc - - # IPv4 and IPv6 PXE Boot support. - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 - - [PcdsDynamicHii] --!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS -- gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS --!endif -+!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc - - ################################################################################ - # -@@ -705,24 +685,7 @@ - !endif - UefiCpuPkg/CpuMpPei/CpuMpPei.inf - --!if $(TPM_ENABLE) == TRUE -- OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -- SecurityPkg/Tcg/TcgPei/TcgPei.inf -- SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { -- -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc - - # - # DXE Phase modules -@@ -747,10 +710,7 @@ - !if $(SECURE_BOOT_ENABLE) == TRUE - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf - !endif --!if $(TPM_ENABLE) == TRUE -- NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf -- NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf --!endif -+!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc - } - - OvmfPkg/8259InterruptControllerDxe/8259.inf -@@ -1004,31 +964,5 @@ - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { -- -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf -- NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } --!if $(TPM_CONFIG_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif -- SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { -- -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc - --!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE -- OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf --!endif -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 51433836d6..8ba9ffc83e 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -161,13 +161,7 @@ INF OvmfPkg/SmmAccess/SmmAccessPei.inf - !endif - INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf - --!if $(TPM_ENABLE) == TRUE --INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf --INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf --INF SecurityPkg/Tcg/TcgPei/TcgPei.inf --INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf --INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf --!endif -+!include OvmfPkg/OvmfTpmPei.fdf.inc - - ################################################################################ - -@@ -353,14 +347,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE --INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf --INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf --INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf --!if $(TPM_CONFIG_ENABLE) == TRUE --INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif --!endif -+!include OvmfPkg/OvmfTpmDxe.fdf.inc - - !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE - INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index ef962565f8..aebd8980e4 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -32,8 +32,8 @@ - DEFINE SECURE_BOOT_ENABLE = FALSE - DEFINE SMM_REQUIRE = FALSE - DEFINE SOURCE_DEBUG_ENABLE = FALSE -- DEFINE TPM_ENABLE = FALSE -- DEFINE TPM_CONFIG_ENABLE = FALSE -+ -+!include OvmfPkg/OvmfTpmDefines.dsc.inc - - # - # Network definition -@@ -233,16 +233,7 @@ - SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf - OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf - --!if $(TPM_ENABLE) == TRUE -- Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf -- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf -- Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf -- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf --!else -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf -- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf --!endif -+!include OvmfPkg/OvmfTpmLibs.dsc.inc - - [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -@@ -313,11 +304,7 @@ - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf - --!if $(TPM_ENABLE) == TRUE -- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf --!endif -+!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc - - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf - -@@ -405,10 +392,8 @@ - MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf - QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf - QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf --!if $(TPM_ENABLE) == TRUE -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf --!endif -+ -+!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc - - [LibraryClasses.common.UEFI_APPLICATION] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf -@@ -655,9 +640,7 @@ - - gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 - --!if $(TPM_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} --!endif -+!include OvmfPkg/OvmfTpmPcds.dsc.inc - - [PcdsDynamicDefault.X64] - # IPv4 and IPv6 PXE Boot support. -@@ -665,10 +648,7 @@ - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 - - [PcdsDynamicHii] --!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS -- gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS --!endif -+!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc - - ################################################################################ - # -@@ -718,24 +698,7 @@ - !endif - UefiCpuPkg/CpuMpPei/CpuMpPei.inf - --!if $(TPM_ENABLE) == TRUE -- OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -- SecurityPkg/Tcg/TcgPei/TcgPei.inf -- SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { -- -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc - - [Components.X64] - # -@@ -761,10 +724,7 @@ - !if $(SECURE_BOOT_ENABLE) == TRUE - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf - !endif --!if $(TPM_ENABLE) == TRUE -- NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf -- NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf --!endif -+!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc - } - - OvmfPkg/8259InterruptControllerDxe/8259.inf -@@ -1019,27 +979,4 @@ - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { -- -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf -- NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } --!if $(TPM_CONFIG_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif -- SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { -- -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index a50f80e1e9..65d2600016 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -164,13 +164,7 @@ INF OvmfPkg/SmmAccess/SmmAccessPei.inf - !endif - INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf - --!if $(TPM_ENABLE) == TRUE --INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf --INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf --INF SecurityPkg/Tcg/TcgPei/TcgPei.inf --INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf --INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf --!endif -+!include OvmfPkg/OvmfTpmPei.fdf.inc - - ################################################################################ - -@@ -363,14 +357,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE --INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf --INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf --INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf --!if $(TPM_CONFIG_ENABLE) == TRUE --INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif --!endif -+!include OvmfPkg/OvmfTpmDxe.fdf.inc - - ################################################################################ - -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index ba9f9833b0..e85ac3d682 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -32,8 +32,8 @@ - DEFINE SECURE_BOOT_ENABLE = FALSE - DEFINE SMM_REQUIRE = FALSE - DEFINE SOURCE_DEBUG_ENABLE = FALSE -- DEFINE TPM_ENABLE = FALSE -- DEFINE TPM_CONFIG_ENABLE = FALSE -+ -+!include OvmfPkg/OvmfTpmDefines.dsc.inc - - # - # Network definition -@@ -233,16 +233,7 @@ - SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf - OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf - --!if $(TPM_ENABLE) == TRUE -- Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf -- Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf -- Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf -- TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf --!else -- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf -- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf --!endif -+!include OvmfPkg/OvmfTpmLibs.dsc.inc - - [LibraryClasses.common] - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -@@ -315,11 +306,7 @@ - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf - --!if $(TPM_ENABLE) == TRUE -- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf --!endif -+!include OvmfPkg/OvmfTpmLibsPeim.dsc.inc - - MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLib.inf - -@@ -407,10 +394,8 @@ - MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf - QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf - QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf --!if $(TPM_ENABLE) == TRUE -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf --!endif -+ -+!include OvmfPkg/OvmfTpmLibsDxe.dsc.inc - - [LibraryClasses.common.UEFI_APPLICATION] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf -@@ -655,19 +640,14 @@ - - gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 - --!if $(TPM_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} --!endif -+!include OvmfPkg/OvmfTpmPcds.dsc.inc - - # IPv4 and IPv6 PXE Boot support. - gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 - gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 - - [PcdsDynamicHii] --!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE -- gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS -- gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS --!endif -+!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc - - ################################################################################ - # -@@ -717,24 +697,7 @@ - !endif - UefiCpuPkg/CpuMpPei/CpuMpPei.inf - --!if $(TPM_ENABLE) == TRUE -- OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -- OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -- SecurityPkg/Tcg/TcgPei/TcgPei.inf -- SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { -- -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc - - # - # DXE Phase modules -@@ -758,10 +721,7 @@ - - !if $(SECURE_BOOT_ENABLE) == TRUE - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf --!endif --!if $(TPM_ENABLE) == TRUE -- NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf -- NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf -+!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc - !endif - } - -@@ -1017,27 +977,4 @@ - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { -- -- Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf -- NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf -- HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -- NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -- NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -- } --!if $(TPM_CONFIG_ENABLE) == TRUE -- SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif -- SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { -- -- Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -- } -- SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { -- -- TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -- } --!endif -+!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index dd1c6eded9..e5cbae2073 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -180,13 +180,7 @@ INF OvmfPkg/SmmAccess/SmmAccessPei.inf - !endif - INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf - --!if $(TPM_ENABLE) == TRUE --INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf --INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf --INF SecurityPkg/Tcg/TcgPei/TcgPei.inf --INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf --INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf --!endif -+!include OvmfPkg/OvmfTpmPei.fdf.inc - - ################################################################################ - -@@ -379,14 +373,7 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf - # - # TPM support - # --!if $(TPM_ENABLE) == TRUE --INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf --INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf --INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf --!if $(TPM_CONFIG_ENABLE) == TRUE --INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf --!endif --!endif -+!include OvmfPkg/OvmfTpmDxe.fdf.inc - - ################################################################################ - -diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -new file mode 100644 -index 0000000000..d5c2586118 ---- /dev/null -+++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -@@ -0,0 +1,28 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+ SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { -+ -+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf -+ NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf -+ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterDxe.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -+ } -+!if $(TPM_CONFIG_ENABLE) == TRUE -+ SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -+!endif -+ SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { -+ -+ Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -+ } -+ SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { -+ -+ TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -+ } -+!endif -diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -new file mode 100644 -index 0000000000..99fa7c13b3 ---- /dev/null -+++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -@@ -0,0 +1,22 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+ OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -+ OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -+ SecurityPkg/Tcg/TcgPei/TcgPei.inf -+ SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { -+ -+ HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf -+ NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf -+ } -+ SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf { -+ -+ TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -+ } -+!endif -diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/OvmfTpmDefines.dsc.inc -new file mode 100644 -index 0000000000..51da7508b3 ---- /dev/null -+++ b/OvmfPkg/OvmfTpmDefines.dsc.inc -@@ -0,0 +1,6 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+ DEFINE TPM_ENABLE = FALSE -+ DEFINE TPM_CONFIG_ENABLE = FALSE -diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc -new file mode 100644 -index 0000000000..9dcdaaf01c ---- /dev/null -+++ b/OvmfPkg/OvmfTpmDxe.fdf.inc -@@ -0,0 +1,12 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf -+INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -+INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf -+!if $(TPM_CONFIG_ENABLE) == TRUE -+INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -+!endif -+!endif -diff --git a/OvmfPkg/OvmfTpmLibs.dsc.inc b/OvmfPkg/OvmfTpmLibs.dsc.inc -new file mode 100644 -index 0000000000..50100f2c03 ---- /dev/null -+++ b/OvmfPkg/OvmfTpmLibs.dsc.inc -@@ -0,0 +1,14 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+ Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf -+ Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf -+ Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf -+ Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf -+ TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf -+!else -+ Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf -+ TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf -+!endif -diff --git a/OvmfPkg/OvmfTpmLibsDxe.dsc.inc b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc -new file mode 100644 -index 0000000000..67d5027aba ---- /dev/null -+++ b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc -@@ -0,0 +1,8 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+ Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf -+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf -+!endif -diff --git a/OvmfPkg/OvmfTpmLibsPeim.dsc.inc b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc -new file mode 100644 -index 0000000000..4e84e3dcaa ---- /dev/null -+++ b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc -@@ -0,0 +1,9 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf -+ Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -+ Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf -+!endif -diff --git a/OvmfPkg/OvmfTpmPcds.dsc.inc b/OvmfPkg/OvmfTpmPcds.dsc.inc -new file mode 100644 -index 0000000000..0e7f83c04b ---- /dev/null -+++ b/OvmfPkg/OvmfTpmPcds.dsc.inc -@@ -0,0 +1,7 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+ gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} -+!endif -diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -new file mode 100644 -index 0000000000..164bc9c7fc ---- /dev/null -+++ b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -@@ -0,0 +1,8 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE -+ gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS -+ gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS -+!endif -diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc -new file mode 100644 -index 0000000000..9aefd73d21 ---- /dev/null -+++ b/OvmfPkg/OvmfTpmPei.fdf.inc -@@ -0,0 +1,11 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -+INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -+INF SecurityPkg/Tcg/TcgPei/TcgPei.inf -+INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf -+INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf -+!endif -diff --git a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc -new file mode 100644 -index 0000000000..4bd4066843 ---- /dev/null -+++ b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc -@@ -0,0 +1,8 @@ -+## -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+!if $(TPM_ENABLE) == TRUE -+ NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf -+ NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf -+!endif --- -2.27.0 - diff --git a/edk2-OvmfPkg-remove-unused-TPM-options-from-MicrovmX64.ds.patch b/edk2-OvmfPkg-remove-unused-TPM-options-from-MicrovmX64.ds.patch deleted file mode 100644 index 6920cec..0000000 --- a/edk2-OvmfPkg-remove-unused-TPM-options-from-MicrovmX64.ds.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9948bb7e9e693b4add121964ec724d4db09df352 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 15 Dec 2021 12:39:16 +0100 -Subject: [PATCH 1/6] OvmfPkg: remove unused TPM options from MicrovmX64.dsc - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 9: backport tpm build updates, disable tpm 1.2 support -RH-Commit: [1/6] cce6ba5501b413c0eb87ac452a53818e68dfa630 (kraxel/centos-edk2) -RH-Bugzilla: 1935497 -RH-Acked-by: Oliver Steffen - -Signed-off-by: Gerd Hoffmann -(cherry picked from commit 3a72ec71cd83f0f5ad2f1d3c78527f4b247da75f) ---- - OvmfPkg/Microvm/MicrovmX64.dsc | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc -index 617f925395..c58c4c35d4 100644 ---- a/OvmfPkg/Microvm/MicrovmX64.dsc -+++ b/OvmfPkg/Microvm/MicrovmX64.dsc -@@ -32,8 +32,6 @@ - DEFINE SECURE_BOOT_ENABLE = FALSE - DEFINE SMM_REQUIRE = FALSE - DEFINE SOURCE_DEBUG_ENABLE = FALSE -- DEFINE TPM_ENABLE = FALSE -- DEFINE TPM_CONFIG_ENABLE = FALSE - - # - # Network definition --- -2.27.0 - diff --git a/edk2-OvmfPkg-rework-TPM-configuration.patch b/edk2-OvmfPkg-rework-TPM-configuration.patch deleted file mode 100644 index 6843741..0000000 --- a/edk2-OvmfPkg-rework-TPM-configuration.patch +++ /dev/null @@ -1,293 +0,0 @@ -From 5787adaccb16e4af7df661d6c7eb3197c7f14218 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 15 Dec 2021 12:39:20 +0100 -Subject: [PATCH 5/6] OvmfPkg: rework TPM configuration - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 9: backport tpm build updates, disable tpm 1.2 support -RH-Commit: [5/6] 81ed86c6993e8cca4fabf5f471e198134b907562 (kraxel/centos-edk2) -RH-Bugzilla: 1935497 -RH-Acked-by: Oliver Steffen - -Rename TPM_ENABLE to TPM2_ENABLE so naming is in line with the -ArmVirtPkg config option name. - -Add separate TPM1_ENABLE option for TPM 1.2 support. - -Signed-off-by: Gerd Hoffmann -Tested-by: Stefan Berger -(cherry picked from commit 4de8d61bcec02a13ceed84f92b0cf3ea58adf9c5) ---- - OvmfPkg/OvmfTpmComponentsDxe.dsc.inc | 4 +++- - OvmfPkg/OvmfTpmComponentsPei.dsc.inc | 6 +++++- - OvmfPkg/OvmfTpmDefines.dsc.inc | 5 ++++- - OvmfPkg/OvmfTpmDxe.fdf.inc | 4 +++- - OvmfPkg/OvmfTpmLibs.dsc.inc | 4 +++- - OvmfPkg/OvmfTpmLibsDxe.dsc.inc | 4 +++- - OvmfPkg/OvmfTpmLibsPeim.dsc.inc | 4 +++- - OvmfPkg/OvmfTpmPcds.dsc.inc | 2 +- - OvmfPkg/OvmfTpmPcdsHii.dsc.inc | 2 +- - OvmfPkg/OvmfTpmPei.fdf.inc | 6 +++++- - OvmfPkg/OvmfTpmSecurityStub.dsc.inc | 4 +++- - OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 6 +++--- - OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 6 +++--- - OvmfPkg/PlatformCI/ReadMe.md | 2 +- - 14 files changed, 41 insertions(+), 18 deletions(-) - -diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -index e025d85a58..75ae09571e 100644 ---- a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -+++ b/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc -@@ -2,7 +2,7 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf { - - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf -@@ -15,10 +15,12 @@ - NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf - } - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -+!if $(TPM1_ENABLE) == TRUE - SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { - - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf - } -+!endif - SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { - - TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf -diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -index 87d491da50..fa486eed82 100644 ---- a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -+++ b/OvmfPkg/OvmfTpmComponentsPei.dsc.inc -@@ -2,10 +2,14 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE - OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -+!if $(TPM1_ENABLE) == TRUE - OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf - SecurityPkg/Tcg/TcgPei/TcgPei.inf -+!else -+ OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -+!endif - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { - - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf -diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/OvmfTpmDefines.dsc.inc -index 5df4a331fb..a65564d8d9 100644 ---- a/OvmfPkg/OvmfTpmDefines.dsc.inc -+++ b/OvmfPkg/OvmfTpmDefines.dsc.inc -@@ -2,4 +2,7 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - -- DEFINE TPM_ENABLE = FALSE -+ DEFINE TPM2_ENABLE = FALSE -+ -+ # has no effect unless TPM2_ENABLE == TRUE -+ DEFINE TPM1_ENABLE = TRUE -diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/OvmfTpmDxe.fdf.inc -index 32eef24638..7fc2bf8590 100644 ---- a/OvmfPkg/OvmfTpmDxe.fdf.inc -+++ b/OvmfPkg/OvmfTpmDxe.fdf.inc -@@ -2,8 +2,10 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE -+!if $(TPM1_ENABLE) == TRUE - INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf -+!endif - INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf - INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf - INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -diff --git a/OvmfPkg/OvmfTpmLibs.dsc.inc b/OvmfPkg/OvmfTpmLibs.dsc.inc -index 50100f2c03..418747b134 100644 ---- a/OvmfPkg/OvmfTpmLibs.dsc.inc -+++ b/OvmfPkg/OvmfTpmLibs.dsc.inc -@@ -2,8 +2,10 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE -+!if $(TPM1_ENABLE) == TRUE - Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf -+!endif - Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf - Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf - Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf -diff --git a/OvmfPkg/OvmfTpmLibsDxe.dsc.inc b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc -index 67d5027aba..1d66cdac77 100644 ---- a/OvmfPkg/OvmfTpmLibsDxe.dsc.inc -+++ b/OvmfPkg/OvmfTpmLibsDxe.dsc.inc -@@ -2,7 +2,9 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE -+!if $(TPM1_ENABLE) == TRUE - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf -+!endif - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf - !endif -diff --git a/OvmfPkg/OvmfTpmLibsPeim.dsc.inc b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc -index 4e84e3dcaa..03caccd7c6 100644 ---- a/OvmfPkg/OvmfTpmLibsPeim.dsc.inc -+++ b/OvmfPkg/OvmfTpmLibsPeim.dsc.inc -@@ -2,8 +2,10 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf -+!if $(TPM1_ENABLE) == TRUE - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -+!endif - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf - !endif -diff --git a/OvmfPkg/OvmfTpmPcds.dsc.inc b/OvmfPkg/OvmfTpmPcds.dsc.inc -index 0e7f83c04b..0d55d62737 100644 ---- a/OvmfPkg/OvmfTpmPcds.dsc.inc -+++ b/OvmfPkg/OvmfTpmPcds.dsc.inc -@@ -2,6 +2,6 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE - gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} - !endif -diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -index 2e02a5b4cb..e842253235 100644 ---- a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -+++ b/OvmfPkg/OvmfTpmPcdsHii.dsc.inc -@@ -2,7 +2,7 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE - gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS - gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS - !endif -diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/OvmfTpmPei.fdf.inc -index 709a608cc3..9f8b9bdd5b 100644 ---- a/OvmfPkg/OvmfTpmPei.fdf.inc -+++ b/OvmfPkg/OvmfTpmPei.fdf.inc -@@ -2,10 +2,14 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE - INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -+!if $(TPM1_ENABLE) == TRUE - INF OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf - INF SecurityPkg/Tcg/TcgPei/TcgPei.inf -+!else -+INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -+!endif - INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf - INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf - !endif -diff --git a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc -index 4bd4066843..e9ab2fca7b 100644 ---- a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc -+++ b/OvmfPkg/OvmfTpmSecurityStub.dsc.inc -@@ -2,7 +2,9 @@ - # SPDX-License-Identifier: BSD-2-Clause-Patent - ## - --!if $(TPM_ENABLE) == TRUE -+!if $(TPM2_ENABLE) == TRUE -+!if $(TPM1_ENABLE) == TRUE - NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf -+!endif - NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf - !endif -diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml -index 1774423580..8df31298f5 100644 ---- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml -+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml -@@ -95,21 +95,21 @@ jobs: - OVMF_IA32X64_FULL_DEBUG: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "DEBUG" - Run.Flags: $(run_flags) - Run: $(should_run) - OVMF_IA32X64_FULL_RELEASE: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "RELEASE" - Run.Flags: $(run_flags) - Run: $(should_run) - OVMF_IA32X64_FULL_NOOPT: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "NOOPT" - Run.Flags: $(run_flags) - Run: $(should_run) -diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml -index 09f9851312..68b5d951e9 100644 ---- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml -+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml -@@ -94,14 +94,14 @@ jobs: - OVMF_IA32X64_FULL_DEBUG: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "DEBUG" - Run.Flags: $(run_flags) - Run: $(should_run) - OVMF_IA32X64_FULL_RELEASE: - Build.File: "$(package)/PlatformCI/PlatformBuild.py" - Build.Arch: "IA32,X64" -- Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - Build.Target: "RELEASE" - Run.Flags: $(run_flags) - Run: $(should_run) -@@ -112,7 +112,7 @@ jobs: - # OVMF_IA32X64_FULL_NOOPT: - # Build.File: "$(package)/PlatformCI/PlatformBuild.py" - # Build.Arch: "IA32,X64" -- # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" -+ # Build.Flags: "BLD_*_SECURE_BOOT_ENABLE=1 BLD_*_SMM_REQUIRE=1 BLD_*_TPM2_ENABLE=1 BLD_*_NETWORK_TLS_ENABLE=1 BLD_*_NETWORK_IP6_ENABLE=1 BLD_*_NETWORK_HTTP_BOOT_ENABLE=1" - # Build.Target: "NOOPT" - # Run.Flags: $(run_flags) - # Run: $(should_run) -diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md -index 44aa7c4a9d..1216dee126 100644 ---- a/OvmfPkg/PlatformCI/ReadMe.md -+++ b/OvmfPkg/PlatformCI/ReadMe.md -@@ -14,7 +14,7 @@ supported and are described below. - | IA32 | IA32 | OvmfPkgIa32.dsc | None | - | X64 | X64 | OvmfPkgIa64.dsc | None | - | IA32 X64 | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | None | --| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 | -+| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM1_ENABLE=1 TPM2_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 | - - ## EDK2 Developer environment - --- -2.27.0 - diff --git a/edk2-Revert-ArmVirtPkg-Remove-NvmExpressDxe-device-driver.patch b/edk2-Revert-ArmVirtPkg-Remove-NvmExpressDxe-device-driver.patch deleted file mode 100644 index b2a6827..0000000 --- a/edk2-Revert-ArmVirtPkg-Remove-NvmExpressDxe-device-driver.patch +++ /dev/null @@ -1,75 +0,0 @@ -From e461204c45257d9a16d91f77fccd8ff171dfc4d6 Mon Sep 17 00:00:00 2001 -From: Oliver Steffen -Date: Tue, 8 Mar 2022 08:55:51 +0100 -Subject: [PATCH 2/2] Revert "ArmVirtPkg: Remove NvmExpressDxe device driver - (RHEL only)" - -RH-Author: Oliver Steffen -RH-MergeRequest: 11: Enable NVME support -RH-Commit: [2/2] b3a32e86d5aee575ad0cd8abfc0efcef1995e641 (osteffen/edk2) -RH-Bugzilla: 2044196 -RH-Acked-by: Gerd Hoffmann -RH-Acked-by: Laszlo Ersek - -Enable nvme support in ArmVirt. - -This reverts commit c165681779351c785d6e1946d6b861b71d07fb3f. - -Signed-off-by: Oliver Steffen ---- - ArmVirtPkg/ArmVirtQemu.dsc | 5 +++++ - ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 5 +++++ - ArmVirtPkg/ArmVirtQemuKernel.dsc | 5 +++++ - 3 files changed, 15 insertions(+) - -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 07d3723589..14dbf5840c 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -474,6 +474,11 @@ - 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 82b015d77d..1b97c247bc 100644 ---- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -122,6 +122,11 @@ 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 609f44dc24..b51113e3dc 100644 ---- a/ArmVirtPkg/ArmVirtQemuKernel.dsc -+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -403,6 +403,11 @@ - MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf - MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - -+ # -+ # NVME Driver -+ # -+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf -+ - # - # SMBIOS Support - # --- -2.31.1 - diff --git a/edk2-Revert-OvmfPkg-Remove-NvmExpressDxe-device-driver-RH.patch b/edk2-Revert-OvmfPkg-Remove-NvmExpressDxe-device-driver-RH.patch deleted file mode 100644 index 373c32e..0000000 --- a/edk2-Revert-OvmfPkg-Remove-NvmExpressDxe-device-driver-RH.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 64731450bae844e3b973fff242c11ddc25f440af Mon Sep 17 00:00:00 2001 -From: Oliver Steffen -Date: Mon, 7 Mar 2022 14:40:49 +0100 -Subject: [PATCH 1/2] Revert "OvmfPkg: Remove NvmExpressDxe device driver (RHEL - only)" - -RH-Author: Oliver Steffen -RH-MergeRequest: 11: Enable NVME support -RH-Commit: [1/2] 3d086425fd9fddb5426c8651825ceb7459d98523 (osteffen/edk2) -RH-Bugzilla: 2044196 -RH-Acked-by: Gerd Hoffmann -RH-Acked-by: Laszlo Ersek - -Enable nvme support in ovmf. - -This reverts commit a66385d84b6b156d09fc6c8a62297a684b4c39d9. - -Signed-off-by: Oliver Steffen ---- - 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 insertions(+) - -diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 8610602ddb..55c22770b4 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -701,6 +701,10 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 3f2329dab4..55a18ad7e6 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -247,6 +247,7 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 904176ccfc..a9ff0ac7a4 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -795,6 +795,10 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 8ba9ffc83e..aa28b8b166 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -257,6 +257,7 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index aebd8980e4..801c176c84 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -809,6 +809,10 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 65d2600016..1ca990817d 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -261,6 +261,7 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index e85ac3d682..353d1e6c7d 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -807,6 +807,10 @@ - OvmfPkg/SataControllerDxe/SataControllerDxe.inf - MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index e5cbae2073..a3a7eb1af2 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -277,6 +277,7 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf - INF OvmfPkg/SataControllerDxe/SataControllerDxe.inf - INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf - INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf -+INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf - INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf - INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf --- -2.31.1 - diff --git a/edk2.spec b/edk2.spec index c793dd0..7474350 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,7 +1,7 @@ ExclusiveArch: x86_64 aarch64 -%define GITDATE 20220126 -%define GITCOMMIT bb1bba3d77 +%define GITDATE 202202 +%define GITCOMMIT b24306f15d %define TOOLCHAIN GCC5 %define OPENSSL_VER 1.1.1k @@ -24,16 +24,16 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 4%{?dist} +Release: 1%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT URL: http://www.tianocore.org # The source tarball is created using following commands: -# COMMIT=bb1bba3d77 +# COMMIT=b24306f15d # git archive --format=tar --prefix=edk2-$COMMIT/ $COMMIT \ # | xz -9ev >/tmp/edk2-$COMMIT.tar.xz -Source0: http://batcave.lab.eng.brq.redhat.com/www/edk2-%{GITCOMMIT}.tar.xz +Source0:edk2-%{GITCOMMIT}.tar.xz Source1: ovmf-whitepaper-c770f8c.txt Source2: openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz Source3: ovmf-vars-generator @@ -47,59 +47,39 @@ Source13: edk2-ovmf.json Source14: edk2-ovmf-cc.json Source15: edk2-ovmf-amdsev.json -Patch0008: 0008-BaseTools-do-not-build-BrotliCompress-RH-only.patch -Patch0009: 0009-MdeModulePkg-remove-package-private-Brotli-include-p.patch -Patch0010: 0010-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch -Patch0011: 0011-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch -Patch0012: 0012-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch -Patch0013: 0013-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch -Patch0014: 0014-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch -Patch0015: 0015-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch -Patch0016: 0016-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch -Patch0017: 0017-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch -Patch0018: 0018-ArmVirtPkg-set-early-hello-message-RH-only.patch -Patch0019: 0019-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch -Patch0020: 0020-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch -Patch0021: 0021-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch -Patch0022: 0022-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch -Patch0023: 0023-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch -Patch0024: 0024-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch -Patch0025: 0025-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch -Patch0026: 0026-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch -Patch0029: 0029-OvmfPkg-Remove-PrintDxe-RHEL-only.patch -Patch0030: 0030-OvmfPkg-Remove-EbcDxe-RHEL-only.patch -Patch0031: 0031-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch -Patch0032: 0032-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch -Patch0033: 0033-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch -Patch0034: 0034-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch -Patch0035: 0035-OvmfPkg-Remove-NvmExpressDxe-device-driver-RHEL-only.patch -Patch0036: 0036-ArmVirtPkg-Remove-NvmExpressDxe-device-driver-RHEL-o.patch -Patch0037: 0037-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch -Patch0038: 0038-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch -Patch0039: 0039-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch -Patch0040: 0040-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch -Patch0041: 0041-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch -Patch0042: 0042-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch -Patch0043: 0043-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch -Patch0044: 0044-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch -Patch0045: 0045-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch -Patch0046: 0046-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch -# For bz#1935497 - edk2 implements and/or uses the deprecated MD5 and SHA-1 algorithms by default -Patch47: edk2-OvmfPkg-remove-unused-TPM-options-from-MicrovmX64.ds.patch -# For bz#1935497 - edk2 implements and/or uses the deprecated MD5 and SHA-1 algorithms by default -Patch48: edk2-OvmfPkg-move-tcg-configuration-to-dsc-and-fdf-includ.patch -# For bz#1935497 - edk2 implements and/or uses the deprecated MD5 and SHA-1 algorithms by default -Patch49: edk2-OvmfPkg-drop-TPM_CONFIG_ENABLE.patch -# For bz#1935497 - edk2 implements and/or uses the deprecated MD5 and SHA-1 algorithms by default -Patch50: edk2-OvmfPkg-create-Tcg12ConfigPei.inf.patch -# For bz#1935497 - edk2 implements and/or uses the deprecated MD5 and SHA-1 algorithms by default -Patch51: edk2-OvmfPkg-rework-TPM-configuration.patch -# For bz#2041755 - Mark SEV launch secret area as reserved -Patch52: edk2-OvmfPkg-AmdSev-SecretPei-Mark-SEV-launch-secret-area.patch -# For bz#2044196 - RFE: [nvme-vfio] The virt-install interface throws info "Failed to set new efi boot target" when install a vm on a hostdev nvme disk -Patch53: edk2-Revert-OvmfPkg-Remove-NvmExpressDxe-device-driver-RH.patch -# For bz#2044196 - RFE: [nvme-vfio] The virt-install interface throws info "Failed to set new efi boot target" when install a vm on a hostdev nvme disk -Patch54: edk2-Revert-ArmVirtPkg-Remove-NvmExpressDxe-device-driver.patch +Patch0002: 0002-Remove-submodules.patch +Patch0003: 0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch +Patch0004: 0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch +Patch0005: 0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +Patch0006: 0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +Patch0007: 0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +Patch0008: 0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch +Patch0009: 0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch +Patch0010: 0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +Patch0011: 0011-ArmVirtPkg-set-early-hello-message-RH-only.patch +Patch0012: 0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +Patch0013: 0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +Patch0014: 0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +Patch0015: 0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +Patch0016: 0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +Patch0017: 0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +Patch0018: 0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +Patch0019: 0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +Patch0021: 0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +Patch0022: 0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch +Patch0023: 0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +Patch0024: 0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch +Patch0025: 0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch +Patch0026: 0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +Patch0027: 0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +Patch0028: 0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch0029: 0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch0030: 0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +Patch0031: 0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +Patch0032: 0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +Patch0033: 0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +Patch0034: 0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +Patch0035: 0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch # python3-devel and libuuid-devel are required for building tools. @@ -550,6 +530,11 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$') %changelog +* Thu Mar 31 2022 Miroslav Rezanina - 202202gitb24306f15d-1 +- Rebae to edk-stable-202202 [bz#2056910] +- Resolves: bz#2056910 + ([rebase] update edk2 to feb '22 release (edk2-stable202202xx)) + * Wed Mar 23 2022 Miroslav Rezanina - 20220126gitbb1bba3d77-4 - edk2-Revert-OvmfPkg-Remove-NvmExpressDxe-device-driver-RH.patch [bz#2044196] - edk2-Revert-ArmVirtPkg-Remove-NvmExpressDxe-device-driver.patch [bz#2044196] diff --git a/sources b/sources index 398b227..911b267 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (edk2-bb1bba3d77.tar.xz) = 3e0deb750d3443f4a2c15a066842e35a05a6dc65ce1869c229a8328d3dba8375949ee3825e16c7fe01bd77516a6717ccbdda1d674a2a862453e5480094c49c4c -SHA512 (openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz) = a5da55813413ceaeb6a72e0cdbd3c56834e155593b53adf3ce608890d3f19dc0e70043d05568c7c677fb2b5148e5941f78fc7d731df33cd9b999de8df6436bef +SHA512 (edk2-b24306f15d.tar.xz) = af70744119c962ff50e32bfa97d744d4a0aa0f2109626675325f9c49cbda06b579c09f7ef818d641e7842d50af867ee0a572916d043e40d8a275eca6d3b89aaa +SHA512 (openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz) = cb8fa59c8ae1ce8bb1bc43a7776b1a3110ed9e563f9cb6d8da0f7b882d41ac318a069f01ce9feb8ce9f80c414e0bdf47145a1de96fce8a7f205f5f5342e5ea35