From 0476d891c1e50c8058cd8fbfa6a3867bcfd7636b Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: May 31 2022 07:14:00 +0000 Subject: refresh patches some non-trivial updates in 0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch automatic git rebase otherwise --- diff --git a/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch b/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch index 298d93b..61dd726 100644 --- a/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch +++ b/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch @@ -1,4 +1,4 @@ -From 61e29798c9c4e6b89a8e5c50939c6ab2f9ba3478 Mon Sep 17 00:00:00 2001 +From a5e7f28a51b616d79bf3e80ce185260a75c20caa Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 4 Jun 2020 13:34:12 +0200 Subject: [PATCH 01/21] BaseTools: do not build BrotliCompress (RH only) @@ -39,5 +39,5 @@ index 8c191e0c3817..3eae824a1c31 100644 EfiRom \ GenFfs \ -- -2.35.1 +2.35.3 diff --git a/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch b/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch index c20a494..ec631f4 100644 --- a/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch +++ b/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch @@ -1,4 +1,4 @@ -From f4eea2685593bc4f39ebc50d79b849fd853a3a62 Mon Sep 17 00:00:00 2001 +From 77bc79dfc2d70a7ffe81ab4c764bb5b503e34b07 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 4 Jun 2020 13:39:08 +0200 Subject: [PATCH 02/21] MdeModulePkg: remove package-private Brotli include @@ -32,7 +32,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 3 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 40601c95832b..56138abbe407 100644 +index 2bcb9f9453af..f549276b8061 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -24,9 +24,6 @@ [Defines] @@ -46,5 +46,5 @@ index 40601c95832b..56138abbe407 100644 ## @libraryclass Defines a set of methods to reset whole system. ResetSystemLib|Include/Library/ResetSystemLib.h -- -2.35.1 +2.35.3 diff --git a/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch index d5e571e..87e7078 100644 --- a/0003-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 6c102285ab54deba5098316e9a56a95e6895c866 Mon Sep 17 00:00:00 2001 +From 967e66ce4fbce81338ed4cdd9131a4a25a24e461 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 20 Feb 2014 22:54:45 +0100 Subject: [PATCH 03/21] OvmfPkg: increase max debug message length to 512 (RHEL @@ -79,5 +79,5 @@ index 4e25f198aa76..640627f38b72 100644 // // VA_LIST can not initialize to NULL for all compiler, so we use this to -- -2.35.1 +2.35.3 diff --git a/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch index bd3661f..fabcf69 100644 --- a/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch +++ b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch @@ -1,4 +1,4 @@ -From 986f59c22b45facd1bd124896a5c655d901065a3 Mon Sep 17 00:00:00 2001 +From 8708aff7d939989ab52932c1329c81dfe86bdc61 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 18:40:35 +0100 Subject: [PATCH 04/21] MdeModulePkg: TerminalDxe: add other text resolutions @@ -165,5 +165,5 @@ index e2d779c78378..f238c4103b3d 100644 // New modes can be added here. // -- -2.35.1 +2.35.3 diff --git a/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index 18937e3..6146c29 100644 --- a/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,4 +1,4 @@ -From 7d89e95bad10d53c0b58f96606d076fe73a648cb Mon Sep 17 00:00:00 2001 +From 8fd6e63635f50b2dc9e950056f17c1688107647d Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 Subject: [PATCH 05/21] MdeModulePkg: TerminalDxe: set xterm resolution on mode @@ -87,12 +87,12 @@ Signed-off-by: Laszlo Ersek 3 files changed, 35 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 56138abbe407..8a2bc9e4f80b 100644 +index f549276b8061..1415766054be 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2080,6 +2080,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] - # @Prompt Enable PCIe Resizable BAR Capability support. - gEfiMdeModulePkgTokenSpaceGuid.PcdPcieResizableBarSupport|FALSE|BOOLEAN|0x10000024 +@@ -2092,6 +2092,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] + # @Prompt The shared bit mask when Intel Tdx is enabled. + gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask|0x0|UINT64|0x10000025 + ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal + # mode change. @@ -176,5 +176,5 @@ index 7809869e7d49..496849458db4 100644 Status = This->ClearScreen (This); -- -2.35.1 +2.35.3 diff --git a/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index df5c8a1..3565a4a 100644 --- a/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,9 +1,14 @@ -From d0b512ade91abd2183c879a07663ceb085b261a2 Mon Sep 17 00:00:00 2001 +From b969a329b7a7df0f8f25c8497eaa3c0987b69265 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 Subject: [PATCH 06/21] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only) +edk2-stable202205 rebase + +- re-add UPDATE_BOOLEAN_PCD_FROM_FW_CFG +- add microvm, cloudhw and inteltdx + edk2-stable202108 rebase - resolve conflict in OvmfPkg/PlatformPei/PlatformPei.inf @@ -71,19 +76,22 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 2cc462ee963d0be119bc97bfc9c70d292a40516f) (cherry picked from commit 51e0de961029af84b5bdbfddcc9762b1819d500f) --- - OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + - OvmfPkg/OvmfPkgIa32.dsc | 1 + - OvmfPkg/OvmfPkgIa32X64.dsc | 1 + - OvmfPkg/OvmfPkgX64.dsc | 1 + - OvmfPkg/PlatformPei/PlatformPei.inf | 1 + - OvmfPkg/PlatformPei/Platform.c | 1 + - 6 files changed, 6 insertions(+) + OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + + OvmfPkg/CloudHv/CloudHvX64.dsc | 1 + + OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 + + OvmfPkg/Microvm/MicrovmX64.dsc | 1 + + OvmfPkg/OvmfPkgIa32.dsc | 1 + + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + + OvmfPkg/OvmfPkgX64.dsc | 1 + + OvmfPkg/PlatformPei/PlatformPei.inf | 1 + + OvmfPkg/PlatformPei/Platform.c | 13 +++++++++++++ + 9 files changed, 21 insertions(+) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index fd56176796d5..d1f9bc6d0d61 100644 +index fc1fdb2e2297..ae23094ffc27 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -519,6 +519,7 @@ [PcdsFixedAtBuild] +@@ -524,6 +524,7 @@ [PcdsFixedAtBuild] [PcdsDynamicDefault] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -91,11 +99,47 @@ index fd56176796d5..d1f9bc6d0d61 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 +diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc +index 92664f319be2..4aa54e4dc3fb 100644 +--- a/OvmfPkg/CloudHv/CloudHvX64.dsc ++++ b/OvmfPkg/CloudHv/CloudHvX64.dsc +@@ -574,6 +574,7 @@ [PcdsDynamicDefault] + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + !if $(SMM_REQUIRE) == FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 +diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +index dd8d446f4a56..ec1aab6f0939 100644 +--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc ++++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +@@ -461,6 +461,7 @@ [PcdsDynamicDefault] + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 +diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc +index f8fc977cb205..4e5ab89c8f0d 100644 +--- a/OvmfPkg/Microvm/MicrovmX64.dsc ++++ b/OvmfPkg/Microvm/MicrovmX64.dsc +@@ -557,6 +557,7 @@ [PcdsDynamicDefault] + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 85abed24c1a7..6bcd222af7c2 100644 +index a9841cbfc3ca..b69e3c05a281 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -580,6 +580,7 @@ [PcdsDynamicDefault] +@@ -585,6 +585,7 @@ [PcdsDynamicDefault] # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -104,10 +148,10 @@ index 85abed24c1a7..6bcd222af7c2 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index a9c1daecc1a8..0cce3b768e12 100644 +index f7949780fa38..726011ec42a5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -586,6 +586,7 @@ [PcdsDynamicDefault] +@@ -593,6 +593,7 @@ [PcdsDynamicDefault] # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -116,10 +160,10 @@ index a9c1daecc1a8..0cce3b768e12 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 718399299f57..847cf6a46652 100644 +index 1448f925b782..ab2e31ea8f2b 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -585,6 +585,7 @@ [PcdsDynamicDefault] +@@ -612,6 +612,7 @@ [PcdsDynamicDefault] # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -128,10 +172,10 @@ index 718399299f57..847cf6a46652 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index 212aa7b04751..1c0b7204ea9a 100644 +index 00372fa0ebb5..2dfa357c384a 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf -@@ -97,6 +97,7 @@ [Pcd] +@@ -98,6 +98,7 @@ [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved @@ -140,17 +184,36 @@ index 212aa7b04751..1c0b7204ea9a 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index d0323c645162..9011a55d0f90 100644 +index f006755d5fdb..b8f56902512c 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c -@@ -851,6 +851,7 @@ InitializePlatform ( +@@ -41,6 +41,18 @@ + + #include "Platform.h" + ++#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \ ++ do { \ ++ BOOLEAN Setting; \ ++ RETURN_STATUS PcdStatus; \ ++ \ ++ if (!RETURN_ERROR (QemuFwCfgParseBool ( \ ++ "opt/ovmf/" #TokenName, &Setting))) { \ ++ PcdStatus = PcdSetBoolS (TokenName, Setting); \ ++ ASSERT_RETURN_ERROR (PcdStatus); \ ++ } \ ++ } while (0) ++ + EFI_HOB_PLATFORM_INFO mPlatformInfoHob = { 0 }; + + EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] = { +@@ -387,6 +399,7 @@ InitializePlatform ( MemTypeInfoInitialization (); - MemMapInitialization (); + MemMapInitialization (&mPlatformInfoHob); NoexecDxeInitialization (); + UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); } InstallClearCacheCallback (); -- -2.35.1 +2.35.3 diff --git a/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index f0eeeac..5db05d1 100644 --- a/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,4 +1,4 @@ -From 39b83b28b9239d2c55226f4861c469f38fd967d1 Mon Sep 17 00:00:00 2001 +From b991e60356f0b990792a8951f8856d6544a9cd9b Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 Subject: [PATCH 07/21] ArmVirtPkg: take PcdResizeXterm from the QEMU command @@ -96,10 +96,10 @@ Signed-off-by: Laszlo Ersek create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index b2b0d304d335..6960df62b082 100644 +index aa0ce61630f7..7705bf391976 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -282,6 +282,8 @@ [PcdsDynamicDefault.common] +@@ -284,6 +284,8 @@ [PcdsDynamicDefault.common] gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0 !endif @@ -108,7 +108,7 @@ index b2b0d304d335..6960df62b082 100644 [PcdsDynamicHii] gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS -@@ -384,7 +386,10 @@ [Components.common] +@@ -386,7 +388,10 @@ [Components.common] MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf @@ -200,5 +200,5 @@ index 000000000000..bfd3a6a535f9 + return RETURN_SUCCESS; +} -- -2.35.1 +2.35.3 diff --git a/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch index e57d931..4c433f8 100644 --- a/0008-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 2d7c77e17a3461d53521b42221e468fb234d5893 Mon Sep 17 00:00:00 2001 +From 6c0b7391222b4d33dbcee952b0f785701031e972 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:53 +0100 Subject: [PATCH 08/21] OvmfPkg: allow exclusion of the shell from the firmware @@ -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 a6b2142ccd0c..b5bc8407e7d7 100644 +index 57d13b7130bc..69044874e2f7 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -283,12 +283,14 @@ [FV.DXEFV] +@@ -298,12 +298,14 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -130,10 +130,10 @@ index a6b2142ccd0c..b5bc8407e7d7 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 49266dd46768..f4fa19bb013c 100644 +index ccde366887a9..bf535bef4200 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -287,12 +287,14 @@ [FV.DXEFV] +@@ -299,12 +299,14 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -149,10 +149,10 @@ index 49266dd46768..f4fa19bb013c 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index ba7f26d01dc4..dfd17804c2a2 100644 +index 438806fba8f1..21e4ce00dde6 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -309,12 +309,14 @@ [FV.DXEFV] +@@ -324,12 +324,14 @@ [FV.DXEFV] INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -168,5 +168,5 @@ index ba7f26d01dc4..dfd17804c2a2 100644 INF MdeModulePkg/Logo/LogoDxe.inf -- -2.35.1 +2.35.3 diff --git a/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch index c1f24b1..b33a5c0 100644 --- a/0009-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 da4731a05cd2279c5ba504ad117ccd6256d75305 Mon Sep 17 00:00:00 2001 +From a432c70d28e61a51047616cedc75ca54257d1558 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:49:43 +0200 Subject: [PATCH 09/21] ArmPlatformPkg: introduce fixed PCD for early hello @@ -90,5 +90,5 @@ index 3a25ddcdc8ca..b2b58553c7a6 100644 ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024 -- -2.35.1 +2.35.3 diff --git a/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch index 557ac1e..b97875c 100644 --- a/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +++ b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch @@ -1,4 +1,4 @@ -From 2ac5fede049429237cb2a698a9f927f21fd22c6e Mon Sep 17 00:00:00 2001 +From 1492c375e52d3cc6d8c39fc4853f10ceeca2948c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:59:20 +0200 Subject: [PATCH 10/21] ArmPlatformPkg: PrePeiCore: write early hello message @@ -73,10 +73,10 @@ Signed-off-by: Laszlo Ersek 5 files changed, 15 insertions(+) diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -index fb01dd1a113e..a6681c103297 100644 +index a5b4722459d1..ea7b220bc831 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -@@ -69,6 +69,8 @@ [FixedPcd] +@@ -66,6 +66,8 @@ [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize @@ -86,10 +86,10 @@ index fb01dd1a113e..a6681c103297 100644 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase gArmTokenSpaceGuid.PcdGicSgiIntId diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -index e9eb092d3ac9..c98dc82f0c66 100644 +index 466a2b01c384..29fb8737cb2f 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -@@ -67,4 +67,6 @@ [FixedPcd] +@@ -64,4 +64,6 @@ [FixedPcd] gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize @@ -141,5 +141,5 @@ index 1c2580eb923b..2a7580dbb405 100644 // Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at -- -2.35.1 +2.35.3 diff --git a/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch index c4c046c..bdcf172 100644 --- a/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch +++ b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch @@ -1,4 +1,4 @@ -From aa5965f02de8c044106a413f817b6a2651e89e97 Mon Sep 17 00:00:00 2001 +From 01ac59a696ed46ab1444bc5e15de791c0d90bad5 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 14:07:17 +0200 Subject: [PATCH 11/21] 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 6960df62b082..847a82ac52e6 100644 +index 7705bf391976..ae35cc18008d 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -134,6 +134,7 @@ [PcdsFeatureFlag.common] @@ -78,5 +78,5 @@ index 6960df62b082..847a82ac52e6 100644 gArmTokenSpaceGuid.PcdVFPEnabled|1 !endif -- -2.35.1 +2.35.3 diff --git a/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch index e4374d0..5ef3750 100644 --- a/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,4 +1,4 @@ -From 68eb31a414bf2fc427cfa7831a90690dcb703c65 Mon Sep 17 00:00:00 2001 +From 9fcfbf51e0a342172f316ae709311b4a6365b673 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:45 +0100 Subject: [PATCH 12/21] 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 d1f9bc6d0d61..538a0c77f671 100644 +index ae23094ffc27..ccc46c974b16 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -471,7 +471,7 @@ [PcdsFixedAtBuild] +@@ -476,7 +476,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -78,10 +78,10 @@ index d1f9bc6d0d61..538a0c77f671 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 6bcd222af7c2..91a3c8f9dda6 100644 +index b69e3c05a281..bbe4e91037c2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -520,7 +520,7 @@ [PcdsFixedAtBuild] +@@ -525,7 +525,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -91,10 +91,10 @@ index 6bcd222af7c2..91a3c8f9dda6 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 0cce3b768e12..1a7ba6e6eac5 100644 +index 726011ec42a5..072f06c0a3ab 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -524,7 +524,7 @@ [PcdsFixedAtBuild] +@@ -531,7 +531,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -104,10 +104,10 @@ index 0cce3b768e12..1a7ba6e6eac5 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 847cf6a46652..1a7afc764607 100644 +index ab2e31ea8f2b..46661408f97b 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -525,7 +525,7 @@ [PcdsFixedAtBuild] +@@ -548,7 +548,7 @@ [PcdsFixedAtBuild] # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -117,5 +117,5 @@ index 847cf6a46652..1a7afc764607 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 -- -2.35.1 +2.35.3 diff --git a/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index b681445..c10ea96 100644 --- a/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +++ b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch @@ -1,4 +1,4 @@ -From 4a93ff1fcac08c28bd3f70e9f5bb0e402c27cb43 Mon Sep 17 00:00:00 2001 +From f577d3719babf7d2cf3bd8f4a404007236e19125 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:46 +0100 Subject: [PATCH 13/21] 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 538a0c77f671..ea4070eedbde 100644 +index ccc46c974b16..c66ad3af1a23 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -715,8 +715,14 @@ [Components] +@@ -726,8 +726,14 @@ [Components] MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf @@ -103,10 +103,10 @@ index 538a0c77f671..ea4070eedbde 100644 # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 91a3c8f9dda6..37d1d4b9a5e0 100644 +index bbe4e91037c2..b37a5a6da948 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -812,9 +812,15 @@ [Components] +@@ -830,9 +830,15 @@ [Components] MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -125,10 +125,10 @@ index 91a3c8f9dda6..37d1d4b9a5e0 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 1a7ba6e6eac5..948e1a5ba59c 100644 +index 072f06c0a3ab..b0e8c20e93d7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -826,9 +826,15 @@ [Components.X64] +@@ -844,9 +844,15 @@ [Components.X64] MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -147,10 +147,10 @@ index 1a7ba6e6eac5..948e1a5ba59c 100644 # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 1a7afc764607..46799406b613 100644 +index 46661408f97b..6211d5e934de 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -823,9 +823,15 @@ [Components] +@@ -909,9 +909,15 @@ [Components] MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -169,5 +169,5 @@ index 1a7afc764607..46799406b613 100644 # -- -2.35.1 +2.35.3 diff --git a/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index 850d5d3..c8860f2 100644 --- a/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +++ b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch @@ -1,4 +1,4 @@ -From 1a0949d47578b6f74e3ac70c479454307141c1b9 Mon Sep 17 00:00:00 2001 +From 4460b520c24a003b977dded58a0f62bf70a83c69 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 Subject: [PATCH 14/21] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in @@ -61,10 +61,10 @@ Signed-off-by: Laszlo Ersek 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 847a82ac52e6..d94a8cdd696e 100644 +index ae35cc18008d..f30c1e622c30 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -509,7 +509,10 @@ [Components.common] +@@ -511,7 +511,10 @@ [Components.common] # # Video support # @@ -77,10 +77,10 @@ index 847a82ac52e6..d94a8cdd696e 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 36343f347bab..99189055d8bd 100644 +index 7f7d15d6eee3..14f7b29991bc 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -438,7 +438,10 @@ [Components.common] +@@ -440,7 +440,10 @@ [Components.common] # # Video support # @@ -93,5 +93,5 @@ index 36343f347bab..99189055d8bd 100644 OvmfPkg/PlatformDxe/Platform.inf -- -2.35.1 +2.35.3 diff --git a/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch index f289454..5d15a5f 100644 --- a/0015-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 9ee0430cff8d62256904063205d6c874cf949adf Mon Sep 17 00:00:00 2001 +From d64349e98dac4add2813971c7e9f44d837d87880 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Thu, 1 Aug 2019 20:43:48 +0200 Subject: [PATCH 15/21] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on @@ -92,5 +92,5 @@ index f5113fbc78a6..0295986fe0f1 100644 } -- -2.35.1 +2.35.3 diff --git a/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index 11b88c3..344cfb5 100644 --- a/0016-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 a365d5f65506c2b8c993089ad5b77dac7c6f4296 Mon Sep 17 00:00:00 2001 +From 19a991fbfc8dd21a9ccff051da77c8651ee7aa14 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:47 +0100 Subject: [PATCH 16/21] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in @@ -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 ea4070eedbde..b9718ff03f7b 100644 +index c66ad3af1a23..7df6e5c825d7 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -709,7 +709,10 @@ [Components] +@@ -720,7 +720,10 @@ [Components] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -79,10 +79,10 @@ index ea4070eedbde..b9718ff03f7b 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 37d1d4b9a5e0..4dfd33853162 100644 +index b37a5a6da948..ed6a820d2e1d 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -805,7 +805,10 @@ [Components] +@@ -823,7 +823,10 @@ [Components] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -95,10 +95,10 @@ index 37d1d4b9a5e0..4dfd33853162 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 948e1a5ba59c..63721e5d177e 100644 +index b0e8c20e93d7..b5be86cff32c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -819,7 +819,10 @@ [Components.X64] +@@ -837,7 +837,10 @@ [Components.X64] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -111,10 +111,10 @@ index 948e1a5ba59c..63721e5d177e 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 46799406b613..cac0391c0807 100644 +index 6211d5e934de..29b45e68e387 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -816,7 +816,10 @@ [Components] +@@ -902,7 +902,10 @@ [Components] OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -127,5 +127,5 @@ index 46799406b613..cac0391c0807 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -- -2.35.1 +2.35.3 diff --git a/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch index 0d76682..295993e 100644 --- a/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +++ b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch @@ -1,4 +1,4 @@ -From 5a952392dd42f4f041f2c8e9e8aaf7df1d654639 Mon Sep 17 00:00:00 2001 +From 85896a30011c3db49aa377c80e0ea81b7d8005f9 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 16 Nov 2019 17:11:27 +0100 Subject: [PATCH 17/21] CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files @@ -131,10 +131,10 @@ Signed-off-by: Laszlo Ersek 2 files changed, 22 insertions(+) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -index d84bde056af2..19913a4ac617 100644 +index c899b811b149..4a89dc82b65e 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -@@ -570,6 +570,17 @@ [Sources] +@@ -620,6 +620,17 @@ [Sources] $(OPENSSL_PATH)/ssl/statem/statem.h $(OPENSSL_PATH)/ssl/statem/statem_local.h # Autogenerated files list ends here @@ -153,10 +153,10 @@ index d84bde056af2..19913a4ac617 100644 ossl_store.c rand_pool.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -index cdeed0d073eb..5057857e8d89 100644 +index 0ec372454119..f1cc0aaf9fda 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -@@ -519,6 +519,17 @@ [Sources] +@@ -569,6 +569,17 @@ [Sources] $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h # Autogenerated files list ends here @@ -175,5 +175,5 @@ index cdeed0d073eb..5057857e8d89 100644 ossl_store.c rand_pool.c -- -2.35.1 +2.35.3 diff --git a/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index 4cbbf3b..af8d0bb 100644 --- a/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +++ b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch @@ -1,4 +1,4 @@ -From c36a16dad384129382088ef783d8e672ead2752a Mon Sep 17 00:00:00 2001 +From 98e14a58d727bb2d863a7a8c3a257f3b02b15b80 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:31:36 +0200 Subject: [PATCH 18/21] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no @@ -80,5 +80,5 @@ index d4f3cd92255f..f007f8a6c233 100644 } -- -2.35.1 +2.35.3 diff --git a/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch index eb80d57..d21cd95 100644 --- a/0019-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 bee2e929ef342eafbe44f0471154da4270cac91d Mon Sep 17 00:00:00 2001 +From ee4dd84fe0d33568b1800f5d6840627103c46d8d Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:40:09 +0200 Subject: [PATCH 19/21] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in @@ -78,5 +78,5 @@ index f6ea8b2bbf18..681eb7e08b98 100644 } -- -2.35.1 +2.35.3 diff --git a/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch b/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch index bf41586..3526dcf 100644 --- a/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch +++ b/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch @@ -1,4 +1,4 @@ -From b0f070f4bf317f899de1b20a122ca124ad900d80 Mon Sep 17 00:00:00 2001 +From 74b3fd529e1b49dbe1ede576d23771d4f071d338 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 2 Dec 2021 14:06:18 +0100 Subject: [PATCH 20/21] OvmfPkg/Microvm: take PcdResizeXterm from the QEMU @@ -9,17 +9,17 @@ Subject: [PATCH 20/21] OvmfPkg/Microvm: take PcdResizeXterm from the QEMU 1 file changed, 1 insertion(+) diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc -index 1ea43443ae97..073ff040a28a 100644 +index 4e5ab89c8f0d..e1a7e6cb77a9 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc -@@ -551,6 +551,7 @@ [PcdsDynamicDefault] +@@ -556,6 +556,7 @@ [PcdsDynamicDefault] # only set when # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 -- -2.35.1 +2.35.3 diff --git a/0021-Tweak-the-tools_def-to-support-cross-compiling.patch b/0021-Tweak-the-tools_def-to-support-cross-compiling.patch index 5c1ee18..60fe752 100644 --- a/0021-Tweak-the-tools_def-to-support-cross-compiling.patch +++ b/0021-Tweak-the-tools_def-to-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From 7aa9291cca4a5d3e499081741ae1bff1c2ebe2e9 Mon Sep 17 00:00:00 2001 +From 6b2ca6f01bb76a3b9632e902b4bf0ef9e912ce40 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 16 Aug 2018 15:45:47 -0400 Subject: [PATCH 21/21] Tweak the tools_def to support cross-compiling. @@ -12,10 +12,10 @@ Signed-off-by: Cole Robinson 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 9c310cf23d25..3189a3958b53 100755 +index 5ed19810b727..5901d9eecb5d 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -2299,17 +2299,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 +@@ -2280,17 +2280,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 ################## # GCC5 IA32 definitions ################## @@ -44,7 +44,7 @@ index 9c310cf23d25..3189a3958b53 100755 *_GCC5_IA32_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m32 *_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -no-pie -@@ -2331,17 +2331,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -2312,17 +2312,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, ################## # GCC5 X64 definitions ################## @@ -74,5 +74,5 @@ index 9c310cf23d25..3189a3958b53 100755 *_GCC5_X64_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m64 *_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -- -2.35.1 +2.35.3