diff --git a/0002-Remove-submodules.patch b/0002-Remove-submodules.patch index 58b0121..c29effb 100644 --- a/0002-Remove-submodules.patch +++ b/0002-Remove-submodules.patch @@ -1,4 +1,4 @@ -From b7053a8abb865ff58bc92cae6e573ae1e805b602 Mon Sep 17 00:00:00 2001 +From e059bdb72b083241da0742e11c2ac3cc61ed8ad9 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 24 Mar 2022 03:23:02 -0400 Subject: Remove submodules @@ -75,10 +75,10 @@ index 5275f657ef..39d7199753 100644 EfiRom \ GenFfs \ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 58e6ab0048..775f1b27af 100644 +index e8058c8bfa..f33312fb35 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -24,9 +24,6 @@ +@@ -25,9 +25,6 @@ [Includes] Include diff --git a/0003-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch b/0003-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch deleted file mode 100644 index 483c63d..0000000 --- a/0003-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch +++ /dev/null @@ -1,172 +0,0 @@ -From cef6b69ea8f009aeba50b2f4b69889f9500fa585 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: - -- no change - -Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] -> -RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase: - -- no changes - -Notes about the RHEL-8.1/20190308-89910a39dcfd [edk2-stable201903] -> -RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] rebase: - -- no changes - -Notes about the RHEL-8.0/20180508-ee3198e672e2 -> -RHEL-8.1/20190308-89910a39dcfd rebase: - -- no change - -Notes about the RHEL-7.6/ovmf-20180508-2.gitee3198e672e2.el7 -> -RHEL-8.0/20180508-ee3198e672e2 rebase: - -- reorder the rebase changelog in the commit message so that it reads like - a blog: place more recent entries near the top -- no changes to the patch body - -Notes about the 20171011-92d07e48907f -> 20180508-ee3198e672e2 rebase: - -- update commit message as requested in - - -Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase: - -- no changes - -Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase: - -- adapt commit 0bc77c63de03 (code and commit message) to upstream commit - 390b95a49c14 ("MdeModulePkg/TerminalDxe: Refine - InitializeTerminalConsoleTextMode", 2017-01-10). - -When the console output is multiplexed to several devices by -ConSplitterDxe, then ConSplitterDxe builds an intersection of text modes -supported by all console output devices. - -Two notable output devices are provided by: -(1) MdeModulePkg/Universal/Console/GraphicsConsoleDxe, -(2) MdeModulePkg/Universal/Console/TerminalDxe. - -GraphicsConsoleDxe supports four modes at most -- see -InitializeGraphicsConsoleTextMode() and "mGraphicsConsoleModeData": - -(1a) 80x25 (required by the UEFI spec as mode 0), -(1b) 80x50 (not necessarily supported, but if it is, then the UEFI spec - requires the driver to provide it as mode 1), -(1c) 100x31 (corresponding to graphics resolution 800x600, which the UEFI - spec requires from all plug-in graphics devices), -(1d) "full screen" resolution, derived form the underlying GOP's - horizontal and vertical resolutions with division by EFI_GLYPH_WIDTH - (8) and EFI_GLYPH_HEIGHT (19), respectively. - -The automatic "full screen resolution" makes GraphicsConsoleDxe's -character console very flexible. However, TerminalDxe (which runs on -serial ports) only provides the following fixed resolutions -- see -InitializeTerminalConsoleTextMode() and "mTerminalConsoleModeData": - -(2a) 80x25 (required by the UEFI spec as mode 0), -(2b) 80x50 (since the character resolution of a serial device cannot be - interrogated easily, this is added unconditionally as mode 1), -(2c) 100x31 (since the character resolution of a serial device cannot be - interrogated easily, this is added unconditionally as mode 2). - -When ConSplitterDxe combines (1) and (2), multiplexing console output to -both video output and serial terminal, the list of commonly supported text -modes (ie. the "intersection") comprises: - -(3a) 80x25, unconditionally, from (1a) and (2a), -(3b) 80x50, if the graphics console provides at least 640x950 pixel - resolution, from (1b) and (2b) -(3c) 100x31, if the graphics device is a plug-in one (because in that case - 800x600 is a mandated pixel resolution), from (1c) and (2c). - -Unfortunately, the "full screen resolution" (1d) of the GOP-based text -console is not available in general. - -Mitigate this problem by extending "mTerminalConsoleModeData" with a -handful of text resolutions that are derived from widespread maximal pixel -resolutions. This way TerminalDxe won't cause ConSplitterDxe to filter out -the most frequent (1d) values from the intersection, and eg. the MODE -command in the UEFI shell will offer the "best" (ie. full screen) -resolution too. - -Upstreaming efforts for this patch have been discontinued; it was clear -from the off-list thread that consensus was impossible to reach. - -Signed-off-by: Laszlo Ersek -(cherry picked from commit 99dc3720ac86059f60156197328cc433603c536e) -(cherry picked from commit d2066c1748f885043026c51dec1bc8d6d406ae8f) -(cherry picked from commit 1facdd58e946c584a3dc1e5be8f2f837b5a7c621) -(cherry picked from commit 28faeb5f94b4866b9da16cf2a1e4e0fc09a26e37) -(cherry picked from commit 4e4e15b80a5b2103eadd495ef4a830d46dd4ed51) -(cherry picked from commit 12cb13a1da913912bd9148ce8f2353a75be77f18) -(cherry picked from commit 82b9edc5fef3a07227a45059bbe821af7b9abd69) ---- - .../Universal/Console/TerminalDxe/Terminal.c | 41 +++++++++++++++++-- - 1 file changed, 38 insertions(+), 3 deletions(-) - -diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -index e2d779c783..dfd9c96773 100644 ---- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -@@ -112,9 +112,44 @@ TERMINAL_DEV mTerminalDevTemplate = { - }; - - 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 -+ { 100, 31 }, // from graphics resolution 800 x 600 -+ { 104, 32 }, // from graphics resolution 832 x 624 -+ { 120, 33 }, // from graphics resolution 960 x 640 -+ { 128, 31 }, // from graphics resolution 1024 x 600 -+ { 128, 40 }, // from graphics resolution 1024 x 768 -+ { 144, 45 }, // from graphics resolution 1152 x 864 -+ { 144, 45 }, // from graphics resolution 1152 x 870 -+ { 160, 37 }, // from graphics resolution 1280 x 720 -+ { 160, 40 }, // from graphics resolution 1280 x 760 -+ { 160, 40 }, // from graphics resolution 1280 x 768 -+ { 160, 42 }, // from graphics resolution 1280 x 800 -+ { 160, 50 }, // from graphics resolution 1280 x 960 -+ { 160, 53 }, // from graphics resolution 1280 x 1024 -+ { 170, 40 }, // from graphics resolution 1360 x 768 -+ { 170, 40 }, // from graphics resolution 1366 x 768 -+ { 175, 55 }, // from graphics resolution 1400 x 1050 -+ { 180, 47 }, // from graphics resolution 1440 x 900 -+ { 200, 47 }, // from graphics resolution 1600 x 900 -+ { 200, 63 }, // from graphics resolution 1600 x 1200 -+ { 210, 55 }, // from graphics resolution 1680 x 1050 -+ { 240, 56 }, // from graphics resolution 1920 x 1080 -+ { 240, 63 }, // from graphics resolution 1920 x 1200 -+ { 240, 75 }, // from graphics resolution 1920 x 1440 -+ { 250, 105 }, // from graphics resolution 2000 x 2000 -+ { 256, 80 }, // from graphics resolution 2048 x 1536 -+ { 256, 107 }, // from graphics resolution 2048 x 2048 -+ { 320, 75 }, // from graphics resolution 2560 x 1440 -+ { 320, 84 }, // from graphics resolution 2560 x 1600 -+ { 320, 107 }, // from graphics resolution 2560 x 2048 -+ { 350, 110 }, // from graphics resolution 2800 x 2100 -+ { 400, 126 }, // from graphics resolution 3200 x 2400 -+ { 480, 113 }, // from graphics resolution 3840 x 2160 -+ { 512, 113 }, // from graphics resolution 4096 x 2160 -+ { 960, 227 }, // from graphics resolution 7680 x 4320 -+ { 1024, 227 }, // from graphics resolution 8192 x 4320 - // - // New modes can be added here. - // --- -2.38.1 - diff --git a/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch similarity index 97% rename from 0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch rename to 0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index 30cd65d..01840b5 100644 --- a/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,4 +1,4 @@ -From dc40fd64b7b3bc9bb53a7d4a95b3e80f8cfe5152 Mon Sep 17 00:00:00 2001 +From 11668111e3a73c14e5cfd71196190a63949372c9 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 @@ -95,10 +95,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 36 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 775f1b27af..94f3394cef 100644 +index f33312fb35..020f62fcc6 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2099,6 +2099,10 @@ +@@ -2102,6 +2102,10 @@ # @Prompt The shared bit mask when Intel Tdx is enabled. gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask|0x0|UINT64|0x10000025 @@ -185,5 +185,5 @@ index b2a8aeba85..eff6253465 100644 # [Event] # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout. -- -2.38.1 +2.39.1 diff --git a/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch similarity index 90% rename from 0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch rename to 0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index b56218e..ce56e60 100644 --- a/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,4 +1,4 @@ -From e7d8bbcb71ec3b292a9f3a358ce185a315a41a1c Mon Sep 17 00:00:00 2001 +From 621a73783ba83b3f1038193726197b4d47da31a5 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) @@ -82,10 +82,10 @@ Signed-off-by: Laszlo Ersek 9 files changed, 21 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 8f7cae787e..41ad97b47d 100644 +index 1cebd6b4bc..0bec51d5ee 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -475,6 +475,7 @@ +@@ -477,6 +477,7 @@ [PcdsDynamicDefault] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -94,10 +94,10 @@ index 8f7cae787e..41ad97b47d 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc -index ce277cb239..faab59ae8d 100644 +index fda7d2b9e5..97a74cfb07 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc -@@ -582,6 +582,7 @@ +@@ -587,6 +587,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -106,10 +106,10 @@ index ce277cb239..faab59ae8d 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc -index 3458926515..4c4da09b90 100644 +index 95b9594ddc..bf4bf4cb1d 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc -@@ -474,6 +474,7 @@ +@@ -485,6 +485,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -118,10 +118,10 @@ index 3458926515..4c4da09b90 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc -index 994a02d301..1d5ba0e810 100644 +index 0d65d21e65..6ee25b2a39 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc -@@ -579,7 +579,7 @@ +@@ -584,7 +584,7 @@ # only set when # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -131,10 +131,10 @@ index 994a02d301..1d5ba0e810 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 6f774baf90..e8a074153a 100644 +index 22dc29330d..9242e77140 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -601,6 +601,7 @@ +@@ -606,6 +606,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -143,10 +143,10 @@ index 6f774baf90..e8a074153a 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index c851764dec..0197997793 100644 +index 6b539814bd..43d40ddc9c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -609,6 +609,7 @@ +@@ -613,6 +613,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -155,10 +155,10 @@ index c851764dec..0197997793 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 63c3a47aea..fade13b4e8 100644 +index e3c64456df..231e5e7e4d 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -631,6 +631,7 @@ +@@ -636,6 +636,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -167,7 +167,7 @@ index 63c3a47aea..fade13b4e8 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index b1f8140d60..e5132d95a8 100644 +index 148240342b..d324ae95f8 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -41,6 +41,18 @@ @@ -186,13 +186,13 @@ index b1f8140d60..e5132d95a8 100644 + } \ + } while (0) + - EFI_HOB_PLATFORM_INFO mPlatformInfoHob = { 0 }; - EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] = { -@@ -376,6 +388,7 @@ InitializePlatform ( - MemTypeInfoInitialization (); - MemMapInitialization (&mPlatformInfoHob); - NoexecDxeInitialization (); + { + EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, +@@ -385,6 +397,7 @@ InitializePlatform ( + MemTypeInfoInitialization (PlatformInfoHob); + MemMapInitialization (PlatformInfoHob); + NoexecDxeInitialization (PlatformInfoHob); + UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); } @@ -210,5 +210,5 @@ index 1fadadeb55..3e28e1596d 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack -- -2.38.1 +2.39.1 diff --git a/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch similarity index 95% rename from 0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch rename to 0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index 43711cd..6a07b27 100644 --- a/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,4 +1,4 @@ -From 9a33267768684fe3034d0c15835a6ee13ad10d7b Mon Sep 17 00:00:00 2001 +From 58dedcbd4dde8db3f413dd708bb7df1478e598cd 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,19 +95,19 @@ Signed-off-by: Laszlo Ersek create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index f77443229e..ed66f00030 100644 +index 72a0cacab4..7a3be7e859 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -299,6 +299,8 @@ +@@ -304,6 +304,8 @@ gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0 !endif + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + [PcdsDynamicHii] - gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS + gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS -@@ -413,7 +415,10 @@ +@@ -418,7 +420,10 @@ MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf @@ -199,5 +199,5 @@ index 0000000000..a51dbd1670 +[Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES -- -2.38.1 +2.39.1 diff --git a/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch b/0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch similarity index 93% rename from 0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch rename to 0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch index a0213f9..88d5073 100644 --- a/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,4 +1,4 @@ -From eb7d7c8bbbb0d3782a1d837c293f21629336d4d5 Mon Sep 17 00:00:00 2001 +From 9f0df40d1623ce6af4ce2653d555d216c2c15355 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 41ad97b47d..53a8938965 100644 +index 0bec51d5ee..ae3f9c75c4 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -427,7 +427,7 @@ +@@ -429,7 +429,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -78,10 +78,10 @@ index 41ad97b47d..53a8938965 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index e8a074153a..7bced89f2a 100644 +index 9242e77140..bb3b0c1c96 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -541,7 +541,7 @@ +@@ -546,7 +546,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -91,10 +91,10 @@ index e8a074153a..7bced89f2a 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 0197997793..2599facbb7 100644 +index 43d40ddc9c..19b968bd94 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -547,7 +547,7 @@ +@@ -551,7 +551,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -104,10 +104,10 @@ index 0197997793..2599facbb7 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index fade13b4e8..7bd445ca36 100644 +index 231e5e7e4d..876f2374a2 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -567,7 +567,7 @@ +@@ -572,7 +572,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -117,5 +117,5 @@ index fade13b4e8..7bd445ca36 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 -- -2.38.1 +2.39.1 diff --git a/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch similarity index 94% rename from 0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch rename to 0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index 5a7cbe7..85828d1 100644 --- a/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +++ b/0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch @@ -1,4 +1,4 @@ -From 5ac6b33275b5ae82883f0aa16bcedd53efe1f2e2 Mon Sep 17 00:00:00 2001 +From 7e05ce023df72737aa4ac840e445bf3fe07e8bb2 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 53a8938965..f5133a801f 100644 +index ae3f9c75c4..c7d7add60d 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -677,8 +677,14 @@ +@@ -682,8 +682,14 @@ MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf @@ -103,10 +103,10 @@ index 53a8938965..f5133a801f 100644 # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 7bced89f2a..1d271a3bdc 100644 +index bb3b0c1c96..30b843d228 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -846,9 +846,15 @@ +@@ -851,9 +851,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -125,10 +125,10 @@ index 7bced89f2a..1d271a3bdc 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 2599facbb7..240bc43d14 100644 +index 19b968bd94..2327c5c296 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -860,9 +860,15 @@ +@@ -864,9 +864,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -147,10 +147,10 @@ index 2599facbb7..240bc43d14 100644 # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 7bd445ca36..7c6faba950 100644 +index 876f2374a2..49b914c29f 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -928,9 +928,15 @@ +@@ -937,9 +937,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -169,5 +169,5 @@ index 7bd445ca36..7c6faba950 100644 # -- -2.38.1 +2.39.1 diff --git a/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch similarity index 94% rename from 0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch rename to 0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index 491e9e0..cdcb0e4 100644 --- a/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +++ b/0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch @@ -1,4 +1,4 @@ -From 0493dde37b4607853470f634e48fa26457edb5b9 Mon Sep 17 00:00:00 2001 +From 7421895c5b3fbff08180ccacd6e6fd528d1ea291 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,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 ed66f00030..a3d744931a 100644 +index 7a3be7e859..865172c5d5 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -537,7 +537,10 @@ +@@ -546,7 +546,10 @@ # # Video support # @@ -77,10 +77,10 @@ index ed66f00030..a3d744931a 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index f5db3ac432..ff3e6c5974 100644 +index 3cb9120e4e..02877284bf 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -440,7 +440,10 @@ +@@ -444,7 +444,10 @@ # # Video support # @@ -93,5 +93,5 @@ index f5db3ac432..ff3e6c5974 100644 OvmfPkg/PlatformDxe/Platform.inf -- -2.38.1 +2.39.1 diff --git a/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch b/0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch similarity index 97% rename from 0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch rename to 0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch index 08e66ec..08807fb 100644 --- a/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +++ b/0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch @@ -1,4 +1,4 @@ -From 8188ba632ad933a4fe734d3dd715d67dfd12a57f Mon Sep 17 00:00:00 2001 +From 3f92cf84a81b94586a40a7668a6216bc0feb5701 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 @@ -91,5 +91,5 @@ index e3890b8c20..6ffee5acb2 100644 FrameBufferBltLib MemoryAllocationLib -- -2.38.1 +2.39.1 diff --git a/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch similarity index 93% rename from 0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch rename to 0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index d32b442..510fe87 100644 --- a/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,4 +1,4 @@ -From 6e9df01fd85cfbbb7c27f2a8d31c2ec214649452 Mon Sep 17 00:00:00 2001 +From e879769b4709eb71bb1ec96054e2c6c8a845f94c 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 f5133a801f..05908a7227 100644 +index c7d7add60d..2ea6fad201 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -671,7 +671,10 @@ +@@ -676,7 +676,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -79,10 +79,10 @@ index f5133a801f..05908a7227 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 1d271a3bdc..9c0fb7d545 100644 +index 30b843d228..db1cde0a3b 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -839,7 +839,10 @@ +@@ -844,7 +844,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -95,10 +95,10 @@ index 1d271a3bdc..9c0fb7d545 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 240bc43d14..8b93437044 100644 +index 2327c5c296..938eaba74a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -853,7 +853,10 @@ +@@ -857,7 +857,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -111,10 +111,10 @@ index 240bc43d14..8b93437044 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 7c6faba950..8c9162db17 100644 +index 49b914c29f..91fbe83bfa 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -921,7 +921,10 @@ +@@ -930,7 +930,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -127,5 +127,5 @@ index 7c6faba950..8c9162db17 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -- -2.38.1 +2.39.1 diff --git a/0013-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch similarity index 96% rename from 0013-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch rename to 0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index a2fbf52..18f7bf3 100644 --- a/0013-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +++ b/0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch @@ -1,4 +1,4 @@ -From 3a69bf86e6b4a1de6385e0ce9146dc8a0e13e22f Mon Sep 17 00:00:00 2001 +From 93747e5ac7133df0c537fc0a20ea4227c8222be8 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 @@ -79,5 +79,5 @@ index 7b35adb8e0..e0331c6e2c 100644 MemoryAllocationLib QemuFwCfgLib -- -2.38.1 +2.39.1 diff --git a/0014-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch b/0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch similarity index 96% rename from 0014-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch rename to 0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch index 42373bf..5e48992 100644 --- a/0014-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +++ b/0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch @@ -1,4 +1,4 @@ -From 37930c8079ea630535f82068b678c7ab2f9981a5 Mon Sep 17 00:00:00 2001 +From 2cb13b5fe5a3d631a356d5a86da8266922ff2774 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 @@ -78,5 +78,5 @@ index 7dc7a2683d..3bc8833931 100644 PrintLib UefiLib -- -2.38.1 +2.39.1 diff --git a/0015-OvmfPkg-Remove-EbcDxe-RHEL-only.patch b/0013-OvmfPkg-Remove-EbcDxe-RHEL-only.patch similarity index 84% rename from 0015-OvmfPkg-Remove-EbcDxe-RHEL-only.patch rename to 0013-OvmfPkg-Remove-EbcDxe-RHEL-only.patch index f4250be..55a3d0b 100644 --- a/0015-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0013-OvmfPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From a53408a224cef3260b12c969c9f8797b85b12f94 Mon Sep 17 00:00:00 2001 +From 2947620d87385cdea0212a48f598355399dbfdd7 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 05908a7227..8131d2fae1 100644 +index 2ea6fad201..b598a15abb 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -599,7 +599,6 @@ - !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +@@ -604,7 +604,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -41,7 +41,7 @@ index 05908a7227..8131d2fae1 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 4658e1d30e..67b9cdf941 100644 +index 5fb3b5d276..0c358d8b0f 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -205,7 +205,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -53,11 +53,11 @@ index 4658e1d30e..67b9cdf941 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 9c0fb7d545..8e29e62ea9 100644 +index db1cde0a3b..c979afd5eb 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -750,7 +750,6 @@ - !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +@@ -755,7 +755,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -65,7 +65,7 @@ index 9c0fb7d545..8e29e62ea9 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 7023ade8ce..159995952e 100644 +index 5451bfb845..d9a34e46cf 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -216,7 +216,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -77,11 +77,11 @@ index 7023ade8ce..159995952e 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 8b93437044..c79514e86f 100644 +index 938eaba74a..c581d73411 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -764,7 +764,6 @@ - !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +@@ -768,7 +768,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -89,7 +89,7 @@ index 8b93437044..c79514e86f 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 80de4fa2c0..334de16a12 100644 +index 4c5bd0dbc3..cf98c24239 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -217,7 +217,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -101,11 +101,11 @@ index 80de4fa2c0..334de16a12 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf !ifdef $(CSM_ENABLE) diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 8c9162db17..1daa7e6fe4 100644 +index 91fbe83bfa..2da034c2cd 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -809,7 +809,6 @@ - !endif +@@ -818,7 +818,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -113,7 +113,7 @@ index 8c9162db17..1daa7e6fe4 100644 UefiCpuPkg/CpuDxe/CpuDxe.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index c0f5a1ef3c..dec53ecdbd 100644 +index 16666ba244..222fbe14aa 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -239,7 +239,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf @@ -125,5 +125,5 @@ index c0f5a1ef3c..dec53ecdbd 100644 INF UefiCpuPkg/CpuDxe/CpuDxe.inf -- -2.38.1 +2.39.1 diff --git a/0016-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch b/0014-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch similarity index 88% rename from 0016-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch rename to 0014-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch index 3ba1aed..b8b2daa 100644 --- a/0016-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +++ b/0014-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 8c0d639c7ab33c6b31af3c3ddbf0b3086f2f99a6 Mon Sep 17 00:00:00 2001 +From 0873d04386379fac82d1f6d32220fedf96fad5a2 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 8131d2fae1..5f70b3a12f 100644 +index b598a15abb..1ea5c78565 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -687,7 +687,6 @@ +@@ -692,7 +692,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -41,7 +41,7 @@ index 8131d2fae1..5f70b3a12f 100644 # # ISA Support diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 67b9cdf941..7b877446e4 100644 +index 0c358d8b0f..1ca44c3648 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -298,7 +298,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf @@ -53,10 +53,10 @@ index 67b9cdf941..7b877446e4 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 8e29e62ea9..49877b613b 100644 +index c979afd5eb..1ae7fed43a 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -857,7 +857,6 @@ +@@ -862,7 +862,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -65,7 +65,7 @@ index 8e29e62ea9..49877b613b 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 159995952e..306950bd87 100644 +index d9a34e46cf..3785c0e405 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -333,7 +333,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf @@ -77,10 +77,10 @@ index 159995952e..306950bd87 100644 INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index c79514e86f..d6a2300c7a 100644 +index c581d73411..a45f40898c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -871,7 +871,6 @@ +@@ -875,7 +875,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -89,7 +89,7 @@ index c79514e86f..d6a2300c7a 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 334de16a12..88ea4c6b65 100644 +index cf98c24239..2ac66d07d6 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -339,7 +339,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf @@ -101,10 +101,10 @@ index 334de16a12..88ea4c6b65 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 1daa7e6fe4..2bc5ae576b 100644 +index 2da034c2cd..51b0e6cc85 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -939,7 +939,6 @@ +@@ -948,7 +948,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -113,7 +113,7 @@ index 1daa7e6fe4..2bc5ae576b 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index dec53ecdbd..608ebdd4d2 100644 +index 222fbe14aa..8087d7fcf1 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -366,7 +366,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf @@ -125,5 +125,5 @@ index dec53ecdbd..608ebdd4d2 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -- -2.38.1 +2.39.1 diff --git a/0017-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch b/0015-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch similarity index 90% rename from 0017-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch rename to 0015-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch index 4a8e954..6580a6b 100644 --- a/0017-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +++ b/0015-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch @@ -1,4 +1,4 @@ -From 1ba8ead93467fad1f2583c1650f28ca039da8405 Mon Sep 17 00:00:00 2001 +From 5eacfb342d5efa46ff46964e5c5fd0db0e9257b0 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 49877b613b..7550113f51 100644 +index 1ae7fed43a..fb8ed159b4 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -832,7 +832,6 @@ +@@ -837,7 +837,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -39,7 +39,7 @@ index 49877b613b..7550113f51 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 306950bd87..3efa27bbac 100644 +index 3785c0e405..c6e1ea4a02 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -295,7 +295,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -51,10 +51,10 @@ index 306950bd87..3efa27bbac 100644 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index d6a2300c7a..2ef1368945 100644 +index a45f40898c..8ed12f7cff 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -846,7 +846,6 @@ +@@ -850,7 +850,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -63,7 +63,7 @@ index d6a2300c7a..2ef1368945 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 88ea4c6b65..5b73560782 100644 +index 2ac66d07d6..ea5ea9a993 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -296,7 +296,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -75,10 +75,10 @@ index 88ea4c6b65..5b73560782 100644 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 2bc5ae576b..c336aca5a6 100644 +index 51b0e6cc85..1d053aa0d2 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -914,7 +914,6 @@ +@@ -923,7 +923,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -87,7 +87,7 @@ index 2bc5ae576b..c336aca5a6 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 608ebdd4d2..ad98806b32 100644 +index 8087d7fcf1..5b18c3fe2e 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -321,7 +321,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -99,5 +99,5 @@ index 608ebdd4d2..ad98806b32 100644 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -- -2.38.1 +2.39.1 diff --git a/0018-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch b/0016-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch similarity index 89% rename from 0018-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch rename to 0016-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch index 7e53081..f1b4808 100644 --- a/0018-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +++ b/0016-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch @@ -1,4 +1,4 @@ -From 0a0c4645939b55e67817bc2c2880b1de69537279 Mon Sep 17 00:00:00 2001 +From 4a5a56f228601c37aab15921109fa80a72210374 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,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index a3d744931a..998d19165f 100644 +index 865172c5d5..9f1d9e22da 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -455,7 +455,6 @@ +@@ -464,7 +464,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -36,7 +36,7 @@ index a3d744931a..998d19165f 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index e06ca74244..33797ebb95 100644 +index 8a063bac04..5da1481532 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -84,7 +84,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index e06ca74244..33797ebb95 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index ff3e6c5974..2c01efc660 100644 +index 02877284bf..c18564a5b1 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -358,7 +358,6 @@ +@@ -362,7 +362,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -60,5 +60,5 @@ index ff3e6c5974..2c01efc660 100644 # # Bds -- -2.38.1 +2.39.1 diff --git a/0019-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0017-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch similarity index 91% rename from 0019-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch rename to 0017-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index ad47629..6eee69b 100644 --- a/0019-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0017-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 08cad303158596a4c817765bb56e7b9f38138570 Mon Sep 17 00:00:00 2001 +From 3fb460c56aa616be4d7a6a698522b3150b9452a5 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 5f70b3a12f..b3fa4941c5 100644 +index 1ea5c78565..a16c3f8c22 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -664,7 +664,6 @@ +@@ -669,7 +669,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -41,7 +41,7 @@ index 5f70b3a12f..b3fa4941c5 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 7b877446e4..1b743cc93f 100644 +index 1ca44c3648..1b36c0ce59 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -272,7 +272,6 @@ INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -53,10 +53,10 @@ index 7b877446e4..1b743cc93f 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 7550113f51..e6a35ba448 100644 +index fb8ed159b4..df44b9d069 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -831,7 +831,6 @@ +@@ -836,7 +836,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -65,7 +65,7 @@ index 7550113f51..e6a35ba448 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 3efa27bbac..1a1b79a157 100644 +index c6e1ea4a02..36c29712d9 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -294,7 +294,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf @@ -77,10 +77,10 @@ index 3efa27bbac..1a1b79a157 100644 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 2ef1368945..17da49369e 100644 +index 8ed12f7cff..143018ce24 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -845,7 +845,6 @@ +@@ -849,7 +849,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -89,7 +89,7 @@ index 2ef1368945..17da49369e 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 5b73560782..f00a5f729e 100644 +index ea5ea9a993..adfef2a21f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -295,7 +295,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf @@ -101,10 +101,10 @@ index 5b73560782..f00a5f729e 100644 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index c336aca5a6..721519a8e0 100644 +index 1d053aa0d2..721862affd 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -913,7 +913,6 @@ +@@ -922,7 +922,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -113,7 +113,7 @@ index c336aca5a6..721519a8e0 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index ad98806b32..4967e984c1 100644 +index 5b18c3fe2e..eea45e01c1 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -320,7 +320,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf @@ -125,5 +125,5 @@ index ad98806b32..4967e984c1 100644 !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf -- -2.38.1 +2.39.1 diff --git a/0020-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0018-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch similarity index 89% rename from 0020-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch rename to 0018-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index 2d33d67..f4e56ca 100644 --- a/0020-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0018-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 4ba0cc5f6710f7b691583997b3b6fd73b92859f3 Mon Sep 17 00:00:00 2001 +From 4f3290b7ff5f84eaa27db4ea67dbd6b675fdb467 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,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 998d19165f..a4bd72e481 100644 +index 9f1d9e22da..bd0b2c8ba0 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -454,7 +454,6 @@ +@@ -463,7 +463,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -36,7 +36,7 @@ index 998d19165f..a4bd72e481 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 33797ebb95..394253fc23 100644 +index 5da1481532..2b17211256 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -83,7 +83,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index 33797ebb95..394253fc23 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 2c01efc660..7f85b0dc92 100644 +index c18564a5b1..85e49e315f 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -357,7 +357,6 @@ +@@ -361,7 +361,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -60,5 +60,5 @@ index 2c01efc660..7f85b0dc92 100644 # # Bds -- -2.38.1 +2.39.1 diff --git a/0021-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch b/0019-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch similarity index 91% rename from 0021-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch rename to 0019-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch index 8a2885c..eb614e0 100644 --- a/0021-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +++ b/0019-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From dc4ea27a1f1ceca98eb9cfce086ae03e553cd78d Mon Sep 17 00:00:00 2001 +From 5691bd6976ad8d5b6670432d008f2491754beb50 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 e6a35ba448..b00ef51f2d 100644 +index df44b9d069..d20985848d 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -909,10 +909,6 @@ +@@ -914,10 +914,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -42,7 +42,7 @@ index e6a35ba448..b00ef51f2d 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 1a1b79a157..e4e68e2122 100644 +index 36c29712d9..ae61cc2920 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -296,7 +296,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -54,10 +54,10 @@ index 1a1b79a157..e4e68e2122 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 17da49369e..d129a79e33 100644 +index 143018ce24..48a5058f01 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -923,10 +923,6 @@ +@@ -927,10 +927,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -69,7 +69,7 @@ index 17da49369e..d129a79e33 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index f00a5f729e..ef831accf1 100644 +index adfef2a21f..050f17dbaa 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -297,7 +297,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -81,10 +81,10 @@ index f00a5f729e..ef831accf1 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 721519a8e0..5b40364c47 100644 +index 721862affd..0dfc2b5a23 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -991,10 +991,6 @@ +@@ -1000,10 +1000,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -96,7 +96,7 @@ index 721519a8e0..5b40364c47 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 4967e984c1..aeae1650cd 100644 +index eea45e01c1..40c12c12d1 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -322,7 +322,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -108,5 +108,5 @@ index 4967e984c1..aeae1650cd 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif -- -2.38.1 +2.39.1 diff --git a/0022-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch b/0020-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch similarity index 91% rename from 0022-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch rename to 0020-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch index 36d205f..72bdd27 100644 --- a/0022-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +++ b/0020-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From a4c198675df3c47c6a7fb62af1065b9a8f9b683a Mon Sep 17 00:00:00 2001 +From df2e722f4371e79caf78a8071910708a12d7e0d5 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,10 +23,10 @@ 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 462073517a..39a569e07e 100644 +index 74d98e6314..bdf7b52ee5 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -376,10 +376,9 @@ +@@ -369,10 +369,9 @@ # MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf @@ -41,7 +41,7 @@ index 462073517a..39a569e07e 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 394253fc23..5ef9f89464 100644 +index 2b17211256..16a073c4a1 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE @@ -53,5 +53,5 @@ index 394253fc23..5ef9f89464 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf -- -2.38.1 +2.39.1 diff --git a/0023-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch b/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch similarity index 91% rename from 0023-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch rename to 0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch index e265fe8..a7196af 100644 --- a/0023-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +++ b/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From e99047a0422578ad3572ea12dc7edffd24baf3f3 Mon Sep 17 00:00:00 2001 +From 176aa27812b4ca0d4b3263bb984c2eedd21f4320 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 b00ef51f2d..43d60df6e3 100644 +index d20985848d..aa122fc69e 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -909,10 +909,6 @@ +@@ -914,10 +914,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -42,7 +42,7 @@ index b00ef51f2d..43d60df6e3 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index e4e68e2122..5b7c3f7687 100644 +index ae61cc2920..002560372a 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -296,7 +296,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -54,10 +54,10 @@ index e4e68e2122..5b7c3f7687 100644 !endif !if $(BUILD_SHELL) == TRUE diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index d129a79e33..56426672b8 100644 +index 48a5058f01..bdf447e07d 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -923,10 +923,6 @@ +@@ -927,10 +927,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -69,7 +69,7 @@ index d129a79e33..56426672b8 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index ef831accf1..45f5b69171 100644 +index 050f17dbaa..eabb69434f 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -297,7 +297,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -81,10 +81,10 @@ index ef831accf1..45f5b69171 100644 !endif !if $(BUILD_SHELL) == TRUE diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 5b40364c47..2b4635a71b 100644 +index 0dfc2b5a23..e8779ad5b7 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -991,10 +991,6 @@ +@@ -1000,10 +1000,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -96,7 +96,7 @@ index 5b40364c47..2b4635a71b 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index aeae1650cd..6b20e0946f 100644 +index 40c12c12d1..2ca657ed96 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -322,7 +322,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -108,5 +108,5 @@ index aeae1650cd..6b20e0946f 100644 !endif !if $(BUILD_SHELL) == TRUE -- -2.38.1 +2.39.1 diff --git a/0024-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch b/0022-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch similarity index 91% rename from 0024-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch rename to 0022-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch index 2fb3de1..92d3aed 100644 --- a/0024-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +++ b/0022-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From f8e271d73e62ca932253b9461657483cc1081807 Mon Sep 17 00:00:00 2001 +From bd16f5325312d8dd6649cadccf1e2dc4eae8e1a0 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,10 +23,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 39a569e07e..49d2ef381c 100644 +index bdf7b52ee5..1b53da56e0 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -379,10 +379,6 @@ +@@ -372,10 +372,6 @@ # # UEFI application (Shell Embedded Boot Loader) # @@ -38,7 +38,7 @@ index 39a569e07e..49d2ef381c 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 5ef9f89464..46978cc76c 100644 +index 16a073c4a1..0a01c29722 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE @@ -50,5 +50,5 @@ index 5ef9f89464..46978cc76c 100644 # -- -2.38.1 +2.39.1 diff --git a/0025-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch b/0023-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch similarity index 90% rename from 0025-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch rename to 0023-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch index 1f781c4..df76809 100644 --- a/0025-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +++ b/0023-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch @@ -1,4 +1,4 @@ -From ed81dfa142253a7c37824201cf525231b7efcb71 Mon Sep 17 00:00:00 2001 +From 0c05cfe99c6ba2579b32d52d0857a8feb2e8c3e4 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 b3fa4941c5..adb051ecea 100644 +index a16c3f8c22..d991615faa 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -721,10 +721,6 @@ +@@ -726,10 +726,6 @@ MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -49,7 +49,7 @@ index b3fa4941c5..adb051ecea 100644 OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 1b743cc93f..1d55c7815f 100644 +index 1b36c0ce59..06d0679be4 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -274,7 +274,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -61,10 +61,10 @@ index 1b743cc93f..1d55c7815f 100644 INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf INF OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 43d60df6e3..3b86666695 100644 +index aa122fc69e..323495730a 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -909,10 +909,6 @@ +@@ -914,10 +914,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -76,7 +76,7 @@ index 43d60df6e3..3b86666695 100644 !if $(BUILD_SHELL) == TRUE ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 5b7c3f7687..b1f4dbacd7 100644 +index 002560372a..486f2dc12e 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -296,7 +296,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -88,10 +88,10 @@ index 5b7c3f7687..b1f4dbacd7 100644 !if $(BUILD_SHELL) == TRUE INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 56426672b8..c384425723 100644 +index bdf447e07d..4bf4285f47 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -923,10 +923,6 @@ +@@ -927,10 +927,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -103,7 +103,7 @@ index 56426672b8..c384425723 100644 !if $(BUILD_SHELL) == TRUE ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 45f5b69171..c3dcda85c5 100644 +index eabb69434f..8cbbeecfd4 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -297,7 +297,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -115,10 +115,10 @@ index 45f5b69171..c3dcda85c5 100644 !if $(BUILD_SHELL) == TRUE INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 2b4635a71b..bf372014b9 100644 +index e8779ad5b7..2204a6aeb0 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -991,10 +991,6 @@ +@@ -1000,10 +1000,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -130,7 +130,7 @@ index 2b4635a71b..bf372014b9 100644 !if $(BUILD_SHELL) == TRUE ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 6b20e0946f..2fd1d5315a 100644 +index 2ca657ed96..e738b23020 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -322,7 +322,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -142,5 +142,5 @@ index 6b20e0946f..2fd1d5315a 100644 !if $(BUILD_SHELL) == TRUE INF ShellPkg/Application/Shell/Shell.inf -- -2.38.1 +2.39.1 diff --git a/0026-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch b/0024-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch similarity index 91% rename from 0026-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch rename to 0024-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch index 5026d6a..8414ba3 100644 --- a/0026-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch +++ b/0024-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch @@ -1,4 +1,4 @@ -From 2bbe51e3b55e6860d4607c6627866ed6b7c858af Mon Sep 17 00:00:00 2001 +From fb69634acf06769e830452fff1b54419fe3e8c1c 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,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 49d2ef381c..1f0f8d44cd 100644 +index 1b53da56e0..7fd6078e13 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -379,10 +379,6 @@ +@@ -372,10 +372,6 @@ # # UEFI application (Shell Embedded Boot Loader) # @@ -39,7 +39,7 @@ index 49d2ef381c..1f0f8d44cd 100644 ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 46978cc76c..7bcb152c7c 100644 +index 0a01c29722..4dbb77a6ca 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE @@ -51,5 +51,5 @@ index 46978cc76c..7bcb152c7c 100644 # # Bds -- -2.38.1 +2.39.1 diff --git a/edk2-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch b/0025-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch similarity index 90% rename from edk2-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch rename to 0025-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch index d4df4b3..7523186 100644 --- a/edk2-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch +++ b/0025-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch @@ -1,7 +1,7 @@ -From 0517c19dff1e3fd8e16a38533d39e4b9bd32f54e Mon Sep 17 00:00:00 2001 +From dffbc61a54f51fc535c17e90fd0d2ce3a3bd80c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Po=C5=82awski?= Date: Tue, 15 Nov 2022 01:02:51 +0100 -Subject: [PATCH 2/2] MdePkg: Remove Itanium leftover data structure (RH only) +Subject: MdePkg: Remove Itanium leftover data structure (RH only) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -26,6 +26,10 @@ can be used for vCPU data and with current allocation limit will change from 1024 to around 8k vCPUs. Signed-off-by: Paweł Poławski + +patch_name: edk2-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch +present_in_specfile: true +location_in_specfile: 35 --- MdePkg/Include/Ppi/SecPlatformInformation.h | 44 --------------------- 1 file changed, 44 deletions(-) @@ -93,5 +97,5 @@ index 02b0711f18..fbcd205acd 100644 /** -- -2.31.1 +2.39.1 diff --git a/0012-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch b/0027-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch similarity index 93% rename from 0012-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch rename to 0027-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch index a7df5e4..a25c0ee 100644 --- a/0012-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +++ b/0027-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch @@ -1,4 +1,4 @@ -From 87d4b94d2ea1896dec43a6e70feeae1aef7a4ce2 Mon Sep 17 00:00:00 2001 +From bd2ea121c38e5b6c5b3ddbfdfb571653ea6ef44f 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 @@ -126,19 +126,20 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 57bd3f146590df8757865d8f2cdd1db3cf3f4d40) (cherry picked from commit 56c4bb81b311dfcee6a34c81d3e4feeda7f88995) --- - CryptoPkg/Library/OpensslLib/OpensslLib.inf | 11 +++++++++++ - CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 11 +++++++++++ - 2 files changed, 22 insertions(+) + CryptoPkg/Library/OpensslLib/OpensslLib.inf | 12 ++++++++++++ + CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 12 ++++++++++++ + 2 files changed, 24 insertions(+) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -index 60c6c24b0a..e446b51e66 100644 +index 60c6c24b0a..7e78255467 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -@@ -575,6 +575,17 @@ +@@ -575,6 +575,18 @@ $(OPENSSL_PATH)/ssl/statem/statem.h $(OPENSSL_PATH)/ssl/statem/statem_local.h # Autogenerated files list ends here +# RHEL8-specific OpenSSL file list starts here ++ $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c + $(OPENSSL_PATH)/crypto/evp/kdf_lib.c + $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c + $(OPENSSL_PATH)/crypto/kdf/kbkdf.c @@ -153,14 +154,15 @@ index 60c6c24b0a..e446b51e66 100644 ossl_store.c rand_pool.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -index c4eaea888c..c207dc8f4c 100644 +index c4eaea888c..1c551cb099 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -@@ -525,6 +525,17 @@ +@@ -525,6 +525,18 @@ $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h # Autogenerated files list ends here +# RHEL8-specific OpenSSL file list starts here ++ $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c + $(OPENSSL_PATH)/crypto/evp/kdf_lib.c + $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c + $(OPENSSL_PATH)/crypto/kdf/kbkdf.c @@ -175,5 +177,5 @@ index c4eaea888c..c207dc8f4c 100644 ossl_store.c rand_pool.c -- -2.38.1 +2.39.1 diff --git a/edk2-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch b/0028-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch similarity index 57% rename from edk2-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch rename to 0028-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch index dbdc734..87a3d6c 100644 --- a/edk2-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch +++ b/0028-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch @@ -1,38 +1,19 @@ -From fc45137e55e73a3ba59fd28868e24521a28a9a6e Mon Sep 17 00:00:00 2001 -From: Oliver Steffen -Date: Tue, 31 Jan 2023 15:32:28 +0100 -Subject: [PATCH] Revert "ArmVirtPkg/ArmVirtQemu: enable initial ID map at - early boot" +From 6794db451b25dbd81ad52e7c6d4b36db1cafe400 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Mon, 6 Mar 2023 08:03:50 +0100 +Subject: Revert "ArmVirtPkg/ArmVirtQemu: enable initial ID map at early boot" -RH-Author: Oliver Steffen -RH-MergeRequest: 25: Revert "ArmVirtPkg/ArmVirtQemu: enable initial ID map at early boot" -RH-Bugzilla: 2157656 -RH-Acked-by: Gerd Hoffmann -RH-Acked-by: Miroslav Rezanina -RH-Commit: [1/1] b236b89984f7b7890089ba65228073ab79063b34 (osteffen/edk2) - -This reverts commit 07be1d34d95460a238fcd0f6693efb747c28b329, -which causes the firmware to crash early on AARCH64. - -Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2157656 - -There is a potential fix upstream: -https://github.com/tianocore/edk2/pull/3878/commits - -We need to reevaluate on the next rebase if the fix works and if we can -drop this revert-comment. - -Signed-off-by: Oliver Steffen +This reverts commit 07be1d34d95460a238fcd0f6693efb747c28b329. --- - ArmVirtPkg/ArmVirtQemu.dsc | 17 +++-------------- + ArmVirtPkg/ArmVirtQemu.dsc | 15 +++------------ ArmVirtPkg/ArmVirtQemu.fdf | 2 +- - 2 files changed, 4 insertions(+), 15 deletions(-) + 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 76389e6bd4..3bf51b09aa 100644 +index bd0b2c8ba0..e3f8842829 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -64,6 +64,8 @@ +@@ -65,6 +65,8 @@ QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf @@ -41,7 +22,7 @@ index 76389e6bd4..3bf51b09aa 100644 TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf VirtNorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf -@@ -91,12 +93,6 @@ +@@ -92,12 +94,6 @@ TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf !endif @@ -54,16 +35,7 @@ index 76389e6bd4..3bf51b09aa 100644 [LibraryClasses.common.PEIM] ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf -@@ -117,8 +113,6 @@ - UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - - [BuildOptions] -- GCC:*_*_AARCH64_CC_XIPFLAGS == -- - !include NetworkPkg/NetworkBuildOptions.dsc.inc - - ################################################################################ -@@ -330,12 +324,7 @@ +@@ -335,12 +331,7 @@ ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf MdeModulePkg/Core/Pei/PeiMain.inf ArmPlatformPkg/PlatformPei/PlatformPeim.inf @@ -91,5 +63,5 @@ index 764f652afd..c61ed36d89 100644 INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf -- -2.31.1 +2.39.1 diff --git a/0028-Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch b/0028-Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch deleted file mode 100644 index 2b10c67..0000000 --- a/0028-Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2f497dbe08c4374e02006edb5c2036d7216cd878 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pawe=C5=82=20Po=C5=82awski?= -Date: Wed, 7 Dec 2022 03:19:20 +0100 -Subject: Revert "ArmVirtPkg: make EFI_LOADER_DATA non-executable" - -This reverts commit 2997ae38739756ecba9b0de19e86032ebc689ef9. ---- - ArmVirtPkg/ArmVirt.dsc.inc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 1f0f8d44cd..65bfbc033f 100644 ---- a/ArmVirtPkg/ArmVirt.dsc.inc -+++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -368,7 +368,7 @@ - # reserved ones, with the exception of LoaderData regions, of which OS loaders - # (i.e., GRUB) may assume that its contents are executable. - # -- gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD5 -+ gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD1 - - [Components.common] - # --- -2.38.1 - diff --git a/edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch b/0029-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch similarity index 65% rename from edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch rename to 0029-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch index 1f06b3a..f098d2e 100644 --- a/edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch +++ b/0029-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch @@ -1,13 +1,7 @@ -From 5722005baa03df51b9376f05274981524e513d93 Mon Sep 17 00:00:00 2001 +From 2faeedfbd415d0b76ba4b21bb22b7577aee17243 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 2 Mar 2023 12:01:36 +0100 -Subject: [PATCH] OvmfPkg: disable dynamic mmio window (rhel only) - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 29: OvmfPkg: disable dynamic mmio window (rhel only) -RH-Bugzilla: 2174605 -RH-Acked-by: Laszlo Ersek -RH-Commit: [1/1] a1faf2d01025e5f5be7dbc29af1b0b57631d6230 (kraxel/centos-edk2) +Subject: OvmfPkg: disable dynamic mmio window (rhel only) Signed-off-by: Gerd Hoffmann --- @@ -15,10 +9,10 @@ Signed-off-by: Gerd Hoffmann 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c -index b8feae4309..55e02417e4 100644 +index 38cece9173..19b8c470a8 100644 --- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c +++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c -@@ -617,7 +617,8 @@ PlatformDynamicMmioWindow ( +@@ -690,7 +690,8 @@ PlatformDynamicMmioWindow ( AddrSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth); MmioSpace = LShiftU64 (1, PlatformInfoHob->PhysMemAddressWidth - 3); diff --git a/0032-Revert-OvmfPkg-PlatformDxe-Handle-all-requests-in-Ex.patch b/0032-Revert-OvmfPkg-PlatformDxe-Handle-all-requests-in-Ex.patch deleted file mode 100644 index f9176a0..0000000 --- a/0032-Revert-OvmfPkg-PlatformDxe-Handle-all-requests-in-Ex.patch +++ /dev/null @@ -1,216 +0,0 @@ -From b6a0dcb7a035aef12e1466fd1017194b9430c948 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Tue, 13 Dec 2022 10:31:05 +0100 -Subject: Revert "OvmfPkg/PlatformDxe: Handle all requests in ExtractConfig and - RouteConfig" - -This reverts commit aefcc91805fd69e4aad4bc08a9f708db11cae5f0. - -Fixes regression, patch breaks setting display resolution via ovmf -platform config. - -Signed-off-by: Gerd Hoffmann ---- - OvmfPkg/PlatformDxe/Platform.c | 115 +-------------------------- - OvmfPkg/PlatformDxe/PlatformConfig.c | 2 +- - OvmfPkg/PlatformDxe/PlatformConfig.h | 2 - - 3 files changed, 3 insertions(+), 116 deletions(-) - -diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c -index ac31fafbdc..4d432f18df 100644 ---- a/OvmfPkg/PlatformDxe/Platform.c -+++ b/OvmfPkg/PlatformDxe/Platform.c -@@ -108,11 +108,6 @@ STATIC EFI_EVENT mGopEvent; - // - STATIC VOID *mGopTracker; - --// --// The driver image handle, used to obtain the device path for . --// --STATIC EFI_HANDLE mImageHandle; -- - // - // Cache the resolutions we get from the GOP. - // -@@ -234,10 +229,6 @@ ExtractConfig ( - { - MAIN_FORM_STATE MainFormState; - EFI_STATUS Status; -- EFI_STRING ConfigRequestHdr; -- EFI_STRING ConfigRequest; -- UINTN Size; -- BOOLEAN AllocatedRequest; - - DEBUG ((DEBUG_VERBOSE, "%a: Request=\"%s\"\n", __FUNCTION__, Request)); - -@@ -245,73 +236,18 @@ ExtractConfig ( - return EFI_INVALID_PARAMETER; - } - -- ConfigRequestHdr = NULL; -- ConfigRequest = NULL; -- Size = 0; -- AllocatedRequest = FALSE; -- -- // -- // Check if matches the GUID and name -- // -- *Progress = Request; -- if ((Request != NULL) && -- !HiiIsConfigHdrMatch ( -- Request, -- &gOvmfPlatformConfigGuid, -- mVariableName -- ) -- ) -- { -- return EFI_NOT_FOUND; -- } -- - Status = PlatformConfigToFormState (&MainFormState); - if (EFI_ERROR (Status)) { -+ *Progress = Request; - return Status; - } - -- if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) { -- // -- // Request has no , so construct full request string. -- // Allocate and fill a buffer large enough to hold -- // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a -- // null terminator. -- // -- ConfigRequestHdr = HiiConstructConfigHdr ( -- &gOvmfPlatformConfigGuid, -- mVariableName, -- mImageHandle -- ); -- if (ConfigRequestHdr == NULL) { -- return EFI_OUT_OF_RESOURCES; -- } -- -- Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16); -- ConfigRequest = AllocateZeroPool (Size); -- AllocatedRequest = TRUE; -- if (ConfigRequest == NULL) { -- FreePool (ConfigRequestHdr); -- return EFI_OUT_OF_RESOURCES; -- } -- -- UnicodeSPrint ( -- ConfigRequest, -- Size, -- L"%s&OFFSET=0&WIDTH=%016LX", -- ConfigRequestHdr, -- sizeof MainFormState -- ); -- FreePool (ConfigRequestHdr); -- } else { -- ConfigRequest = Request; -- } -- - // - // Answer the textual request keying off the binary form state. - // - Status = gHiiConfigRouting->BlockToConfig ( - gHiiConfigRouting, -- ConfigRequest, -+ Request, - (VOID *)&MainFormState, - sizeof MainFormState, - Results, -@@ -329,33 +265,6 @@ ExtractConfig ( - DEBUG ((DEBUG_VERBOSE, "%a: Results=\"%s\"\n", __FUNCTION__, *Results)); - } - -- // -- // If we used a newly allocated ConfigRequest, update Progress to point to -- // original Request instead of ConfigRequest. -- // -- if (Request == NULL) { -- *Progress = NULL; -- } else if (StrStr (Request, L"OFFSET") == NULL) { -- if (EFI_ERROR (Status)) { -- // -- // Since we constructed ConfigRequest, failure can only occur if there -- // is not enough memory. In this case, we point Progress to the first -- // character of Request. -- // -- *Progress = Request; -- } else { -- // -- // In case of success, we point Progress to the null terminator of -- // Request. -- // -- *Progress = Request + StrLen (Request); -- } -- } -- -- if (AllocatedRequest) { -- FreePool (ConfigRequest); -- } -- - return Status; - } - -@@ -439,21 +348,6 @@ RouteConfig ( - return EFI_INVALID_PARAMETER; - } - -- // -- // Check if matches the GUID and name -- // -- *Progress = Configuration; -- if ((Configuration != NULL) && -- !HiiIsConfigHdrMatch ( -- Configuration, -- &gOvmfPlatformConfigGuid, -- mVariableName -- ) -- ) -- { -- return EFI_NOT_FOUND; -- } -- - // - // the "read" step in RMW - // -@@ -972,11 +866,6 @@ PlatformInit ( - return Status; - } - -- // -- // Save the driver image handle. -- // -- mImageHandle = ImageHandle; -- - // - // Publish the HII package list to HII Database. - // -diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.c b/OvmfPkg/PlatformDxe/PlatformConfig.c -index f5ac2d0609..e202ac5b47 100644 ---- a/OvmfPkg/PlatformDxe/PlatformConfig.c -+++ b/OvmfPkg/PlatformDxe/PlatformConfig.c -@@ -21,7 +21,7 @@ - // - // Name of the UEFI variable that we use for persistent storage. - // --CHAR16 mVariableName[] = L"PlatformConfig"; -+STATIC CHAR16 mVariableName[] = L"PlatformConfig"; - - /** - Serialize and persistently save platform configuration. -diff --git a/OvmfPkg/PlatformDxe/PlatformConfig.h b/OvmfPkg/PlatformDxe/PlatformConfig.h -index 5d9b457b1b..902c9b2ce0 100644 ---- a/OvmfPkg/PlatformDxe/PlatformConfig.h -+++ b/OvmfPkg/PlatformDxe/PlatformConfig.h -@@ -50,6 +50,4 @@ PlatformConfigLoad ( - #define PLATFORM_CONFIG_F_GRAPHICS_RESOLUTION BIT0 - #define PLATFORM_CONFIG_F_DOWNGRADE BIT63 - --extern CHAR16 mVariableName[]; -- - #endif // _PLATFORM_CONFIG_H_ --- -2.38.1 - diff --git a/0033-OvmfPkg-SmbiosPlatformDxe-use-PcdFirmware.patch b/0033-OvmfPkg-SmbiosPlatformDxe-use-PcdFirmware.patch deleted file mode 100644 index 01329b0..0000000 --- a/0033-OvmfPkg-SmbiosPlatformDxe-use-PcdFirmware.patch +++ /dev/null @@ -1,231 +0,0 @@ -From 8b2cc30989c009ab72951022bd017143764411b2 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 28 Nov 2022 13:40:20 +0800 -Subject: OvmfPkg/SmbiosPlatformDxe: use PcdFirmware* - -Instead of using hard-coded strings ("0.0.0" for BiosVersion etc) -which is mostly useless read the PCDs (PcdFirmwareVendor, -PcdFirmwareVersionString and PcdFirmwareReleaseDateString) and -build the string table dynamuically at runtime. - -Signed-off-by: Gerd Hoffmann -Reviewed-by: Jiewen Yao -(cherry picked from commit 4cb94f20b002c99dd2b4b75f07c5495b81a34ffd) - -https://issues.redhat.com/browse/RHEL-75 ---- - OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c | 115 +++++++++++------- - .../SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 6 + - .../XenSmbiosPlatformDxe.inf | 9 +- - 3 files changed, 85 insertions(+), 45 deletions(-) - -diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c -index 94249d3ff1..dc1e6aed63 100644 ---- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c -+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c -@@ -9,57 +9,43 @@ - **/ - - #include // SMBIOS_TABLE_TYPE0 -+#include -+#include - #include // ASSERT_EFI_ERROR() -+#include -+#include - #include // gBS - #include // EFI_SMBIOS_PROTOCOL - - #include "SmbiosPlatformDxe.h" - --#define TYPE0_STRINGS \ -- "EFI Development Kit II / OVMF\0" /* Vendor */ \ -- "0.0.0\0" /* BiosVersion */ \ -- "02/06/2015\0" /* BiosReleaseDate */ --// --// Type definition and contents of the default Type 0 SMBIOS table. --// --#pragma pack(1) --typedef struct { -- SMBIOS_TABLE_TYPE0 Base; -- UINT8 Strings[sizeof (TYPE0_STRINGS)]; --} OVMF_TYPE0; --#pragma pack() -- --STATIC CONST OVMF_TYPE0 mOvmfDefaultType0 = { -+STATIC CONST SMBIOS_TABLE_TYPE0 mOvmfDefaultType0 = { -+ // SMBIOS_STRUCTURE Hdr - { -- // SMBIOS_STRUCTURE Hdr -- { -- EFI_SMBIOS_TYPE_BIOS_INFORMATION, // UINT8 Type -- sizeof (SMBIOS_TABLE_TYPE0), // UINT8 Length -- }, -- 1, // SMBIOS_TABLE_STRING Vendor -- 2, // SMBIOS_TABLE_STRING BiosVersion -- 0xE800, // UINT16 BiosSegment -- 3, // SMBIOS_TABLE_STRING BiosReleaseDate -- 0, // UINT8 BiosSize -- { // MISC_BIOS_CHARACTERISTICS BiosCharacteristics -- 0, // Reserved :2 -- 0, // Unknown :1 -- 1, // BiosCharacteristicsNotSupported :1 -- // Remaining BiosCharacteristics bits left unset :60 -- }, -- { // BIOSCharacteristicsExtensionBytes[2] -- 0, // BiosReserved -- 0x1C // SystemReserved = VirtualMachineSupported | -- // UefiSpecificationSupported | -- // TargetContentDistributionEnabled -- }, -- 0, // UINT8 SystemBiosMajorRelease -- 0, // UINT8 SystemBiosMinorRelease -- 0xFF, // UINT8 EmbeddedControllerFirmwareMajorRelease -- 0xFF // UINT8 EmbeddedControllerFirmwareMinorRelease -+ EFI_SMBIOS_TYPE_BIOS_INFORMATION, // UINT8 Type -+ sizeof (SMBIOS_TABLE_TYPE0), // UINT8 Length - }, -- // Text strings (unformatted area) -- TYPE0_STRINGS -+ 1, // SMBIOS_TABLE_STRING Vendor -+ 2, // SMBIOS_TABLE_STRING BiosVersion -+ 0xE800, // UINT16 BiosSegment -+ 3, // SMBIOS_TABLE_STRING BiosReleaseDate -+ 0, // UINT8 BiosSize -+ { // MISC_BIOS_CHARACTERISTICS BiosCharacteristics -+ 0, // Reserved :2 -+ 0, // Unknown :1 -+ 1, // BiosCharacteristicsNotSupported :1 -+ // Remaining BiosCharacteristics bits left unset :60 -+ }, -+ { // BIOSCharacteristicsExtensionBytes[2] -+ 0, // BiosReserved -+ 0x1C // SystemReserved = VirtualMachineSupported | -+ // UefiSpecificationSupported | -+ // TargetContentDistributionEnabled -+ }, -+ 0, // UINT8 SystemBiosMajorRelease -+ 0, // UINT8 SystemBiosMinorRelease -+ 0xFF, // UINT8 EmbeddedControllerFirmwareMajorRelease -+ 0xFF // UINT8 EmbeddedControllerFirmwareMinorRelease - }; - - /** -@@ -153,14 +139,55 @@ InstallAllStructures ( - // - // Add OVMF default Type 0 (BIOS Information) table - // -+ CHAR16 *VendStr, *VersStr, *DateStr; -+ UINTN VendLen, VersLen, DateLen; -+ CHAR8 *Type0; -+ -+ VendStr = (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVendor); -+ VendLen = StrLen (VendStr); -+ if (VendLen < 3) { -+ VendStr = L"unknown"; -+ VendLen = StrLen (VendStr); -+ } -+ -+ VersStr = (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVersionString); -+ VersLen = StrLen (VersStr); -+ if (VersLen < 3) { -+ VersStr = L"unknown"; -+ VersLen = StrLen (VersStr); -+ } -+ -+ DateStr = (CHAR16 *)FixedPcdGetPtr (PcdFirmwareReleaseDateString); -+ DateLen = StrLen (DateStr); -+ if (DateLen < 3) { -+ DateStr = L"unknown"; -+ DateLen = StrLen (DateStr); -+ } -+ -+ DEBUG ((DEBUG_INFO, "FirmwareVendor: \"%s\" (%d chars)\n", VendStr, VendLen)); -+ DEBUG ((DEBUG_INFO, "FirmwareVersionString: \"%s\" (%d chars)\n", VersStr, VersLen)); -+ DEBUG ((DEBUG_INFO, "FirmwareReleaseDateString: \"%s\" (%d chars)\n", DateStr, DateLen)); -+ -+ Type0 = AllocateZeroPool (sizeof (mOvmfDefaultType0) + VendLen + VersLen + DateLen + 4); -+ if (Type0 == NULL) { -+ return EFI_OUT_OF_RESOURCES; -+ } -+ -+ CopyMem (Type0, &mOvmfDefaultType0, sizeof (mOvmfDefaultType0)); -+ UnicodeStrToAsciiStrS (VendStr, Type0 + sizeof (mOvmfDefaultType0), VendLen + 1); -+ UnicodeStrToAsciiStrS (VersStr, Type0 + sizeof (mOvmfDefaultType0) + VendLen + 1, VersLen + 1); -+ UnicodeStrToAsciiStrS (DateStr, Type0 + sizeof (mOvmfDefaultType0) + VendLen + VersLen + 2, DateLen + 1); -+ - SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; - Status = Smbios->Add ( - Smbios, - NULL, - &SmbiosHandle, -- (EFI_SMBIOS_TABLE_HEADER *)&mOvmfDefaultType0 -+ (EFI_SMBIOS_TABLE_HEADER *)Type0 - ); - ASSERT_EFI_ERROR (Status); -+ -+ FreePool (Type0); - } - - return EFI_SUCCESS; -diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf -index 0066bbc922..52689c96e5 100644 ---- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf -+++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf -@@ -32,9 +32,12 @@ - - [Packages] - MdePkg/MdePkg.dec -+ MdeModulePkg/MdeModulePkg.dec - OvmfPkg/OvmfPkg.dec - - [LibraryClasses] -+ BaseLib -+ BaseMemoryLib - DebugLib - MemoryAllocationLib - PcdLib -@@ -45,6 +48,9 @@ - [Pcd] - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId - gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated -+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor -+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString -+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString - - [Protocols] - gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED -diff --git a/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf -index 7f4588e33d..e646c88741 100644 ---- a/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf -+++ b/OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf -@@ -38,19 +38,26 @@ - - [Packages] - MdePkg/MdePkg.dec -+ MdeModulePkg/MdeModulePkg.dec - - [Packages.IA32, Packages.X64] - OvmfPkg/OvmfPkg.dec - - [LibraryClasses] -+ BaseLib -+ BaseMemoryLib - DebugLib - UefiBootServicesTableLib - UefiDriverEntryPoint - - [LibraryClasses.IA32, LibraryClasses.X64] -- BaseLib - HobLib - -+[Pcd] -+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor -+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString -+ gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareReleaseDateString -+ - [Protocols] - gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED - --- -2.38.1 - diff --git a/edk2-ArmVirt-don-t-use-unaligned-CopyMem-on-NOR-flash.patch b/edk2-ArmVirt-don-t-use-unaligned-CopyMem-on-NOR-flash.patch deleted file mode 100644 index 25cd51b..0000000 --- a/edk2-ArmVirt-don-t-use-unaligned-CopyMem-on-NOR-flash.patch +++ /dev/null @@ -1,86 +0,0 @@ -From f6d83cd74def6af6ab27ddda15112cdf59c853d5 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 16 Jan 2023 10:46:39 +0100 -Subject: [PATCH] ArmVirt: don't use unaligned CopyMem () on NOR flash - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 23: ArmVirt: don't use unaligned CopyMem () on NOR flash -RH-Bugzilla: 2158173 -RH-Acked-by: Oliver Steffen -RH-Commit: [1/1] 7c8b7e5cd9c239dd8d040450bd4d479ef789114b (kraxel/centos-edk2) - -Commit 789a72328553 reclassified the NOR flash region as EFI_MEMORY_WC -in the OS visible EFI memory map, and dropped the explicit aligned -CopyMem() implementation, in the assumption that EFI_MEMORY_WC will be -honored by the OS, and that the region will be mapped in a way that -tolerates misaligned accesseses. However, Linux today uses device -attributes for all EFI MMIO regions, in spite of the memory type -attributes, and so using misaligned accesses is never safe. - -So instead, switch to the generic CopyMem() implementation entirely, -just like we already did for VariableRuntimeDxe. - -Fixes: 789a72328553 ("OvmfPkg/VirtNorFlashDxe: use EFI_MEMORY_WC and drop AlignedCopyMem()") -Signed-off-by: Gerd Hoffmann -Reviewed-by: Ard Biesheuvel -(cherry picked from commit 987cc09c7cf38d628063062483e2341fba679b0e) ---- - ArmVirtPkg/ArmVirtKvmTool.dsc | 6 +++++- - ArmVirtPkg/ArmVirtQemu.dsc | 6 +++++- - ArmVirtPkg/ArmVirtQemuKernel.dsc | 6 +++++- - 3 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc -index 2ba00bd08f..d0afe1b49e 100644 ---- a/ArmVirtPkg/ArmVirtKvmTool.dsc -+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc -@@ -296,7 +296,11 @@ - NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf - } - -- OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf -+ OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf { -+ -+ # don't use unaligned CopyMem () on the UEFI varstore NOR flash region -+ BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf -+ } - - MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf - -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index a4bd72e481..76389e6bd4 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -428,7 +428,11 @@ - - NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf - } -- OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf -+ OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf { -+ -+ # don't use unaligned CopyMem () on the UEFI varstore NOR flash region -+ BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf -+ } - MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf - - # -diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 7f85b0dc92..0445a89b1c 100644 ---- a/ArmVirtPkg/ArmVirtQemuKernel.dsc -+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -331,7 +331,11 @@ - - NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf - } -- OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf -+ OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.inf { -+ -+ # don't use unaligned CopyMem () on the UEFI varstore NOR flash region -+ BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf -+ } - MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf - - # --- -2.31.1 - diff --git a/edk2-OvmfPkg-VirtNorFlashDxe-map-flash-memory-as-uncachea.patch b/edk2-OvmfPkg-VirtNorFlashDxe-map-flash-memory-as-uncachea.patch deleted file mode 100644 index 5d776d6..0000000 --- a/edk2-OvmfPkg-VirtNorFlashDxe-map-flash-memory-as-uncachea.patch +++ /dev/null @@ -1,67 +0,0 @@ -From a7e155d9d0be18b9db31dd7135e9da2bc955e6b4 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Wed, 11 Jan 2023 19:00:23 +0100 -Subject: [PATCH 1/2] OvmfPkg/VirtNorFlashDxe: map flash memory as uncacheable - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 21: OvmfPkg/VirtNorFlashDxe: map flash memory as uncacheable -RH-Bugzilla: 2158173 -RH-Acked-by: Miroslav Rezanina -RH-Acked-by: Oliver Steffen -RH-Commit: [1/1] 819cd72096fa9f253eef7b532122183b608c0064 (kraxel/centos-edk2) - -Switching from the ArmPlatformPkg/NorFlashDxe driver to the -OvmfPkg/VirtNorFlashDxe driver had the side effect that flash address -space got registered as EFI_MEMORY_WC instead of EFI_MEMORY_UC. - -That confuses the linux kernel's numa code, seems this makes kernel -consider the flash being node memory. "lsmem" changes from ... - - RANGE SIZE STATE REMOVABLE BLOCK - 0x0000000040000000-0x000000013fffffff 4G online yes 8-39 - -... to ... - - RANGE SIZE STATE REMOVABLE BLOCK - 0x0000000000000000-0x0000000007ffffff 128M online yes 0 - 0x0000000040000000-0x000000013fffffff 4G online yes 8-39 - -... and in the kernel log got new error lines: - - NUMA: Warning: invalid memblk node 512 [mem 0x0000000004000000-0x0000000007ffffff] - NUMA: Faking a node at [mem 0x0000000004000000-0x000000013fffffff] - -Changing the attributes back to EFI_MEMORY_UC fixes this. - -Fixes: b92298af8218 ("ArmVirtPkg/ArmVirtQemu: migrate to OVMF's VirtNorFlashDxe") -Signed-off-by: Gerd Hoffmann -Reviewed-by: Ard Biesheuvel -(cherry picked from commit e5ec3ba409b5baa9cf429cc25fdf3c8d1b8dcef0) ---- - OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c -index ff3121af2a..f9a41f6aab 100644 ---- a/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c -+++ b/OvmfPkg/VirtNorFlashDxe/VirtNorFlashDxe.c -@@ -394,14 +394,14 @@ NorFlashFvbInitialize ( - EfiGcdMemoryTypeMemoryMappedIo, - Instance->DeviceBaseAddress, - RuntimeMmioRegionSize, -- EFI_MEMORY_WC | EFI_MEMORY_RUNTIME -+ EFI_MEMORY_UC | EFI_MEMORY_RUNTIME - ); - ASSERT_EFI_ERROR (Status); - - Status = gDS->SetMemorySpaceAttributes ( - Instance->DeviceBaseAddress, - RuntimeMmioRegionSize, -- EFI_MEMORY_WC | EFI_MEMORY_RUNTIME -+ EFI_MEMORY_UC | EFI_MEMORY_RUNTIME - ); - ASSERT_EFI_ERROR (Status); - --- -2.31.1 - diff --git a/edk2-Revert-MdeModulePkg-TerminalDxe-add-other-text-resol.patch b/edk2-Revert-MdeModulePkg-TerminalDxe-add-other-text-resol.patch deleted file mode 100644 index 2cd7a0f..0000000 --- a/edk2-Revert-MdeModulePkg-TerminalDxe-add-other-text-resol.patch +++ /dev/null @@ -1,72 +0,0 @@ -From ca0c903fb6d028d679e7afef22d70914ad920212 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Tue, 14 Feb 2023 12:48:06 +0100 -Subject: [PATCH] Revert "MdeModulePkg: TerminalDxe: add other text resolutions - (RHEL only)" - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 28: Revert "MdeModulePkg: TerminalDxe: add other text resolutions (RHEL only)" -RH-Bugzilla: 2162307 -RH-Acked-by: Miroslav Rezanina -RH-Commit: [1/1] aa3432ccf8e01b9e9058fe82a6a22c28137b8b4c (kraxel/centos-edk2) - -This reverts commit cef6b69ea8f009aeba50b2f4b69889f9500fa585. ---- - .../Universal/Console/TerminalDxe/Terminal.c | 41 ++----------------- - 1 file changed, 3 insertions(+), 38 deletions(-) - -diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -index dfd9c96773..e2d779c783 100644 ---- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c -@@ -112,44 +112,9 @@ TERMINAL_DEV mTerminalDevTemplate = { - }; - - TERMINAL_CONSOLE_MODE_DATA mTerminalConsoleModeData[] = { -- { 80, 25 }, // from graphics resolution 640 x 480 -- { 80, 50 }, // from graphics resolution 640 x 960 -- { 100, 25 }, // from graphics resolution 800 x 480 -- { 100, 31 }, // from graphics resolution 800 x 600 -- { 104, 32 }, // from graphics resolution 832 x 624 -- { 120, 33 }, // from graphics resolution 960 x 640 -- { 128, 31 }, // from graphics resolution 1024 x 600 -- { 128, 40 }, // from graphics resolution 1024 x 768 -- { 144, 45 }, // from graphics resolution 1152 x 864 -- { 144, 45 }, // from graphics resolution 1152 x 870 -- { 160, 37 }, // from graphics resolution 1280 x 720 -- { 160, 40 }, // from graphics resolution 1280 x 760 -- { 160, 40 }, // from graphics resolution 1280 x 768 -- { 160, 42 }, // from graphics resolution 1280 x 800 -- { 160, 50 }, // from graphics resolution 1280 x 960 -- { 160, 53 }, // from graphics resolution 1280 x 1024 -- { 170, 40 }, // from graphics resolution 1360 x 768 -- { 170, 40 }, // from graphics resolution 1366 x 768 -- { 175, 55 }, // from graphics resolution 1400 x 1050 -- { 180, 47 }, // from graphics resolution 1440 x 900 -- { 200, 47 }, // from graphics resolution 1600 x 900 -- { 200, 63 }, // from graphics resolution 1600 x 1200 -- { 210, 55 }, // from graphics resolution 1680 x 1050 -- { 240, 56 }, // from graphics resolution 1920 x 1080 -- { 240, 63 }, // from graphics resolution 1920 x 1200 -- { 240, 75 }, // from graphics resolution 1920 x 1440 -- { 250, 105 }, // from graphics resolution 2000 x 2000 -- { 256, 80 }, // from graphics resolution 2048 x 1536 -- { 256, 107 }, // from graphics resolution 2048 x 2048 -- { 320, 75 }, // from graphics resolution 2560 x 1440 -- { 320, 84 }, // from graphics resolution 2560 x 1600 -- { 320, 107 }, // from graphics resolution 2560 x 2048 -- { 350, 110 }, // from graphics resolution 2800 x 2100 -- { 400, 126 }, // from graphics resolution 3200 x 2400 -- { 480, 113 }, // from graphics resolution 3840 x 2160 -- { 512, 113 }, // from graphics resolution 4096 x 2160 -- { 960, 227 }, // from graphics resolution 7680 x 4320 -- { 1024, 227 }, // from graphics resolution 8192 x 4320 -+ { 80, 25 }, -+ { 80, 50 }, -+ { 100, 31 }, - // - // New modes can be added here. - // --- -2.31.1 - diff --git a/edk2-rh-openssl-add-crypto-bn-rsa_sup_mul.c-to-file-list.patch b/edk2-rh-openssl-add-crypto-bn-rsa_sup_mul.c-to-file-list.patch deleted file mode 100644 index dc7e0f6..0000000 --- a/edk2-rh-openssl-add-crypto-bn-rsa_sup_mul.c-to-file-list.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dca1a100d14056865c7360d80a2a1d1ae4b0de96 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Fri, 10 Feb 2023 10:49:44 +0100 -Subject: [PATCH 5/5] rh openssl: add crypto/bn/rsa_sup_mul.c to file list - -RH-Author: Gerd Hoffmann -RH-MergeRequest: 27: openssl update -RH-Bugzilla: 2164534 2164550 2164565 2164583 -RH-Acked-by: Miroslav Rezanina -RH-Commit: [2/2] a097fc031b54208e9c8974173784e4c306dbf7a0 (kraxel/centos-edk2) ---- - CryptoPkg/Library/OpensslLib/OpensslLib.inf | 1 + - CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -index e446b51e66..7e78255467 100644 ---- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf -+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -@@ -576,6 +576,7 @@ - $(OPENSSL_PATH)/ssl/statem/statem_local.h - # Autogenerated files list ends here - # RHEL8-specific OpenSSL file list starts here -+ $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c - $(OPENSSL_PATH)/crypto/evp/kdf_lib.c - $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c - $(OPENSSL_PATH)/crypto/kdf/kbkdf.c -diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -index c207dc8f4c..1c551cb099 100644 ---- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -@@ -526,6 +526,7 @@ - $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h - # Autogenerated files list ends here - # RHEL8-specific OpenSSL file list starts here -+ $(OPENSSL_PATH)/crypto/bn/rsa_sup_mul.c - $(OPENSSL_PATH)/crypto/evp/kdf_lib.c - $(OPENSSL_PATH)/crypto/evp/pkey_kdf.c - $(OPENSSL_PATH)/crypto/kdf/kbkdf.c --- -2.31.1 - diff --git a/edk2.spec b/edk2.spec index daf9951..fc874cf 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,7 +1,7 @@ ExclusiveArch: x86_64 aarch64 -%define GITDATE 20221207 -%define GITCOMMIT fff6d81270b5 +%define GITDATE 20230301 +%define GITCOMMIT f80f052277c8 %define TOOLCHAIN GCC5 %define OPENSSL_VER 1.1.1k @@ -16,13 +16,13 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 9%{?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=fff6d81270b5 +# COMMIT=f80f052277c8 # git archive --format=tar --prefix=edk2-$COMMIT/ $COMMIT \ # | xz -9ev >/tmp/edk2-$COMMIT.tar.xz Source0:edk2-%{GITCOMMIT}.tar.xz @@ -44,50 +44,32 @@ Source80: edk2-build.py Source82: edk2-build.rhel-9 Patch0002: 0002-Remove-submodules.patch -Patch0003: 0003-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch -Patch0004: 0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch -Patch0005: 0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch -Patch0006: 0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch -Patch0007: 0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch -Patch0008: 0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch -Patch0009: 0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch -Patch0010: 0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch -Patch0011: 0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch -Patch0012: 0012-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch -Patch0013: 0013-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch -Patch0014: 0014-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch -Patch0015: 0015-OvmfPkg-Remove-EbcDxe-RHEL-only.patch -Patch0016: 0016-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch -Patch0017: 0017-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch -Patch0018: 0018-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch -Patch0019: 0019-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch -Patch0020: 0020-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch -Patch0021: 0021-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch -Patch0022: 0022-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch -Patch0023: 0023-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch -Patch0024: 0024-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch -Patch0025: 0025-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch -Patch0026: 0026-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch -Patch0028: 0028-Revert-ArmVirtPkg-make-EFI_LOADER_DATA-non-executabl.patch -Patch0032: 0032-Revert-OvmfPkg-PlatformDxe-Handle-all-requests-in-Ex.patch -Patch0033: 0033-OvmfPkg-SmbiosPlatformDxe-use-PcdFirmware.patch -# For bz#2158173 - [aarch64][numa] Failed to create 2 numa nodes in some hardwares -Patch34: edk2-OvmfPkg-VirtNorFlashDxe-map-flash-memory-as-uncachea.patch -# For bz#1983086 - Assertion failure when creating 1024 VCPU VM: [...]UefiCpuPkg/CpuMpPei/CpuBist.c(186): !EFI_ERROR (Status) -Patch35: edk2-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch -# For bz#2158173 - [aarch64][numa] Failed to create 2 numa nodes in some hardwares -Patch36: edk2-ArmVirt-don-t-use-unaligned-CopyMem-on-NOR-flash.patch -# For bz#2157656 - [edk2] [aarch64] Unable to initialize EFI firmware when using edk2-aarch64-20221207gitfff6d81270b5-1.el9 in some hardwares -Patch37: edk2-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch -# For bz#2164534 - CVE-2023-0286 edk2: openssl: X.400 address type confusion in X.509 GeneralName [rhel-9] -# For bz#2164550 - CVE-2022-4304 edk2: openssl: timing attack in RSA Decryption implementation [rhel-9] -# For bz#2164565 - CVE-2023-0215 edk2: openssl: use-after-free following BIO_new_NDEF [rhel-9] -# For bz#2164583 - CVE-2022-4450 edk2: openssl: double free after calling PEM_read_bio_ex [rhel-9] -Patch38: edk2-rh-openssl-add-crypto-bn-rsa_sup_mul.c-to-file-list.patch -# For bz#2162307 - Broken GRUB output on a serial console -Patch39: edk2-Revert-MdeModulePkg-TerminalDxe-add-other-text-resol.patch -# For bz#2174605 - [EDK2] disable dynamic mmio window -Patch40: edk2-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch +Patch0003: 0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +Patch0004: 0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +Patch0005: 0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +Patch0006: 0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +Patch0007: 0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +Patch0008: 0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +Patch0009: 0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +Patch0010: 0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +Patch0011: 0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +Patch0012: 0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +Patch0013: 0013-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +Patch0014: 0014-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +Patch0015: 0015-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +Patch0016: 0016-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +Patch0017: 0017-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch0018: 0018-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch0019: 0019-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +Patch0020: 0020-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +Patch0021: 0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +Patch0022: 0022-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +Patch0023: 0023-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +Patch0024: 0024-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch +Patch0025: 0025-MdePkg-Remove-Itanium-leftover-data-structure-RH-onl.patch +Patch0027: 0027-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +Patch0028: 0028-Revert-ArmVirtPkg-ArmVirtQemu-enable-initial-ID-map-.patch +Patch0029: 0029-OvmfPkg-disable-dynamic-mmio-window-rhel-only.patch # python3-devel and libuuid-devel are required for building tools. @@ -393,6 +375,11 @@ install -m 0644 \ %changelog +* Wed Mar 22 2023 Miroslav Rezanina - 20230301gitf80f052277c8-1 +- Rebase to edk2-stable202302 [RHEL-266] + Resolves: RHEL-266 + (rebase edk2 to 2023-02 stable tag) + * Fri Mar 17 2023 Miroslav Rezanina - 20221207gitfff6d81270b5-9 - edk2-remove-amd-sev-feature-flag-from-secure-boot-builds-.patch [bz#2169247] - Resolves: bz#2169247 diff --git a/sources b/sources index e72430c..9d5c7e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (edk2-fff6d81270b5.tar.xz) = 3b215ae200c6be355aa937ef933cc636867416a24e159a83852d7972b7b70f712df3773c429ed5ac5cc6e300fd6f733d6a5bc1b54a06fc0bc3f98ea14d7cb068 +SHA512 (edk2-f80f052277c8.tar.xz) = af802257f010b63d973dc909b57ee845b7734e8d494b081050ba1f197349663b081e1f2edc5244726e2479ff6d16d79d0a6fceb00f4840b59982f10b79facf66 SHA512 (openssl-rhel-d00c3c5b8a9d6d3ea3dabfcafdf36afd61ba8bcc.tar.xz) = 6842e767f767fe79edcb9ba8e32ce2956e8b56f0b265f79a5b4dbd4bba51b63d9733841badee7f2ffdcca803baf82b3e9e132fd465c22027539dcfd02608e99a