From 9fc821a3d0589e5ea6a61e7387bbb22e52031522 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 22 2018 20:37:23 +0000 Subject: Update to edk2 git cb5f4f45ce - Remove upstreamed patches - Update to qemu qemu-ovmf-secureboot-1.1.3 --- diff --git a/.gitignore b/.gitignore index bbddc49..b2be7fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,3 @@ -/edk2-r14365.tar.xz -/edk2-r14844.tar.xz -/edk2-r15376.tar.xz -/edk2-buildtools-r2649.tar.xz -/edk2-buildtools-r2670.tar.xz -/edk2-buildtools-r17469.tar.xz -/edk2-buildtools-r18975.tar.xz -/edk2-20160418-a8c39ba.tar.gz -/openssl-1.0.2g.tar.gz -/openssl-1.0.2g-hobbled.tar.gz -/openssl-1.0.2j-hobbled.tar.xz -/edk2-20161105-3b25ca8.tar.gz -/edk2-20170209-296153c5.tar.xz -/edk2-20171011-92d07e4.tar.xz -/openssl-1.1.0e-hobbled.tar.xz -/qemu-ovmf-secureboot-1.1.2.tar.gz -/openssl-1.1.0h-hobbled.tar.xz -/edk2-20180529-ee3198e672e2.tar.xz +/openssl-*-hobbled.tar.xz +/edk2-*.tar.xz +/qemu-ovmf-secureboot-*.tar.gz diff --git a/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index 4f13d20..8aa5dec 100644 --- a/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,7 +1,8 @@ -From 08cfa34b6f97605c72426eefc7753d423f2fc0fa Mon Sep 17 00:00:00 2001 +From 37942481c89eca732239c23fe606680e6e3faf77 Mon Sep 17 00:00:00 2001 +Message-Id: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 -Subject: [PATCH 01/16] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in +Subject: [PATCH 01/17] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe NvmExpressDxe logs all BlockIo read & write calls on the EFI_D_VERBOSE @@ -10,6 +11,7 @@ level. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- OvmfPkg/OvmfPkgIa32.dsc | 5 ++++- OvmfPkg/OvmfPkgIa32X64.dsc | 5 ++++- @@ -17,10 +19,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 2d6c4c4..7530e1a 100644 +index a28b511d5c..7f725ab198 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -733,7 +733,10 @@ +@@ -738,7 +738,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -33,10 +35,10 @@ index 2d6c4c4..7530e1a 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 43158c5..de8edfd 100644 +index 115d0c01ff..d444a84267 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -742,7 +742,10 @@ +@@ -747,7 +747,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -49,10 +51,10 @@ index 43158c5..de8edfd 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index d1fdf7c..484b8c4 100644 +index 362eb789c7..f4e072870c 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -740,7 +740,10 @@ +@@ -745,7 +745,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -65,5 +67,5 @@ index d1fdf7c..484b8c4 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf -- -2.17.0 +2.17.1 diff --git a/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch b/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch index 0a170f4..77949a4 100644 --- a/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch +++ b/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch @@ -1,7 +1,10 @@ -From d45f1192743f3721936d531ca024894409dcf887 Mon Sep 17 00:00:00 2001 +From 5e55066b33d894cb7e9b84179de449e8734cb57d Mon Sep 17 00:00:00 2001 +Message-Id: <5e55066b33d894cb7e9b84179de449e8734cb57d.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 -Subject: [PATCH 02/16] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in the DXE +Subject: [PATCH 02/17] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in the DXE core The DXE core logs a bunch of Properties Table and Memory Attributes Table @@ -11,6 +14,7 @@ not interested in. Suppress said output. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- OvmfPkg/OvmfPkgIa32.dsc | 2 ++ OvmfPkg/OvmfPkgIa32X64.dsc | 2 ++ @@ -18,10 +22,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 7530e1a..613b390 100644 +index 7f725ab198..83e47281ed 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -639,6 +639,8 @@ +@@ -644,6 +644,8 @@ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -31,10 +35,10 @@ index 7530e1a..613b390 100644 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index de8edfd..b8e39ac 100644 +index d444a84267..a2adacfbd3 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -648,6 +648,8 @@ +@@ -653,6 +653,8 @@ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -44,10 +48,10 @@ index de8edfd..b8e39ac 100644 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 484b8c4..f69a5bd 100644 +index f4e072870c..b57e32f432 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -646,6 +646,8 @@ +@@ -651,6 +651,8 @@ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -57,5 +61,5 @@ index 484b8c4..f69a5bd 100644 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf -- -2.17.0 +2.17.1 diff --git a/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch b/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch index 2958124..c74743c 100644 --- a/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch +++ b/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch @@ -1,12 +1,16 @@ -From ce0900e38fcb54a7ea8a160204860b34b75610ca Mon Sep 17 00:00:00 2001 +From c667557c191923e981b972b5679fc49cec60d7e5 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Sun, 8 Jul 2012 14:26:07 +0200 -Subject: [PATCH 03/16] OvmfPkg: enable DEBUG_VERBOSE +Subject: [PATCH 03/17] OvmfPkg: enable DEBUG_VERBOSE Enable verbose debug logs. Signed-off-by: Laszlo Ersek Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- OvmfPkg/OvmfPkgIa32.dsc | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- @@ -14,10 +18,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 613b390..054839f 100644 +index 83e47281ed..cd0e71869b 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -481,7 +481,7 @@ +@@ -486,7 +486,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -27,10 +31,10 @@ index 613b390..054839f 100644 !ifdef $(SOURCE_DEBUG_ENABLE) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index b8e39ac..d033fcf 100644 +index a2adacfbd3..7f7a78f60a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -486,7 +486,7 @@ +@@ -491,7 +491,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -40,10 +44,10 @@ index b8e39ac..d033fcf 100644 !ifdef $(SOURCE_DEBUG_ENABLE) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f69a5bd..de335a1 100644 +index b57e32f432..739807efc4 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -486,7 +486,7 @@ +@@ -491,7 +491,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -53,5 +57,5 @@ index f69a5bd..de335a1 100644 !ifdef $(SOURCE_DEBUG_ENABLE) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 -- -2.17.0 +2.17.1 diff --git a/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch b/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch index db7d834..616204e 100644 --- a/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch +++ b/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch @@ -1,7 +1,10 @@ -From c946d99c660e5b5e6d28bf432f91711e28c37746 Mon Sep 17 00:00:00 2001 +From 6324a2a8ae4fc96c9e13d39483c5ee0cb1fff619 Mon Sep 17 00:00:00 2001 +Message-Id: <6324a2a8ae4fc96c9e13d39483c5ee0cb1fff619.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Thu, 20 Feb 2014 22:54:45 +0100 -Subject: [PATCH 04/16] OvmfPkg: increase max debug message length to 512 +Subject: [PATCH 04/17] OvmfPkg: increase max debug message length to 512 Upstream prefers short debug messages (sometimes even limited to 80 characters), but any line length under 512 characters is just unsuitable @@ -11,12 +14,13 @@ level, can be several hundred characters long.) 512 is an empirically good value. Signed-off-by: Laszlo Ersek +Signed-off-by: Cole Robinson --- OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c -index 36cde54..c0c4eae 100644 +index 36cde54976..c0c4eaee0f 100644 --- a/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c +++ b/OvmfPkg/Library/PlatformDebugLibIoPort/DebugLib.c @@ -27,7 +27,7 @@ @@ -29,5 +33,5 @@ index 36cde54..c0c4eae 100644 /** Prints a debug message to the debug output device if the specified error level is enabled. -- -2.17.0 +2.17.1 diff --git a/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch b/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch index 1aff322..fa6f748 100644 --- a/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch +++ b/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch @@ -1,7 +1,10 @@ -From 38c6368813e06e9e52a9c8e0dbd3713a6dec4d23 Mon Sep 17 00:00:00 2001 +From ade02daad705e1a4fd6468136de8fcb886f202a2 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Wed, 11 Jun 2014 23:33:33 +0200 -Subject: [PATCH 05/16] advertise OpenSSL on TianoCore splash screen / boot +Subject: [PATCH 05/17] advertise OpenSSL on TianoCore splash screen / boot logo Because we may include the OpenSSL library in our OVMF and AAVMF builds @@ -93,6 +96,7 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase: Signed-off-by: Laszlo Ersek (cherry picked from commit 32192c62e289f261f5ce74acee48e5a94561f10b) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- ArmVirtPkg/ArmVirtQemu.dsc | 4 + ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 4 + @@ -114,10 +118,10 @@ Signed-off-by: Paolo Bonzini create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.uni diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index d74feb7..7331597 100644 +index 885c6b14b8..a7a3899560 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -329,7 +329,11 @@ +@@ -327,7 +327,11 @@ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -130,10 +134,10 @@ index d74feb7..7331597 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 89f95b2..8941b7f 100644 +index a6390bd4b8..20a5bcb27b 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -191,7 +191,11 @@ READ_LOCK_STATUS = TRUE +@@ -202,7 +202,11 @@ READ_LOCK_STATUS = TRUE # # TianoCore logo (splash screen) # @@ -146,10 +150,10 @@ index 89f95b2..8941b7f 100644 # # Ramdisk support diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 1e823ae..1981aae 100644 +index 434d6861a5..6e4e0249ef 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -318,7 +318,11 @@ +@@ -316,7 +316,11 @@ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -163,7 +167,7 @@ index 1e823ae..1981aae 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 b/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 new file mode 100644 -index 0000000..567ca32 +index 0000000000..567ca32f05 --- /dev/null +++ b/MdeModulePkg/Logo/Logo-OpenSSL.bmp.b64 @@ -0,0 +1,2743 @@ @@ -2912,7 +2916,7 @@ index 0000000..567ca32 +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/MdeModulePkg/Logo/Logo-OpenSSL.idf b/MdeModulePkg/Logo/Logo-OpenSSL.idf new file mode 100644 -index 0000000..15de807 +index 0000000000..e527cff79b --- /dev/null +++ b/MdeModulePkg/Logo/Logo-OpenSSL.idf @@ -0,0 +1,15 @@ @@ -2933,7 +2937,7 @@ index 0000000..15de807 +#image IMG_LOGO Logo-OpenSSL.bmp diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.inf b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf new file mode 100644 -index 0000000..2f79d87 +index 0000000000..2f79d873e2 --- /dev/null +++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.inf @@ -0,0 +1,61 @@ @@ -3000,7 +3004,7 @@ index 0000000..2f79d87 + LogoDxeExtra.uni diff --git a/MdeModulePkg/Logo/LogoOpenSSLDxe.uni b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni new file mode 100644 -index 0000000..7227ac3 +index 0000000000..7227ac3910 --- /dev/null +++ b/MdeModulePkg/Logo/LogoOpenSSLDxe.uni @@ -0,0 +1,22 @@ @@ -3027,10 +3031,10 @@ index 0000000..7227ac3 +#string STR_MODULE_DESCRIPTION #language en-US "This module provides the logo bitmap picture (with OpenSSL advertisment) shown on setup screen, through EDKII Platform Logo protocol." + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 054839f..889735a 100644 +index cd0e71869b..0a49336c0d 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -689,7 +689,11 @@ +@@ -694,7 +694,11 @@ NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf !endif } @@ -3043,7 +3047,7 @@ index 054839f..889735a 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 0427ded..f552bc9 100644 +index 52b8b1fea1..4177379a23 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -295,7 +295,11 @@ INF ShellPkg/Application/Shell/Shell.inf @@ -3059,10 +3063,10 @@ index 0427ded..f552bc9 100644 # # Network modules diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index d033fcf..af2cdf1 100644 +index 7f7a78f60a..a3d51ef0f7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -698,7 +698,11 @@ +@@ -703,7 +703,11 @@ NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf !endif } @@ -3075,7 +3079,7 @@ index d033fcf..af2cdf1 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 6df47f4..ee77ae1 100644 +index 70845d6972..5e57161154 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf @@ -3091,10 +3095,10 @@ index 6df47f4..ee77ae1 100644 # # Network modules diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index de335a1..3572e42 100644 +index 739807efc4..f9b4ab4dfa 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -696,7 +696,11 @@ +@@ -701,7 +701,11 @@ NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf !endif } @@ -3107,7 +3111,7 @@ index de335a1..3572e42 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 2e2a174..505d25d 100644 +index 1eb46ac9a2..c81b422517 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf @@ -3123,5 +3127,5 @@ index 2e2a174..505d25d 100644 # # Network modules -- -2.17.0 +2.17.1 diff --git a/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch b/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch index 0c9bc9e..526eb16 100644 --- a/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch +++ b/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch @@ -1,7 +1,10 @@ -From 3a78f0402caa01f9d33d5b0c22c5dbaff2f42b31 Mon Sep 17 00:00:00 2001 +From e4021f592da913f7f2b841ce6d4272fb8410ac7f Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Thu, 12 Jun 2014 00:17:59 +0200 -Subject: [PATCH 06/16] OvmfPkg: QemuVideoDxe: enable debug messages in VbeShim +Subject: [PATCH 06/17] OvmfPkg: QemuVideoDxe: enable debug messages in VbeShim The Int10h VBE Shim is capable of emitting short debug messages when the win2k8r2 UEFI guest uses (emulates) the Video BIOS. In upstream the quiet @@ -23,13 +26,14 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit ccda46526bb2e573d9b54f0db75d27e442b4566f) (cherry picked from commit ed45b26dbeadd63dd8f2edf627290957d8bbb3b2) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- OvmfPkg/QemuVideoDxe/VbeShim.asm | 2 +- OvmfPkg/QemuVideoDxe/VbeShim.h | 481 ++++++++++++++++++++----------- 2 files changed, 308 insertions(+), 175 deletions(-) diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.asm b/OvmfPkg/QemuVideoDxe/VbeShim.asm -index 18fa920..f87ed5c 100644 +index 18fa9209d4..f87ed5cf30 100644 --- a/OvmfPkg/QemuVideoDxe/VbeShim.asm +++ b/OvmfPkg/QemuVideoDxe/VbeShim.asm @@ -18,7 +18,7 @@ @@ -42,7 +46,7 @@ index 18fa920..f87ed5c 100644 %macro DebugLog 1 %ifdef DEBUG diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.h b/OvmfPkg/QemuVideoDxe/VbeShim.h -index cc9b6e1..325d647 100644 +index cc9b6e14cd..325d6478a1 100644 --- a/OvmfPkg/QemuVideoDxe/VbeShim.h +++ b/OvmfPkg/QemuVideoDxe/VbeShim.h @@ -517,185 +517,318 @@ STATIC CONST UINT8 mVbeShim[] = { @@ -539,5 +543,5 @@ index cc9b6e1..325d647 100644 }; #endif -- -2.17.0 +2.17.1 diff --git a/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch b/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch index 86bb682..b7db54d 100644 --- a/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch +++ b/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch @@ -1,7 +1,10 @@ -From f14bf6eae4a923d944194c78f71d4c71c38842e6 Mon Sep 17 00:00:00 2001 +From b6e4c1bf03878da7bd82224d523c44fd1fa96aaa Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Tue, 25 Feb 2014 18:40:35 +0100 -Subject: [PATCH 07/16] MdeModulePkg: TerminalDxe: add other text resolutions +Subject: [PATCH 07/17] MdeModulePkg: TerminalDxe: add other text resolutions When the console output is multiplexed to several devices by ConSplitterDxe, then ConSplitterDxe builds an intersection of text modes @@ -71,12 +74,13 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase: Signed-off-by: Laszlo Ersek (cherry picked from commit 99dc3720ac86059f60156197328cc433603c536e) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- .../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 66dd3ad..78a1983 100644 +index 66dd3ad550..78a198379a 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c @@ -113,9 +113,44 @@ TERMINAL_DEV mTerminalDevTemplate = { @@ -128,5 +132,5 @@ index 66dd3ad..78a1983 100644 // New modes can be added here. // -- -2.17.0 +2.17.1 diff --git a/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index b2abb13..95fcce0 100644 --- a/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,7 +1,10 @@ -From e4342f9f5ddd4d45e0098697c38a55f9402d4e0f Mon Sep 17 00:00:00 2001 +From f337eb3972afcccabe86fe663202a758337d0ab8 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 -Subject: [PATCH 08/16] MdeModulePkg: TerminalDxe: set xterm resolution on mode +Subject: [PATCH 08/17] MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH only) The @@ -30,6 +33,7 @@ Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek (cherry picked from commit 2909e025db6878723b49644a8a0cf160d07e6444) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- MdeModulePkg/MdeModulePkg.dec | 4 +++ .../Console/TerminalDxe/TerminalConOut.c | 30 +++++++++++++++++++ @@ -37,10 +41,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 36 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index cc39718..384d901 100644 +index 6a6d9660ed..2dc1cf94e2 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -1914,6 +1914,10 @@ +@@ -1936,6 +1936,10 @@ # @Prompt The address mask when memory encryption is enabled. gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0|UINT64|0x30001047 @@ -52,7 +56,7 @@ index cc39718..384d901 100644 ## Specify memory size with page number for PEI code when # Loading Module at Fixed Address feature is enabled. diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c -index 5a83431..fbc1e0a 100644 +index 4d7218e415..295e7641a5 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -13,6 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @@ -107,7 +111,7 @@ index 5a83431..fbc1e0a 100644 Status = This->ClearScreen (This); diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -index 0780296..bd2ba82 100644 +index 0780296798..bd2ba828a6 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf @@ -60,6 +60,7 @@ @@ -127,5 +131,5 @@ index 0780296..bd2ba82 100644 # [Event] # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout. -- -2.17.0 +2.17.1 diff --git a/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index 94f50a5..0e694fd 100644 --- a/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,7 +1,10 @@ -From 7ea5e9e4f9c358fe9cc10e57e34bb5ada33f1176 Mon Sep 17 00:00:00 2001 +From 30251344cfbd25212394c377b80cd720a3b85d46 Mon Sep 17 00:00:00 2001 +Message-Id: <30251344cfbd25212394c377b80cd720a3b85d46.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 -Subject: [PATCH 09/16] OvmfPkg: take PcdResizeXterm from the QEMU command line +Subject: [PATCH 09/17] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only) Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase: @@ -20,6 +23,7 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 6fa0c4d67c0bb8bde2ddd6db41c19eb0c40b2721) (cherry picked from commit 8abc2a6ddad25af7e88dc0cf57d55dfb75fbf92d) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + @@ -29,10 +33,10 @@ Signed-off-by: Paolo Bonzini 5 files changed, 5 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 889735a..571118d 100644 +index 0a49336c0d..8dc3ad2be4 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -530,6 +530,7 @@ +@@ -535,6 +535,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -41,10 +45,10 @@ index 889735a..571118d 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index af2cdf1..c0b5271 100644 +index a3d51ef0f7..d81cd865d5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -536,6 +536,7 @@ +@@ -541,6 +541,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -53,10 +57,10 @@ index af2cdf1..c0b5271 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 3572e42..f2bb8c8 100644 +index f9b4ab4dfa..85bd8d4bf6 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -535,6 +535,7 @@ +@@ -540,6 +540,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -65,7 +69,7 @@ index 3572e42..f2bb8c8 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index 5a78668..544ac54 100644 +index 5a78668126..544ac547bf 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -670,6 +670,7 @@ InitializePlatform ( @@ -77,7 +81,7 @@ index 5a78668..544ac54 100644 AmdSevInitialize (); diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index 30ceb4b..016c067 100644 +index 9c5ad9961c..31baaa0a22 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -94,6 +94,7 @@ @@ -89,5 +93,5 @@ index 30ceb4b..016c067 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack -- -2.17.0 +2.17.1 diff --git a/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch b/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch index 8f1b068..ea19dee 100644 --- a/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch +++ b/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch @@ -1,7 +1,10 @@ -From fea29c5c217f61d4169f8236711431a5d0c99f05 Mon Sep 17 00:00:00 2001 +From 92f37a3d72213d9b76bc47c4f194f2ea989a71a1 Mon Sep 17 00:00:00 2001 +Message-Id: <92f37a3d72213d9b76bc47c4f194f2ea989a71a1.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Tue, 12 Apr 2016 20:50:25 +0200 -Subject: [PATCH 10/16] ArmVirtPkg: QemuFwCfgLib: allow UEFI_DRIVER client +Subject: [PATCH 10/17] ArmVirtPkg: QemuFwCfgLib: allow UEFI_DRIVER client modules (RH only) Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase: @@ -17,12 +20,13 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 8e2153358aa2bba2c91faa87a70beadcaae03fd8) (cherry picked from commit 5af259a93f4bbee5515ae18638068125e170f2cd) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf -index eff4a21..adf1ff6 100644 +index eff4a21650..adf1ff6c6a 100644 --- a/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/ArmVirtPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf @@ -22,7 +22,7 @@ @@ -35,5 +39,5 @@ index eff4a21..adf1ff6 100644 CONSTRUCTOR = QemuFwCfgInitialize -- -2.17.0 +2.17.1 diff --git a/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index 38e4439..d80d840 100644 --- a/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,7 +1,10 @@ -From 3be34f5ba685c15e8537e4489589bf01ad7ea731 Mon Sep 17 00:00:00 2001 +From 6a27daa40698f06a34c209bd90092011d70f7795 Mon Sep 17 00:00:00 2001 +Message-Id: <6a27daa40698f06a34c209bd90092011d70f7795.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 -Subject: [PATCH 11/16] ArmVirtPkg: take PcdResizeXterm from the QEMU command +Subject: [PATCH 11/17] ArmVirtPkg: take PcdResizeXterm from the QEMU command line (RH only) Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase: @@ -22,6 +25,7 @@ Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek (cherry picked from commit d4564d39dfdbf74e762af43314005a2c026cb262) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- ArmVirtPkg/ArmVirtQemu.dsc | 7 +- .../TerminalPcdProducerLib.c | 87 +++++++++++++++++++ @@ -31,10 +35,10 @@ Signed-off-by: Paolo Bonzini create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 7331597..4bf94ce 100644 +index a7a3899560..86d5d5a666 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -208,6 +208,8 @@ +@@ -206,6 +206,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0 gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE @@ -43,7 +47,7 @@ index 7331597..4bf94ce 100644 [PcdsDynamicHii] gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS -@@ -284,7 +286,10 @@ +@@ -282,7 +284,10 @@ MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf @@ -57,7 +61,7 @@ index 7331597..4bf94ce 100644 MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c new file mode 100644 -index 0000000..814ad48 +index 0000000000..814ad48199 --- /dev/null +++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c @@ -0,0 +1,87 @@ @@ -150,7 +154,7 @@ index 0000000..814ad48 +} diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf new file mode 100644 -index 0000000..fecb37b +index 0000000000..fecb37bcdf --- /dev/null +++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf @@ -0,0 +1,41 @@ @@ -196,5 +200,5 @@ index 0000000..fecb37b +[Pcd] + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm -- -2.17.0 +2.17.1 diff --git a/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch b/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch index 6ac2215..e49ad73 100644 --- a/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch +++ b/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch @@ -1,7 +1,10 @@ -From dfca43c4da3d1ba70b9f0de4fc041df57709d259 Mon Sep 17 00:00:00 2001 +From 84570add9731d2099c6e5be43f96aed508fd4c39 Mon Sep 17 00:00:00 2001 +Message-Id: <84570add9731d2099c6e5be43f96aed508fd4c39.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:53 +0100 -Subject: [PATCH 12/16] OvmfPkg: allow exclusion of the shell from the firmware +Subject: [PATCH 12/17] OvmfPkg: allow exclusion of the shell from the firmware image When '-D EXCLUDE_SHELL_FROM_FD' is passed to 'build', exclude the shell @@ -49,6 +52,7 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 9c391def70366cabae08e6008814299c3372fafd) (cherry picked from commit d9dd9ee42937b2611fe37183cc9ec7f62d946933) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- OvmfPkg/OvmfPkgIa32.fdf | 2 ++ OvmfPkg/OvmfPkgIa32X64.fdf | 2 ++ @@ -56,7 +60,7 @@ Signed-off-by: Paolo Bonzini 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index f552bc9..73007dd 100644 +index 4177379a23..8c0b6ee1bd 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -288,12 +288,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -75,7 +79,7 @@ index f552bc9..73007dd 100644 !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index ee77ae1..116b3c6 100644 +index 5e57161154..8de20366d2 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -94,7 +98,7 @@ index ee77ae1..116b3c6 100644 !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 505d25d..84d5845 100644 +index c81b422517..49ef829a3a 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour @@ -113,5 +117,5 @@ index 505d25d..84d5845 100644 !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf -- -2.17.0 +2.17.1 diff --git a/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch b/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch index 16f4d53..477f2ce 100644 --- a/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch +++ b/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch @@ -1,7 +1,10 @@ -From 8e8701871ac4e7fe08e4bfedf1ae6d856234a3d2 Mon Sep 17 00:00:00 2001 +From 685d43b29b2ac4b19572bda1ebeb989d69d74ebb Mon Sep 17 00:00:00 2001 +Message-Id: <685d43b29b2ac4b19572bda1ebeb989d69d74ebb.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:55 +0100 -Subject: [PATCH 13/16] OvmfPkg: EnrollDefaultKeys: application for enrolling +Subject: [PATCH 13/17] OvmfPkg: EnrollDefaultKeys: application for enrolling default keys This application is meant to be invoked by the management layer, after @@ -192,6 +195,7 @@ Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase: Signed-off-by: Laszlo Ersek (cherry picked from commit c0b2615a9c0b4a4be1bffe45681a32915449279d) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c | 1015 +++++++++++++++++ .../EnrollDefaultKeys/EnrollDefaultKeys.inf | 52 + @@ -204,7 +208,7 @@ Signed-off-by: Paolo Bonzini diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c new file mode 100644 -index 0000000..dd413df +index 0000000000..dd413df12d --- /dev/null +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.c @@ -0,0 +1,1015 @@ @@ -1225,7 +1229,7 @@ index 0000000..dd413df +} diff --git a/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf new file mode 100644 -index 0000000..0ad86a2 +index 0000000000..0ad86a2843 --- /dev/null +++ b/OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf @@ -0,0 +1,52 @@ @@ -1282,10 +1286,10 @@ index 0000000..0ad86a2 + UefiLib + UefiRuntimeServicesTableLib diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 571118d..b8dac8b 100644 +index 8dc3ad2be4..518f6db2c6 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -870,6 +870,10 @@ +@@ -876,6 +876,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1297,10 +1301,10 @@ index 571118d..b8dac8b 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index c0b5271..a536f8f 100644 +index d81cd865d5..ed2f876e7e 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -879,6 +879,10 @@ +@@ -885,6 +885,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1312,10 +1316,10 @@ index c0b5271..a536f8f 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f2bb8c8..04bf911 100644 +index 85bd8d4bf6..a12905f882 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -877,6 +877,10 @@ +@@ -883,6 +883,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1327,5 +1331,5 @@ index f2bb8c8..04bf911 100644 OvmfPkg/PlatformDxe/Platform.inf -- -2.17.0 +2.17.1 diff --git a/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch b/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch index 9658192..7cf890a 100644 --- a/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch +++ b/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch @@ -1,7 +1,10 @@ -From d23f5e305ee7de36681dbce71826acf8a1b04d84 Mon Sep 17 00:00:00 2001 +From 6f89eae9f2abe20e35058848e7cc10a69a6b05ec Mon Sep 17 00:00:00 2001 +Message-Id: <6f89eae9f2abe20e35058848e7cc10a69a6b05ec.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:49:43 +0200 -Subject: [PATCH 14/16] ArmPlatformPkg: introduce fixed PCD for early hello +Subject: [PATCH 14/17] ArmPlatformPkg: introduce fixed PCD for early hello message (RH only) Drew has proposed that ARM|AARCH64 platform firmware (especially virtual @@ -31,15 +34,16 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 7ce97b06421434c82095f01a1753a8c9c546cc30) (cherry picked from commit 20b1f1cbd0590aa71c6d99d35e23cf08e0707750) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- ArmPlatformPkg/ArmPlatformPkg.dec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec -index dff4598..3c5c6c7 100644 +index 5f67e74154..2956d3e2d8 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dec +++ b/ArmPlatformPkg/ArmPlatformPkg.dec -@@ -112,6 +112,13 @@ +@@ -113,6 +113,13 @@ ## If set, this will swap settings for HDLCD RED_SELECT and BLUE_SELECT registers gArmPlatformTokenSpaceGuid.PcdArmHdLcdSwapBlueRedSelect|FALSE|BOOLEAN|0x00000045 @@ -54,5 +58,5 @@ index dff4598..3c5c6c7 100644 ## PL031 RealTimeClock gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024 -- -2.17.0 +2.17.1 diff --git a/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch b/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch index 284f36a..d23f6c0 100644 --- a/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +++ b/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch @@ -1,7 +1,10 @@ -From 9952e73e166f2cdd9df473b8ac51565204a0d89e Mon Sep 17 00:00:00 2001 +From e6c0f362edd5834b0d891fc44cd6873566bb0df4 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:59:20 +0200 -Subject: [PATCH 15/16] ArmPlatformPkg: PrePeiCore: write early hello message +Subject: [PATCH 15/17] ArmPlatformPkg: PrePeiCore: write early hello message to the serial port (RH) The FixedPcdGetSize() macro expands to an integer constant, therefore an @@ -26,6 +29,7 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit b16c4c505ce0e27305235533eac9236aa66f132e) (cherry picked from commit 742e5bf6d5ce5a1e73879d6e5c0dd00feda7a9ac) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- ArmPlatformPkg/PrePeiCore/MainMPCore.c | 5 +++++ ArmPlatformPkg/PrePeiCore/MainUniCore.c | 5 +++++ @@ -35,7 +39,7 @@ Signed-off-by: Paolo Bonzini 5 files changed, 15 insertions(+) diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c -index dc47adb..cbd7223 100644 +index dc47adbaff..cbd72232c7 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c @@ -117,6 +117,11 @@ PrimaryMain ( @@ -51,7 +55,7 @@ index dc47adb..cbd7223 100644 // Enable the GIC Distributor diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c -index 134a469..af39fc0 100644 +index 134a469427..af39fc017c 100644 --- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c @@ -35,6 +35,11 @@ PrimaryMain ( @@ -67,7 +71,7 @@ index 134a469..af39fc0 100644 // Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is created at diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h -index 1608946..bf843d7 100644 +index 160894620c..bf843d7768 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h @@ -21,6 +21,7 @@ @@ -79,7 +83,7 @@ index 1608946..bf843d7 100644 #include #include diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -index e3a31fa..1bc0c45 100644 +index e3a31fa7c6..1bc0c45420 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf @@ -72,6 +72,8 @@ @@ -92,7 +96,7 @@ index e3a31fa..1bc0c45 100644 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase gArmTokenSpaceGuid.PcdGicSgiIntId diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -index ec83cec..20698fc 100644 +index ec83cec2d8..20698fcfac 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf @@ -71,3 +71,5 @@ @@ -102,5 +106,5 @@ index ec83cec..20698fc 100644 + + gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage -- -2.17.0 +2.17.1 diff --git a/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch b/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch index f64cb5d..618f728 100644 --- a/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch +++ b/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch @@ -1,7 +1,10 @@ -From 87e209ac5896384f3d1206fc20e149d8034c08b1 Mon Sep 17 00:00:00 2001 +From e777f7d03c8a8d56e08926ecf0b17e1338837093 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Laszlo Ersek Date: Wed, 14 Oct 2015 14:07:17 +0200 -Subject: [PATCH 16/16] ArmVirtPkg: set early hello message (RH only) +Subject: [PATCH 16/17] ArmVirtPkg: set early hello message (RH only) Print a friendly banner on QEMU, regardless of debug mask settings. @@ -22,15 +25,16 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 5d4a15b9019728b2d96322bc679099da49916925) (cherry picked from commit 179df76dbb0d199bd905236e98775b4059c6502a) Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- ArmVirtPkg/ArmVirtQemu.dsc | 1 + 1 file changed, 1 insertion(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 4bf94ce..035b729 100644 +index 86d5d5a666..ffe4ba8092 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -89,6 +89,7 @@ +@@ -87,6 +87,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE [PcdsFixedAtBuild.common] @@ -39,5 +43,5 @@ index 4bf94ce..035b729 100644 !if $(ARCH) == AARCH64 gArmTokenSpaceGuid.PcdVFPEnabled|1 -- -2.17.0 +2.17.1 diff --git a/0050-OvmfPkg-PlatformBootManagerLib-connect-consoles-unco.patch b/0050-OvmfPkg-PlatformBootManagerLib-connect-consoles-unco.patch deleted file mode 100644 index 49c04e6..0000000 --- a/0050-OvmfPkg-PlatformBootManagerLib-connect-consoles-unco.patch +++ /dev/null @@ -1,206 +0,0 @@ -From f803c03cc2e0b6b0b0bed447a97ea2c61b04ed82 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Sun, 13 May 2018 00:13:53 +0200 -Subject: [PATCH] OvmfPkg/PlatformBootManagerLib: connect consoles - unconditionally - -If both ConIn and ConOut exist, but ConIn references none of the PS/2 -keyboard, the USB wild-card keyboard, and any serial ports, then -PlatformInitializeConsole() currently allows the boot to proceed without -any input devices at all. This makes for a bad user experience -- the -firmware menu could only be entered through OsIndications, set by a guest -OS. - -Do what ArmVirtQemu does already, namely connect the consoles, and add -them to ConIn / ConOut / ErrOut, unconditionally. (The underlying -EfiBootManagerUpdateConsoleVariable() function checks for duplicates.) - -The issue used to be masked by the EfiBootManagerConnectAll() call that -got conditionalized in commit 245c643cc8b7. - -This patch is best viewed with "git show -b -W". - -Cc: Ard Biesheuvel -Cc: Jordan Justen -Fixes: 245c643cc8b73240c3b88cb55b2911b285a8c10d -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1577546 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Ard Biesheuvel ---- - .../PlatformBootManagerLib/BdsPlatform.c | 127 ++++++------------ - 1 file changed, 44 insertions(+), 83 deletions(-) - -diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c -index 862fa6ebb4..004b753f4d 100644 ---- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c -+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c -@@ -26,7 +26,6 @@ VOID *mEfiDevPathNotifyReg; - EFI_EVENT mEfiDevPathEvent; - VOID *mEmuVariableEventReg; - EFI_EVENT mEmuVariableEvent; --BOOLEAN mDetectVgaOnly; - UINT16 mHostBridgeDevId; - - // -@@ -830,35 +829,33 @@ DetectAndPreparePlatformPciDevicePath ( - ); - ASSERT_EFI_ERROR (Status); - -- if (!mDetectVgaOnly) { -+ // -+ // Here we decide whether it is LPC Bridge -+ // -+ if ((IS_PCI_LPC (Pci)) || -+ ((IS_PCI_ISA_PDECODE (Pci)) && -+ (Pci->Hdr.VendorId == 0x8086) && -+ (Pci->Hdr.DeviceId == 0x7000) -+ ) -+ ) { - // -- // Here we decide whether it is LPC Bridge -+ // Add IsaKeyboard to ConIn, -+ // add IsaSerial to ConOut, ConIn, ErrOut - // -- if ((IS_PCI_LPC (Pci)) || -- ((IS_PCI_ISA_PDECODE (Pci)) && -- (Pci->Hdr.VendorId == 0x8086) && -- (Pci->Hdr.DeviceId == 0x7000) -- ) -- ) { -- // -- // Add IsaKeyboard to ConIn, -- // add IsaSerial to ConOut, ConIn, ErrOut -- // -- DEBUG ((EFI_D_INFO, "Found LPC Bridge device\n")); -- PrepareLpcBridgeDevicePath (Handle); -- return EFI_SUCCESS; -- } -+ DEBUG ((EFI_D_INFO, "Found LPC Bridge device\n")); -+ PrepareLpcBridgeDevicePath (Handle); -+ return EFI_SUCCESS; -+ } -+ // -+ // Here we decide which Serial device to enable in PCI bus -+ // -+ if (IS_PCI_16550SERIAL (Pci)) { - // -- // Here we decide which Serial device to enable in PCI bus -+ // Add them to ConOut, ConIn, ErrOut. - // -- if (IS_PCI_16550SERIAL (Pci)) { -- // -- // Add them to ConOut, ConIn, ErrOut. -- // -- DEBUG ((EFI_D_INFO, "Found PCI 16550 SERIAL device\n")); -- PreparePciSerialDevicePath (Handle); -- return EFI_SUCCESS; -- } -+ DEBUG ((EFI_D_INFO, "Found PCI 16550 SERIAL device\n")); -+ PreparePciSerialDevicePath (Handle); -+ return EFI_SUCCESS; - } - - // -@@ -877,26 +874,6 @@ DetectAndPreparePlatformPciDevicePath ( - } - - --/** -- Do platform specific PCI Device check and add them to ConOut, ConIn, ErrOut -- -- @param[in] DetectVgaOnly - Only detect VGA device if it's TRUE. -- -- @retval EFI_SUCCESS - PCI Device check and Console variable update -- successfully. -- @retval EFI_STATUS - PCI Device check or Console variable update fail. -- --**/ --EFI_STATUS --DetectAndPreparePlatformPciDevicePaths ( -- BOOLEAN DetectVgaOnly -- ) --{ -- mDetectVgaOnly = DetectVgaOnly; -- return VisitAllPciInstances (DetectAndPreparePlatformPciDevicePath); --} -- -- - /** - Connect the predefined platform default console device. - -@@ -910,50 +887,34 @@ PlatformInitializeConsole ( - ) - { - UINTN Index; -- EFI_DEVICE_PATH_PROTOCOL *VarConout; -- EFI_DEVICE_PATH_PROTOCOL *VarConin; - - // -- // Connect RootBridge -+ // Do platform specific PCI Device check and add them to ConOut, ConIn, -+ // ErrOut - // -- GetEfiGlobalVariable2 (EFI_CON_OUT_VARIABLE_NAME, (VOID **) &VarConout, -- NULL); -- GetEfiGlobalVariable2 (EFI_CON_IN_VARIABLE_NAME, (VOID **) &VarConin, NULL); -- -- if (VarConout == NULL || VarConin == NULL) { -- // -- // Do platform specific PCI Device check and add them to ConOut, ConIn, -- // ErrOut -- // -- DetectAndPreparePlatformPciDevicePaths (FALSE); -+ VisitAllPciInstances (DetectAndPreparePlatformPciDevicePath); - -+ // -+ // Have chance to connect the platform default console, -+ // the platform default console is the minimum device group -+ // the platform should support -+ // -+ for (Index = 0; PlatformConsole[Index].DevicePath != NULL; ++Index) { - // -- // Have chance to connect the platform default console, -- // the platform default console is the minimum device group -- // the platform should support -+ // Update the console variable with the connect type - // -- for (Index = 0; PlatformConsole[Index].DevicePath != NULL; ++Index) { -- // -- // Update the console variable with the connect type -- // -- if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) { -- EfiBootManagerUpdateConsoleVariable (ConIn, -- PlatformConsole[Index].DevicePath, NULL); -- } -- if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) { -- EfiBootManagerUpdateConsoleVariable (ConOut, -- PlatformConsole[Index].DevicePath, NULL); -- } -- if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) { -- EfiBootManagerUpdateConsoleVariable (ErrOut, -- PlatformConsole[Index].DevicePath, NULL); -- } -+ if ((PlatformConsole[Index].ConnectType & CONSOLE_IN) == CONSOLE_IN) { -+ EfiBootManagerUpdateConsoleVariable (ConIn, -+ PlatformConsole[Index].DevicePath, NULL); -+ } -+ if ((PlatformConsole[Index].ConnectType & CONSOLE_OUT) == CONSOLE_OUT) { -+ EfiBootManagerUpdateConsoleVariable (ConOut, -+ PlatformConsole[Index].DevicePath, NULL); -+ } -+ if ((PlatformConsole[Index].ConnectType & STD_ERROR) == STD_ERROR) { -+ EfiBootManagerUpdateConsoleVariable (ErrOut, -+ PlatformConsole[Index].DevicePath, NULL); - } -- } else { -- // -- // Only detect VGA device and add them to ConOut -- // -- DetectAndPreparePlatformPciDevicePaths (TRUE); - } - } - --- -2.17.0 - diff --git a/0051-ArmVirtPkg-PlatformBootManagerLib-connect-Virtio-RNG.patch b/0051-ArmVirtPkg-PlatformBootManagerLib-connect-Virtio-RNG.patch deleted file mode 100644 index 4a8f98b..0000000 --- a/0051-ArmVirtPkg-PlatformBootManagerLib-connect-Virtio-RNG.patch +++ /dev/null @@ -1,199 +0,0 @@ -From c4add6b6e971e0bb3f276ed3636a083e782e96cc Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 17 May 2018 21:51:11 +0200 -Subject: [PATCH] ArmVirtPkg/PlatformBootManagerLib: connect Virtio RNG devices - again - -Virtio RNG devices are never boot devices, so in commit ff1d0fbfbaec we -stopped connecting them. This is a problem because an OS boot loader may -depend on EFI_RNG_PROTOCOL to seed the OS's RNG. - -Connect Virtio RNG devices again. And, while commit ff1d0fbfbaec removed -that from PlatformBootManagerAfterConsole(), reintroduce it now to -PlatformBootManagerBeforeConsole() -- this way Driver#### options launched -between both functions may access EFI_RNG_PROTOCOL too. - -Cc: Ard Biesheuvel -Fixes: ff1d0fbfbaec55038ccf888759588fa4e21516f4 -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1579518 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Ard Biesheuvel ---- - .../PlatformBootManagerLib.inf | 1 + - .../PlatformBootManagerLib/PlatformBm.c | 129 ++++++++++++++++++ - 2 files changed, 130 insertions(+) - -diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -index 1e22f8bb38..d6c1ef95dc 100644 ---- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -@@ -83,3 +83,4 @@ [Protocols] - gEfiLoadedImageProtocolGuid - gEfiPciRootBridgeIoProtocolGuid - gEfiSimpleFileSystemProtocolGuid -+ gVirtioDeviceProtocolGuid -diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c -index 5d5e51d8c8..62cce6a01e 100644 ---- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c -+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c -@@ -16,6 +16,7 @@ - **/ - - #include -+#include - #include - #include - #include -@@ -27,6 +28,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -260,6 +262,121 @@ IsPciDisplay ( - } - - -+/** -+ This FILTER_FUNCTION checks if a handle corresponds to a Virtio RNG device at -+ the VIRTIO_DEVICE_PROTOCOL level. -+**/ -+STATIC -+BOOLEAN -+EFIAPI -+IsVirtioRng ( -+ IN EFI_HANDLE Handle, -+ IN CONST CHAR16 *ReportText -+ ) -+{ -+ EFI_STATUS Status; -+ VIRTIO_DEVICE_PROTOCOL *VirtIo; -+ -+ Status = gBS->HandleProtocol (Handle, &gVirtioDeviceProtocolGuid, -+ (VOID**)&VirtIo); -+ if (EFI_ERROR (Status)) { -+ return FALSE; -+ } -+ return (BOOLEAN)(VirtIo->SubSystemDeviceId == -+ VIRTIO_SUBSYSTEM_ENTROPY_SOURCE); -+} -+ -+ -+/** -+ This FILTER_FUNCTION checks if a handle corresponds to a Virtio RNG device at -+ the EFI_PCI_IO_PROTOCOL level. -+**/ -+STATIC -+BOOLEAN -+EFIAPI -+IsVirtioPciRng ( -+ IN EFI_HANDLE Handle, -+ IN CONST CHAR16 *ReportText -+ ) -+{ -+ EFI_STATUS Status; -+ EFI_PCI_IO_PROTOCOL *PciIo; -+ UINT16 VendorId; -+ UINT16 DeviceId; -+ UINT8 RevisionId; -+ BOOLEAN Virtio10; -+ UINT16 SubsystemId; -+ -+ Status = gBS->HandleProtocol (Handle, &gEfiPciIoProtocolGuid, -+ (VOID**)&PciIo); -+ if (EFI_ERROR (Status)) { -+ return FALSE; -+ } -+ -+ // -+ // Read and check VendorId. -+ // -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_VENDOR_ID_OFFSET, -+ 1, &VendorId); -+ if (EFI_ERROR (Status)) { -+ goto PciError; -+ } -+ if (VendorId != VIRTIO_VENDOR_ID) { -+ return FALSE; -+ } -+ -+ // -+ // Read DeviceId and RevisionId. -+ // -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_DEVICE_ID_OFFSET, -+ 1, &DeviceId); -+ if (EFI_ERROR (Status)) { -+ goto PciError; -+ } -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, PCI_REVISION_ID_OFFSET, -+ 1, &RevisionId); -+ if (EFI_ERROR (Status)) { -+ goto PciError; -+ } -+ -+ // -+ // From DeviceId and RevisionId, determine whether the device is a -+ // modern-only Virtio 1.0 device. In case of Virtio 1.0, DeviceId can -+ // immediately be restricted to VIRTIO_SUBSYSTEM_ENTROPY_SOURCE, and -+ // SubsystemId will only play a sanity-check role. Otherwise, DeviceId can -+ // only be sanity-checked, and SubsystemId will decide. -+ // -+ if (DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE && -+ RevisionId >= 0x01) { -+ Virtio10 = TRUE; -+ } else if (DeviceId >= 0x1000 && DeviceId <= 0x103F && RevisionId == 0x00) { -+ Virtio10 = FALSE; -+ } else { -+ return FALSE; -+ } -+ -+ // -+ // Read and check SubsystemId as dictated by Virtio10. -+ // -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, -+ PCI_SUBSYSTEM_ID_OFFSET, 1, &SubsystemId); -+ if (EFI_ERROR (Status)) { -+ goto PciError; -+ } -+ if (Virtio10 && SubsystemId >= 0x40) { -+ return TRUE; -+ } -+ if (!Virtio10 && SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE) { -+ return TRUE; -+ } -+ return FALSE; -+ -+PciError: -+ DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status)); -+ return FALSE; -+} -+ -+ - /** - This CALLBACK_FUNCTION attempts to connect a handle non-recursively, asking - the matching driver to produce all first-level child handles. -@@ -644,6 +761,18 @@ PlatformBootManagerBeforeConsole ( - // Register platform-specific boot options and keyboard shortcuts. - // - PlatformRegisterOptionsAndKeys (); -+ -+ // -+ // At this point, VIRTIO_DEVICE_PROTOCOL instances exist only for Virtio MMIO -+ // transports. Install EFI_RNG_PROTOCOL instances on Virtio MMIO RNG devices. -+ // -+ FilterAndProcess (&gVirtioDeviceProtocolGuid, IsVirtioRng, Connect); -+ -+ // -+ // Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL -+ // instances on Virtio PCI RNG devices. -+ // -+ FilterAndProcess (&gEfiPciIoProtocolGuid, IsVirtioPciRng, Connect); - } - - /** --- -2.17.0 - diff --git a/0052-OvmfPkg-PlatformBootManagerLib-connect-Virtio-RNG-de.patch b/0052-OvmfPkg-PlatformBootManagerLib-connect-Virtio-RNG-de.patch deleted file mode 100644 index 66f3469..0000000 --- a/0052-OvmfPkg-PlatformBootManagerLib-connect-Virtio-RNG-de.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 7ebad830d6ab61f0395f6f4bae4156664bbd8086 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 17 May 2018 21:51:11 +0200 -Subject: [PATCH] OvmfPkg/PlatformBootManagerLib: connect Virtio RNG devices - again - -Virtio RNG devices are never boot devices, so in commit 245c643cc8b7 we -stopped connecting them. This is a problem because an OS boot loader may -depend on EFI_RNG_PROTOCOL to seed the OS's RNG. - -Connect Virtio RNG devices again. And, while commit 245c643cc8b7 removed -that from PlatformBootManagerAfterConsole(), reintroduce it now to -PlatformBootManagerBeforeConsole() -- this way Driver#### options launched -between both functions may access EFI_RNG_PROTOCOL too. - -Cc: Ard Biesheuvel -Cc: Jordan Justen -Fixes: 245c643cc8b73240c3b88cb55b2911b285a8c10d -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1579518 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Ard Biesheuvel ---- - .../PlatformBootManagerLib/BdsPlatform.h | 1 + - .../PlatformBootManagerLib/BdsPlatform.c | 105 ++++++++++++++++++ - 2 files changed, 106 insertions(+) - -diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h -index 97ffbb5148..4948ca6518 100644 ---- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h -+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h -@@ -30,6 +30,7 @@ Abstract: - #include - #include - #include -+#include - - #include - #include -diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c -index 004b753f4d..5d4d323d73 100644 ---- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c -+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c -@@ -318,6 +318,15 @@ ConnectRootBridge ( - IN VOID *Context - ); - -+STATIC -+EFI_STATUS -+EFIAPI -+ConnectVirtioPciRng ( -+ IN EFI_HANDLE Handle, -+ IN VOID *Instance, -+ IN VOID *Context -+ ); -+ - STATIC - VOID - SaveS3BootScript ( -@@ -399,6 +408,13 @@ PlatformBootManagerBeforeConsole ( - ASSERT_RETURN_ERROR (PcdStatus); - - PlatformRegisterOptionsAndKeys (); -+ -+ // -+ // Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL -+ // instances on Virtio PCI RNG devices. -+ // -+ VisitAllInstancesOfProtocol (&gEfiPciIoProtocolGuid, ConnectVirtioPciRng, -+ NULL); - } - - -@@ -427,6 +443,95 @@ ConnectRootBridge ( - } - - -+STATIC -+EFI_STATUS -+EFIAPI -+ConnectVirtioPciRng ( -+ IN EFI_HANDLE Handle, -+ IN VOID *Instance, -+ IN VOID *Context -+ ) -+{ -+ EFI_PCI_IO_PROTOCOL *PciIo; -+ EFI_STATUS Status; -+ UINT16 VendorId; -+ UINT16 DeviceId; -+ UINT8 RevisionId; -+ BOOLEAN Virtio10; -+ UINT16 SubsystemId; -+ -+ PciIo = Instance; -+ -+ // -+ // Read and check VendorId. -+ // -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_VENDOR_ID_OFFSET, -+ 1, &VendorId); -+ if (EFI_ERROR (Status)) { -+ goto Error; -+ } -+ if (VendorId != VIRTIO_VENDOR_ID) { -+ return EFI_SUCCESS; -+ } -+ -+ // -+ // Read DeviceId and RevisionId. -+ // -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_DEVICE_ID_OFFSET, -+ 1, &DeviceId); -+ if (EFI_ERROR (Status)) { -+ goto Error; -+ } -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint8, PCI_REVISION_ID_OFFSET, -+ 1, &RevisionId); -+ if (EFI_ERROR (Status)) { -+ goto Error; -+ } -+ -+ // -+ // From DeviceId and RevisionId, determine whether the device is a -+ // modern-only Virtio 1.0 device. In case of Virtio 1.0, DeviceId can -+ // immediately be restricted to VIRTIO_SUBSYSTEM_ENTROPY_SOURCE, and -+ // SubsystemId will only play a sanity-check role. Otherwise, DeviceId can -+ // only be sanity-checked, and SubsystemId will decide. -+ // -+ if (DeviceId == 0x1040 + VIRTIO_SUBSYSTEM_ENTROPY_SOURCE && -+ RevisionId >= 0x01) { -+ Virtio10 = TRUE; -+ } else if (DeviceId >= 0x1000 && DeviceId <= 0x103F && RevisionId == 0x00) { -+ Virtio10 = FALSE; -+ } else { -+ return EFI_SUCCESS; -+ } -+ -+ // -+ // Read and check SubsystemId as dictated by Virtio10. -+ // -+ Status = PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, -+ PCI_SUBSYSTEM_ID_OFFSET, 1, &SubsystemId); -+ if (EFI_ERROR (Status)) { -+ goto Error; -+ } -+ if ((Virtio10 && SubsystemId >= 0x40) || -+ (!Virtio10 && SubsystemId == VIRTIO_SUBSYSTEM_ENTROPY_SOURCE)) { -+ Status = gBS->ConnectController ( -+ Handle, // ControllerHandle -+ NULL, // DriverImageHandle -- connect all drivers -+ NULL, // RemainingDevicePath -- produce all child handles -+ FALSE // Recursive -- don't follow child handles -+ ); -+ if (EFI_ERROR (Status)) { -+ goto Error; -+ } -+ } -+ return EFI_SUCCESS; -+ -+Error: -+ DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, Status)); -+ return Status; -+} -+ -+ - /** - Add IsaKeyboard to ConIn; add IsaSerial to ConOut, ConIn, ErrOut. - --- -2.17.0 - diff --git a/0053-ArmVirtPkg-unify-HttpLib-resolutions-in-ArmVirt.dsc..patch b/0053-ArmVirtPkg-unify-HttpLib-resolutions-in-ArmVirt.dsc..patch deleted file mode 100644 index 24d6c6d..0000000 --- a/0053-ArmVirtPkg-unify-HttpLib-resolutions-in-ArmVirt.dsc..patch +++ /dev/null @@ -1,67 +0,0 @@ -From 77b702bfa4947caaa6b4b04730820d91bdf07b03 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Fri, 13 Jul 2018 01:41:11 +0200 -Subject: [PATCH 1/2] ArmVirtPkg: unify HttpLib resolutions in - "ArmVirt.dsc.inc" - -We already resolve a number of networking-related library classes in -ArmVirt.dsc.inc; follow suit with HttpLib. - -Cc: Julien Grall -Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1007 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Ard Biesheuvel ---- - ArmVirtPkg/ArmVirt.dsc.inc | 3 +++ - ArmVirtPkg/ArmVirtQemu.dsc | 4 ---- - ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ---- - 3 files changed, 3 insertions(+), 8 deletions(-) - -diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 7464ac70ed..76c400a5de 100644 ---- a/ArmVirtPkg/ArmVirt.dsc.inc -+++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -80,6 +80,9 @@ [LibraryClasses.common] - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf -+!if $(HTTP_BOOT_ENABLE) == TRUE -+ HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -+!endif - - # - # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions. -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 744d127a10..742df36285 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -64,10 +64,6 @@ [LibraryClasses.common] - PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf - PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf - --!if $(HTTP_BOOT_ENABLE) == TRUE -- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf --!endif -- - [LibraryClasses.common.PEIM] - ArmVirtMemInfoLib|ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLib.inf - -diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index e59f53b728..4ae61ec635 100644 ---- a/ArmVirtPkg/ArmVirtQemuKernel.dsc -+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -64,10 +64,6 @@ [LibraryClasses.common] - PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf - PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf - --!if $(HTTP_BOOT_ENABLE) == TRUE -- HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf --!endif -- - [LibraryClasses.common.UEFI_DRIVER] - UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - --- -2.17.1 - diff --git a/0054-ArmVirtPkg-ArmVirtQemu-enable-the-IPv6-stack.patch b/0054-ArmVirtPkg-ArmVirtQemu-enable-the-IPv6-stack.patch deleted file mode 100644 index 23d532b..0000000 --- a/0054-ArmVirtPkg-ArmVirtQemu-enable-the-IPv6-stack.patch +++ /dev/null @@ -1,188 +0,0 @@ -From ae08ea246fe9b4a4e05b7ee6cdbd5b0fa38f3f69 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Fri, 13 Jul 2018 01:41:12 +0200 -Subject: [PATCH 2/2] ArmVirtPkg/ArmVirtQemu: enable the IPv6 stack - -Add the IPv6 stack to ArmVirtQemu with a cumulative port of the following -OvmfPkg commits: - -* 36c6413f76e5 "OvmfPkg: enable the IPv6 support", 2014-12-19 - -* 96302b80d90e "OvmfPkg: Enable Network2 Shell Commands for IPv6", - 2016-03-08 - -* 6d0f8941bdc2 "OvmfPkg: always resolve OpenSslLib, IntrinsicLib and - BaseCryptLib", 2017-01-17 - -* 32e22f20c985 "OvmfPkg: correct the IScsiDxe module included for the IPv6 - stack", 2017-01-17 - -The IPv6-enabled IScsiDxe driver depends on BaseCryptLib, and the -"CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf" instance depends on -IntrinsicLib and OpensslLib. This is why commit 6d0f8941bdc2 is relevant. - -However, unlike in OvmfPkg, in ArmVirtPkg we'll precisely track the -firmware features that require these library classes. (The OvmfPkg -discussion was quite complex, and the OvmfPkg solution was a compromise: -.) - -The ArmVirtXen platform is not extended with the relevant drivers because -currently it doesn't include any networking support. - -Cc: Julien Grall -Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1007 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Ard Biesheuvel ---- - ArmVirtPkg/ArmVirt.dsc.inc | 18 +++++++++++++++--- - ArmVirtPkg/ArmVirtQemu.dsc | 13 ++++++++++++- - ArmVirtPkg/ArmVirtQemuKernel.dsc | 13 ++++++++++++- - ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 12 +++++++++++- - 4 files changed, 50 insertions(+), 6 deletions(-) - -diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 76c400a5de..8bb54c5e65 100644 ---- a/ArmVirtPkg/ArmVirt.dsc.inc -+++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -80,6 +80,9 @@ [LibraryClasses.common] - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf -+!if $(NETWORK_IP6_ENABLE) == TRUE -+ TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -+!endif - !if $(HTTP_BOOT_ENABLE) == TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf - !endif -@@ -144,14 +147,20 @@ [LibraryClasses.common] - XenIoMmioLib|OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.inf - - # -- # Secure Boot dependencies -+ # CryptoPkg libraries needed by multiple firmware features - # --!if $(SECURE_BOOT_ENABLE) == TRUE -+!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -+ BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -+!endif -+ -+ # -+ # Secure Boot dependencies -+ # -+!if $(SECURE_BOOT_ENABLE) == TRUE - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf -- BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf - - # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree - PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf -@@ -406,6 +415,9 @@ [Components.common] - NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf - NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf -+!if $(NETWORK_IP6_ENABLE) == TRUE -+ NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf -+!endif - HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 742df36285..885c6b14b8 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -34,6 +34,7 @@ [Defines] - # -D FLAG=VALUE - # - DEFINE SECURE_BOOT_ENABLE = FALSE -+ DEFINE NETWORK_IP6_ENABLE = FALSE - DEFINE HTTP_BOOT_ENABLE = FALSE - - !include ArmVirtPkg/ArmVirt.dsc.inc -@@ -344,10 +345,20 @@ [Components.common] - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf -- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf -+!if $(NETWORK_IP6_ENABLE) == TRUE -+ NetworkPkg/Ip6Dxe/Ip6Dxe.inf -+ NetworkPkg/TcpDxe/TcpDxe.inf -+ NetworkPkg/Udp6Dxe/Udp6Dxe.inf -+ NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf -+ NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf -+ NetworkPkg/IScsiDxe/IScsiDxe.inf -+!else -+ MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -+!endif - !if $(HTTP_BOOT_ENABLE) == TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf -diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 4ae61ec635..434d6861a5 100644 ---- a/ArmVirtPkg/ArmVirtQemuKernel.dsc -+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -34,6 +34,7 @@ [Defines] - # -D FLAG=VALUE - # - DEFINE SECURE_BOOT_ENABLE = FALSE -+ DEFINE NETWORK_IP6_ENABLE = FALSE - DEFINE HTTP_BOOT_ENABLE = FALSE - - !include ArmVirtPkg/ArmVirt.dsc.inc -@@ -333,10 +334,20 @@ [Components.common] - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf -- MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf -+!if $(NETWORK_IP6_ENABLE) == TRUE -+ NetworkPkg/Ip6Dxe/Ip6Dxe.inf -+ NetworkPkg/TcpDxe/TcpDxe.inf -+ NetworkPkg/Udp6Dxe/Udp6Dxe.inf -+ NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf -+ NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -+ NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf -+ NetworkPkg/IScsiDxe/IScsiDxe.inf -+!else -+ MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -+!endif - !if $(HTTP_BOOT_ENABLE) == TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf -diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 63a202c788..a6390bd4b8 100644 ---- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -125,10 +125,20 @@ [FV.FvMain] - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf -- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf -+!if $(NETWORK_IP6_ENABLE) == TRUE -+ INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf -+ INF NetworkPkg/TcpDxe/TcpDxe.inf -+ INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf -+ INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf -+ INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf -+ INF NetworkPkg/IScsiDxe/IScsiDxe.inf -+!else -+ INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -+!endif - !if $(HTTP_BOOT_ENABLE) == TRUE - INF NetworkPkg/DnsDxe/DnsDxe.inf - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf --- -2.17.1 - diff --git a/0055-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-mark-Flash-me.patch b/0055-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-mark-Flash-me.patch deleted file mode 100644 index f054242..0000000 --- a/0055-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-mark-Flash-me.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 966363d5a34839399e3d9f68d4f4efb4b1a9ec66 Mon Sep 17 00:00:00 2001 -From: Brijesh Singh -Date: Fri, 6 Jul 2018 10:00:40 -0500 -Subject: [PATCH] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: mark Flash memory - range as MMIO - -The flash memory range is an IO address and should be presented as Memory -Mapped IO in EFI Runtime mapping. This information can be used by OS -when mapping the flash memory range. - -It is especially helpful in SEV guest case, in which IO addresses should -be mapped as unencrypted. If memory region is not marked as MMIO then OS -maps the range as encrypted. - -Cc: Ard Biesheuvel -Cc: Anthony Perard -Cc: Julien Grall -Cc: Justen Jordan L -Cc: Laszlo Ersek -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Brijesh Singh -Reviewed-by: Laszlo Ersek -Regression-tested-by: Laszlo Ersek ---- - .../FwBlockService.c | 30 ++++++++++++++----- - 1 file changed, 22 insertions(+), 8 deletions(-) - -diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c -index 558b395dff..b3f428bb42 100644 ---- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c -+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c -@@ -831,12 +831,13 @@ ValidateFvHeader ( - - STATIC - EFI_STATUS --MarkMemoryRangeForRuntimeAccess ( -+MarkIoMemoryRangeForRuntimeAccess ( - EFI_PHYSICAL_ADDRESS BaseAddress, - UINTN Length - ) - { - EFI_STATUS Status; -+ EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; - - // - // Mark flash region as runtime memory -@@ -847,18 +848,31 @@ MarkMemoryRangeForRuntimeAccess ( - ); - - Status = gDS->AddMemorySpace ( -- EfiGcdMemoryTypeSystemMemory, -+ EfiGcdMemoryTypeMemoryMappedIo, - BaseAddress, - Length, - EFI_MEMORY_UC | EFI_MEMORY_RUNTIME - ); - ASSERT_EFI_ERROR (Status); - -- Status = gBS->AllocatePages ( -- AllocateAddress, -- EfiRuntimeServicesData, -- EFI_SIZE_TO_PAGES (Length), -- &BaseAddress -+ Status = gDS->AllocateMemorySpace ( -+ EfiGcdAllocateAddress, -+ EfiGcdMemoryTypeMemoryMappedIo, -+ 0, -+ Length, -+ &BaseAddress, -+ gImageHandle, -+ NULL -+ ); -+ ASSERT_EFI_ERROR (Status); -+ -+ Status = gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor); -+ ASSERT_EFI_ERROR (Status); -+ -+ Status = gDS->SetMemorySpaceAttributes ( -+ BaseAddress, -+ Length, -+ GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME - ); - ASSERT_EFI_ERROR (Status); - -@@ -1091,7 +1105,7 @@ FvbInitialize ( - // - InstallProtocolInterfaces (FvbDevice); - -- MarkMemoryRangeForRuntimeAccess (BaseAddress, Length); -+ MarkIoMemoryRangeForRuntimeAccess (BaseAddress, Length); - - // - // Set several PCD values to point to flash --- -2.17.1 - diff --git a/0056-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Do-not-expose.patch b/0056-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Do-not-expose.patch deleted file mode 100644 index 3acfb6b..0000000 --- a/0056-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Do-not-expose.patch +++ /dev/null @@ -1,191 +0,0 @@ -From 3b3d016b7b867d7e4782af9a6b54e110d155a1b3 Mon Sep 17 00:00:00 2001 -From: Brijesh Singh -Date: Fri, 6 Jul 2018 10:00:41 -0500 -Subject: [PATCH] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Do not expose - MMIO in SMM build - -In the SMM build, only an SMM driver is using the address range hence we -do not need to expose the flash MMIO range in EFI runtime mapping. - -Cc: Ard Biesheuvel -Cc: Anthony Perard -Cc: Julien Grall -Cc: Justen Jordan L -Cc: Laszlo Ersek -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Brijesh Singh -Reviewed-by: Laszlo Ersek -Regression-tested-by: Laszlo Ersek ---- - .../FwBlockService.h | 7 +++ - .../FwBlockService.c | 50 ------------------- - .../FwBlockServiceDxe.c | 50 +++++++++++++++++++ - .../FwBlockServiceSmm.c | 13 +++++ - 4 files changed, 70 insertions(+), 50 deletions(-) - -diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h -index 1f9287b087..178f578d49 100644 ---- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h -+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.h -@@ -189,4 +189,11 @@ VOID - InstallVirtualAddressChangeHandler ( - VOID - ); -+ -+EFI_STATUS -+MarkIoMemoryRangeForRuntimeAccess ( -+ IN EFI_PHYSICAL_ADDRESS BaseAddress, -+ IN UINTN Length -+ ); -+ - #endif -diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c -index b3f428bb42..eec8b1b1ae 100644 ---- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c -+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c -@@ -829,56 +829,6 @@ ValidateFvHeader ( - return EFI_SUCCESS; - } - --STATIC --EFI_STATUS --MarkIoMemoryRangeForRuntimeAccess ( -- EFI_PHYSICAL_ADDRESS BaseAddress, -- UINTN Length -- ) --{ -- EFI_STATUS Status; -- EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; -- -- // -- // Mark flash region as runtime memory -- // -- Status = gDS->RemoveMemorySpace ( -- BaseAddress, -- Length -- ); -- -- Status = gDS->AddMemorySpace ( -- EfiGcdMemoryTypeMemoryMappedIo, -- BaseAddress, -- Length, -- EFI_MEMORY_UC | EFI_MEMORY_RUNTIME -- ); -- ASSERT_EFI_ERROR (Status); -- -- Status = gDS->AllocateMemorySpace ( -- EfiGcdAllocateAddress, -- EfiGcdMemoryTypeMemoryMappedIo, -- 0, -- Length, -- &BaseAddress, -- gImageHandle, -- NULL -- ); -- ASSERT_EFI_ERROR (Status); -- -- Status = gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor); -- ASSERT_EFI_ERROR (Status); -- -- Status = gDS->SetMemorySpaceAttributes ( -- BaseAddress, -- Length, -- GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME -- ); -- ASSERT_EFI_ERROR (Status); -- -- return Status; --} -- - STATIC - EFI_STATUS - InitializeVariableFvHeader ( -diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c -index 63b308658e..37deece363 100644 ---- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c -+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -155,3 +156,52 @@ InstallVirtualAddressChangeHandler ( - ); - ASSERT_EFI_ERROR (Status); - } -+ -+EFI_STATUS -+MarkIoMemoryRangeForRuntimeAccess ( -+ IN EFI_PHYSICAL_ADDRESS BaseAddress, -+ IN UINTN Length -+ ) -+{ -+ EFI_STATUS Status; -+ EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor; -+ -+ // -+ // Mark flash region as runtime memory -+ // -+ Status = gDS->RemoveMemorySpace ( -+ BaseAddress, -+ Length -+ ); -+ -+ Status = gDS->AddMemorySpace ( -+ EfiGcdMemoryTypeMemoryMappedIo, -+ BaseAddress, -+ Length, -+ EFI_MEMORY_UC | EFI_MEMORY_RUNTIME -+ ); -+ ASSERT_EFI_ERROR (Status); -+ -+ Status = gDS->AllocateMemorySpace ( -+ EfiGcdAllocateAddress, -+ EfiGcdMemoryTypeMemoryMappedIo, -+ 0, -+ Length, -+ &BaseAddress, -+ gImageHandle, -+ NULL -+ ); -+ ASSERT_EFI_ERROR (Status); -+ -+ Status = gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor); -+ ASSERT_EFI_ERROR (Status); -+ -+ Status = gDS->SetMemorySpaceAttributes ( -+ BaseAddress, -+ Length, -+ GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME -+ ); -+ ASSERT_EFI_ERROR (Status); -+ -+ return Status; -+} -diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c -index e0617f2503..af08fa69d4 100644 ---- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c -+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c -@@ -67,3 +67,16 @@ InstallVirtualAddressChangeHandler ( - // Nothing. - // - } -+ -+EFI_STATUS -+MarkIoMemoryRangeForRuntimeAccess ( -+ IN EFI_PHYSICAL_ADDRESS BaseAddress, -+ IN UINTN Length -+ ) -+{ -+ // -+ // Nothing -+ // -+ -+ return EFI_SUCCESS; -+} --- -2.17.1 - diff --git a/0057-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Restore-C-bit.patch b/0057-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Restore-C-bit.patch deleted file mode 100644 index 62c05d8..0000000 --- a/0057-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Restore-C-bit.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 75b7aa9528bdd05a7ecf4e64a6beb478d31b402c Mon Sep 17 00:00:00 2001 -From: Brijesh Singh -Date: Fri, 6 Jul 2018 10:00:42 -0500 -Subject: [PATCH] OvmfPkg/QemuFlashFvbServicesRuntimeDxe: Restore C-bit - when SEV is active - -AmdSevDxe maps the flash memory range with C=0, but -SetMemorySpaceAttributes() unconditionally resets the C-bit to '1'. Lets -restore the mapping back to C=0. - -Cc: Ard Biesheuvel -Cc: Anthony Perard -Cc: Julien Grall -Cc: Justen Jordan L -Cc: Laszlo Ersek -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Brijesh Singh -Reviewed-by: Laszlo Ersek -Regression-tested-by: Laszlo Ersek ---- - .../FvbServicesRuntimeDxe.inf | 1 + - .../FwBlockServiceDxe.c | 17 +++++++++++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf -index d7b4ec06c4..86b244a009 100644 ---- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf -+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf -@@ -53,6 +53,7 @@ [LibraryClasses] - DebugLib - DevicePathLib - DxeServicesTableLib -+ MemEncryptSevLib - MemoryAllocationLib - PcdLib - UefiBootServicesTableLib -diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c -index 37deece363..1fbe1342a5 100644 ---- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c -+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -203,5 +204,21 @@ MarkIoMemoryRangeForRuntimeAccess ( - ); - ASSERT_EFI_ERROR (Status); - -+ // -+ // When SEV is active, AmdSevDxe mapped the BaseAddress with C=0 but -+ // SetMemorySpaceAttributes() remaps the range with C=1. Let's restore -+ // the mapping so that both guest and hyervisor can access the flash -+ // memory range. -+ // -+ if (MemEncryptSevIsEnabled ()) { -+ Status = MemEncryptSevClearPageEncMask ( -+ 0, -+ BaseAddress, -+ EFI_SIZE_TO_PAGES (Length), -+ FALSE -+ ); -+ ASSERT_EFI_ERROR (Status); -+ } -+ - return Status; - } --- -2.17.1 - diff --git a/0058-MdeModulePkg-Variable-Check-EFI_MEMORY_RUNTIME-attri.patch b/0058-MdeModulePkg-Variable-Check-EFI_MEMORY_RUNTIME-attri.patch deleted file mode 100644 index cfdff0a..0000000 --- a/0058-MdeModulePkg-Variable-Check-EFI_MEMORY_RUNTIME-attri.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f88290964fe528ffeb67ff108e8174fc2ce52741 Mon Sep 17 00:00:00 2001 -From: Brijesh Singh -Date: Wed, 4 Jul 2018 10:02:16 +0800 -Subject: [PATCH] MdeModulePkg/Variable: Check EFI_MEMORY_RUNTIME attribute - before setting it - -Set the EFI_MEMORY_RUNTIME attribute in FtwNotificationEvent() only if -the attribute is not already present. This will ensure that the attributes -set by the platform drivers (e.g Ovmf pflash) is not lost. - -Cc: Dong Eric -Cc: Justen Jordan L -Cc: Zeng Star -Cc: Laszlo Ersek -Contributed-under: TianoCore Contribution Agreement 1.1 -Reviewed-by: Star Zeng -Signed-off-by: Brijesh Singh ---- - .../Universal/Variable/RuntimeDxe/VariableDxe.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c -index 6b04f4f7b3..23186176be 100644 ---- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c -+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c -@@ -412,13 +412,15 @@ FtwNotificationEvent ( - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_WARN, "Variable driver failed to get flash memory attribute.\n")); - } else { -- Status = gDS->SetMemorySpaceAttributes ( -- BaseAddress, -- Length, -- GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME -- ); -- if (EFI_ERROR (Status)) { -- DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n")); -+ if ((GcdDescriptor.Attributes & EFI_MEMORY_RUNTIME) == 0) { -+ Status = gDS->SetMemorySpaceAttributes ( -+ BaseAddress, -+ Length, -+ GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME -+ ); -+ if (EFI_ERROR (Status)) { -+ DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n")); -+ } - } - } - --- -2.17.1 - diff --git a/0099-Tweak-the-tools_def-to-support-cross-compiling.patch b/0099-Tweak-the-tools_def-to-support-cross-compiling.patch index 043b61f..899c86e 100644 --- a/0099-Tweak-the-tools_def-to-support-cross-compiling.patch +++ b/0099-Tweak-the-tools_def-to-support-cross-compiling.patch @@ -1,489 +1,24 @@ -From 3a25bb77d692c015c3c3135a4d4c39748f195de7 Mon Sep 17 00:00:00 2001 +From 50f80eff5c33c1dd2cac2729581d43798cd8357c Mon Sep 17 00:00:00 2001 +Message-Id: <50f80eff5c33c1dd2cac2729581d43798cd8357c.1534970217.git.crobinso@redhat.com> +In-Reply-To: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> +References: <37942481c89eca732239c23fe606680e6e3faf77.1534970217.git.crobinso@redhat.com> From: Paolo Bonzini -Date: Sun, 6 Nov 2016 13:50:31 -0500 -Subject: [PATCH] Tweak the tools_def to support cross-compiling. +Date: Thu, 16 Aug 2018 15:45:47 -0400 +Subject: [PATCH 17/17] Tweak the tools_def to support cross-compiling. These files are meant for customization, so this is not upstream. -Message-Id: <63b708ccad8afd0b887258888a53fd4945cff682.1478467625.git.crobinso@redhat.com> Signed-off-by: Paolo Bonzini +Signed-off-by: Cole Robinson --- - BaseTools/Conf/tools_def.template | 343 ++++++++++++++---------------- - 1 file changed, 161 insertions(+), 182 deletions(-) + BaseTools/Conf/tools_def.template | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index 03d7000..b5dceb7 100755 +index a22b96c0b8..57ac7cd4eb 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -189,27 +189,6 @@ DEFINE CYGWIN_BINIA32 = c:/cygwin/opt/tiano/i386-tiano-pe/i386-tiano-pe - DEFINE CYGWIN_BINX64 = c:/cygwin/opt/tiano/x86_64-pc-mingw64/x86_64-pc-mingw64/bin/ - DEFINE CYGWIN_BINIPF = c:/cygwin/opt/tiano/gcc/ipf/bin/ia64-pc-elf- - --DEFINE GCC44_IA32_PREFIX = ENV(GCC44_BIN) --DEFINE GCC44_X64_PREFIX = ENV(GCC44_BIN) -- --DEFINE GCC45_IA32_PREFIX = ENV(GCC45_BIN) --DEFINE GCC45_X64_PREFIX = ENV(GCC45_BIN) -- --DEFINE GCC46_IA32_PREFIX = ENV(GCC46_BIN) --DEFINE GCC46_X64_PREFIX = ENV(GCC46_BIN) -- --DEFINE GCC47_IA32_PREFIX = ENV(GCC47_BIN) --DEFINE GCC47_X64_PREFIX = ENV(GCC47_BIN) -- --DEFINE GCC48_IA32_PREFIX = ENV(GCC48_BIN) --DEFINE GCC48_X64_PREFIX = ENV(GCC48_BIN) -- --DEFINE GCC49_IA32_PREFIX = ENV(GCC49_BIN) --DEFINE GCC49_X64_PREFIX = ENV(GCC49_BIN) -- --DEFINE GCC5_IA32_PREFIX = ENV(GCC5_BIN) --DEFINE GCC5_X64_PREFIX = ENV(GCC5_BIN) -- - DEFINE UNIX_IASL_BIN = ENV(IASL_PREFIX)iasl - DEFINE WIN_IASL_BIN = ENV(IASL_PREFIX)iasl.exe - DEFINE WIN_ASL_BIN = ENV(IASL_PREFIX)asl.exe -@@ -4788,7 +4767,7 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) - #################################################################################### - *_GCC44_*_*_FAMILY = GCC - --*_GCC44_*_MAKE_PATH = DEF(GCC44_IA32_PREFIX)make -+*_GCC44_*_MAKE_PATH = make - *_GCC44_*_*_DLL = ENV(GCC44_DLL) - *_GCC44_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -@@ -4803,17 +4782,17 @@ DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC49_AARCH64_ASLDLINK_FLAGS) - ################## - # GCC44 IA32 definitions - ################## --*_GCC44_IA32_OBJCOPY_PATH = DEF(GCC44_IA32_PREFIX)objcopy --*_GCC44_IA32_CC_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_SLINK_PATH = DEF(GCC44_IA32_PREFIX)ar --*_GCC44_IA32_DLINK_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_ASLDLINK_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_ASM_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_PP_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_VFRPP_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_ASLCC_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_ASLPP_PATH = DEF(GCC44_IA32_PREFIX)gcc --*_GCC44_IA32_RC_PATH = DEF(GCC44_IA32_PREFIX)objcopy -+*_GCC44_IA32_OBJCOPY_PATH = ENV(GCC44_IA32_PREFIX)objcopy -+*_GCC44_IA32_CC_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_SLINK_PATH = ENV(GCC44_IA32_PREFIX)ar -+*_GCC44_IA32_DLINK_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_ASLDLINK_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_ASM_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_PP_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_VFRPP_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_ASLCC_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_ASLPP_PATH = ENV(GCC44_IA32_PREFIX)gcc -+*_GCC44_IA32_RC_PATH = ENV(GCC44_IA32_PREFIX)objcopy - - *_GCC44_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC44_IA32_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -@@ -4831,17 +4810,17 @@ RELEASE_GCC44_IA32_CC_FLAGS = DEF(GCC44_IA32_CC_FLAGS) -Os - ################## - # GCC44 X64 definitions - ################## --*_GCC44_X64_OBJCOPY_PATH = DEF(GCC44_X64_PREFIX)objcopy --*_GCC44_X64_CC_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_SLINK_PATH = DEF(GCC44_X64_PREFIX)ar --*_GCC44_X64_DLINK_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_ASLDLINK_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_ASM_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_PP_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_VFRPP_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_ASLCC_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_ASLPP_PATH = DEF(GCC44_X64_PREFIX)gcc --*_GCC44_X64_RC_PATH = DEF(GCC44_X64_PREFIX)objcopy -+*_GCC44_X64_OBJCOPY_PATH = ENV(GCC44_X64_PREFIX)objcopy -+*_GCC44_X64_CC_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_SLINK_PATH = ENV(GCC44_X64_PREFIX)ar -+*_GCC44_X64_DLINK_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_ASLDLINK_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_ASM_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_PP_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_VFRPP_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_ASLCC_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_ASLPP_PATH = ENV(GCC44_X64_PREFIX)gcc -+*_GCC44_X64_RC_PATH = ENV(GCC44_X64_PREFIX)objcopy - - *_GCC44_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC44_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -@@ -4864,7 +4843,7 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os - #################################################################################### - *_GCC45_*_*_FAMILY = GCC - --*_GCC45_*_MAKE_PATH = DEF(GCC45_IA32_PREFIX)make -+*_GCC45_*_MAKE_PATH = make - *_GCC45_*_*_DLL = ENV(GCC45_DLL) - *_GCC45_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -@@ -4879,17 +4858,17 @@ RELEASE_GCC44_X64_CC_FLAGS = DEF(GCC44_X64_CC_FLAGS) -Os - ################## - # GCC45 IA32 definitions - ################## --*_GCC45_IA32_OBJCOPY_PATH = DEF(GCC45_IA32_PREFIX)objcopy --*_GCC45_IA32_CC_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_SLINK_PATH = DEF(GCC45_IA32_PREFIX)ar --*_GCC45_IA32_DLINK_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_ASLDLINK_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_ASM_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_PP_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_VFRPP_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_ASLCC_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_ASLPP_PATH = DEF(GCC45_IA32_PREFIX)gcc --*_GCC45_IA32_RC_PATH = DEF(GCC45_IA32_PREFIX)objcopy -+*_GCC45_IA32_OBJCOPY_PATH = ENV(GCC45_IA32_PREFIX)objcopy -+*_GCC45_IA32_CC_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_SLINK_PATH = ENV(GCC45_IA32_PREFIX)ar -+*_GCC45_IA32_DLINK_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_ASLDLINK_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_ASM_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_PP_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_VFRPP_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_ASLCC_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_ASLPP_PATH = ENV(GCC45_IA32_PREFIX)gcc -+*_GCC45_IA32_RC_PATH = ENV(GCC45_IA32_PREFIX)objcopy - - *_GCC45_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC45_IA32_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -@@ -4907,17 +4886,17 @@ RELEASE_GCC45_IA32_CC_FLAGS = DEF(GCC45_IA32_CC_FLAGS) -Os - ################## - # GCC45 X64 definitions - ################## --*_GCC45_X64_OBJCOPY_PATH = DEF(GCC45_X64_PREFIX)objcopy --*_GCC45_X64_CC_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_SLINK_PATH = DEF(GCC45_X64_PREFIX)ar --*_GCC45_X64_DLINK_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_ASLDLINK_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_ASM_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_PP_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_VFRPP_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_ASLCC_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_ASLPP_PATH = DEF(GCC45_X64_PREFIX)gcc --*_GCC45_X64_RC_PATH = DEF(GCC45_X64_PREFIX)objcopy -+*_GCC45_X64_OBJCOPY_PATH = ENV(GCC45_X64_PREFIX)objcopy -+*_GCC45_X64_CC_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_SLINK_PATH = ENV(GCC45_X64_PREFIX)ar -+*_GCC45_X64_DLINK_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_ASLDLINK_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_ASM_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_PP_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_VFRPP_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_ASLCC_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_ASLPP_PATH = ENV(GCC45_X64_PREFIX)gcc -+*_GCC45_X64_RC_PATH = ENV(GCC45_X64_PREFIX)objcopy - - *_GCC45_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC45_X64_ASLDLINK_FLAGS = DEF(GCC45_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -@@ -4940,7 +4919,7 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os - #################################################################################### - *_GCC46_*_*_FAMILY = GCC - --*_GCC46_*_MAKE_PATH = DEF(GCC46_IA32_PREFIX)make -+*_GCC46_*_MAKE_PATH = make - *_GCC46_*_*_DLL = ENV(GCC46_DLL) - *_GCC46_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -@@ -4955,17 +4934,17 @@ RELEASE_GCC45_X64_CC_FLAGS = DEF(GCC45_X64_CC_FLAGS) -Os - ################## - # GCC46 IA32 definitions - ################## --*_GCC46_IA32_OBJCOPY_PATH = DEF(GCC46_IA32_PREFIX)objcopy --*_GCC46_IA32_CC_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_SLINK_PATH = DEF(GCC46_IA32_PREFIX)ar --*_GCC46_IA32_DLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_ASLDLINK_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_ASM_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_PP_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_VFRPP_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_ASLCC_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_ASLPP_PATH = DEF(GCC46_IA32_PREFIX)gcc --*_GCC46_IA32_RC_PATH = DEF(GCC46_IA32_PREFIX)objcopy -+*_GCC46_IA32_OBJCOPY_PATH = ENV(GCC46_IA32_PREFIX)objcopy -+*_GCC46_IA32_CC_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_SLINK_PATH = ENV(GCC46_IA32_PREFIX)ar -+*_GCC46_IA32_DLINK_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_ASLDLINK_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_ASM_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_PP_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_VFRPP_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_ASLCC_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_ASLPP_PATH = ENV(GCC46_IA32_PREFIX)gcc -+*_GCC46_IA32_RC_PATH = ENV(GCC46_IA32_PREFIX)objcopy - - *_GCC46_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC46_IA32_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -@@ -4983,17 +4962,17 @@ RELEASE_GCC46_IA32_CC_FLAGS = DEF(GCC46_IA32_CC_FLAGS) -Os -Wno-unused-but - ################## - # GCC46 X64 definitions - ################## --*_GCC46_X64_OBJCOPY_PATH = DEF(GCC46_X64_PREFIX)objcopy --*_GCC46_X64_CC_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_SLINK_PATH = DEF(GCC46_X64_PREFIX)ar --*_GCC46_X64_DLINK_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_ASLDLINK_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_ASM_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_PP_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_VFRPP_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_ASLCC_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_ASLPP_PATH = DEF(GCC46_X64_PREFIX)gcc --*_GCC46_X64_RC_PATH = DEF(GCC46_X64_PREFIX)objcopy -+*_GCC46_X64_OBJCOPY_PATH = ENV(GCC46_X64_PREFIX)objcopy -+*_GCC46_X64_CC_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_SLINK_PATH = ENV(GCC46_X64_PREFIX)ar -+*_GCC46_X64_DLINK_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_ASLDLINK_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_ASM_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_PP_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_VFRPP_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_ASLCC_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_ASLPP_PATH = ENV(GCC46_X64_PREFIX)gcc -+*_GCC46_X64_RC_PATH = ENV(GCC46_X64_PREFIX)objcopy - - *_GCC46_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC46_X64_ASLDLINK_FLAGS = DEF(GCC46_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -@@ -5050,7 +5029,7 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v - #################################################################################### - *_GCC47_*_*_FAMILY = GCC - --*_GCC47_*_MAKE_PATH = DEF(GCC47_IA32_PREFIX)make -+*_GCC47_*_MAKE_PATH = make - *_GCC47_*_*_DLL = ENV(GCC47_DLL) - *_GCC47_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -@@ -5065,17 +5044,17 @@ RELEASE_GCC46_ARM_CC_FLAGS = DEF(GCC46_ARM_CC_FLAGS) -Wno-unused-but-set-v - ################## - # GCC47 IA32 definitions - ################## --*_GCC47_IA32_OBJCOPY_PATH = DEF(GCC47_IA32_PREFIX)objcopy --*_GCC47_IA32_CC_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_SLINK_PATH = DEF(GCC47_IA32_PREFIX)ar --*_GCC47_IA32_DLINK_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_ASLDLINK_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_ASM_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_PP_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_VFRPP_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_ASLCC_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_ASLPP_PATH = DEF(GCC47_IA32_PREFIX)gcc --*_GCC47_IA32_RC_PATH = DEF(GCC47_IA32_PREFIX)objcopy -+*_GCC47_IA32_OBJCOPY_PATH = ENV(GCC47_IA32_PREFIX)objcopy -+*_GCC47_IA32_CC_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_SLINK_PATH = ENV(GCC47_IA32_PREFIX)ar -+*_GCC47_IA32_DLINK_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_ASLDLINK_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_ASM_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_PP_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_VFRPP_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_ASLCC_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_ASLPP_PATH = ENV(GCC47_IA32_PREFIX)gcc -+*_GCC47_IA32_RC_PATH = ENV(GCC47_IA32_PREFIX)objcopy - - *_GCC47_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC47_IA32_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -@@ -5093,17 +5072,17 @@ RELEASE_GCC47_IA32_CC_FLAGS = DEF(GCC47_IA32_CC_FLAGS) -Os -Wno-unused-but - ################## - # GCC47 X64 definitions - ################## --*_GCC47_X64_OBJCOPY_PATH = DEF(GCC47_X64_PREFIX)objcopy --*_GCC47_X64_CC_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_SLINK_PATH = DEF(GCC47_X64_PREFIX)ar --*_GCC47_X64_DLINK_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_ASLDLINK_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_ASM_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_PP_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_VFRPP_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_ASLCC_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_ASLPP_PATH = DEF(GCC47_X64_PREFIX)gcc --*_GCC47_X64_RC_PATH = DEF(GCC47_X64_PREFIX)objcopy -+*_GCC47_X64_OBJCOPY_PATH = ENV(GCC47_X64_PREFIX)objcopy -+*_GCC47_X64_CC_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_SLINK_PATH = ENV(GCC47_X64_PREFIX)ar -+*_GCC47_X64_DLINK_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_ASLDLINK_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_ASM_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_PP_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_VFRPP_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_ASLCC_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_ASLPP_PATH = ENV(GCC47_X64_PREFIX)gcc -+*_GCC47_X64_RC_PATH = ENV(GCC47_X64_PREFIX)objcopy - - *_GCC47_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC47_X64_ASLDLINK_FLAGS = DEF(GCC47_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -@@ -5189,7 +5168,7 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s - #################################################################################### - *_GCC48_*_*_FAMILY = GCC - --*_GCC48_*_MAKE_PATH = DEF(GCC48_IA32_PREFIX)make -+*_GCC48_*_MAKE_PATH = make - *_GCC48_*_*_DLL = ENV(GCC48_DLL) - *_GCC48_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -@@ -5204,17 +5183,17 @@ RELEASE_GCC47_AARCH64_CC_FLAGS = DEF(GCC47_AARCH64_CC_FLAGS) -Wno-unused-but-s - ################## - # GCC48 IA32 definitions - ################## --*_GCC48_IA32_OBJCOPY_PATH = DEF(GCC48_IA32_PREFIX)objcopy --*_GCC48_IA32_CC_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_SLINK_PATH = DEF(GCC48_IA32_PREFIX)ar --*_GCC48_IA32_DLINK_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_ASLDLINK_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_ASM_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_PP_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_VFRPP_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_ASLCC_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_ASLPP_PATH = DEF(GCC48_IA32_PREFIX)gcc --*_GCC48_IA32_RC_PATH = DEF(GCC48_IA32_PREFIX)objcopy -+*_GCC48_IA32_OBJCOPY_PATH = ENV(GCC48_IA32_PREFIX)objcopy -+*_GCC48_IA32_CC_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_SLINK_PATH = ENV(GCC48_IA32_PREFIX)ar -+*_GCC48_IA32_DLINK_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_ASLDLINK_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_ASM_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_PP_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_VFRPP_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_ASLCC_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_ASLPP_PATH = ENV(GCC48_IA32_PREFIX)gcc -+*_GCC48_IA32_RC_PATH = ENV(GCC48_IA32_PREFIX)objcopy - - *_GCC48_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC48_IA32_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -@@ -5232,17 +5211,17 @@ RELEASE_GCC48_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) -Os -Wno-unused-but - ################## - # GCC48 X64 definitions - ################## --*_GCC48_X64_OBJCOPY_PATH = DEF(GCC48_X64_PREFIX)objcopy --*_GCC48_X64_CC_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_SLINK_PATH = DEF(GCC48_X64_PREFIX)ar --*_GCC48_X64_DLINK_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_ASLDLINK_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_ASM_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_PP_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_VFRPP_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_ASLCC_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_ASLPP_PATH = DEF(GCC48_X64_PREFIX)gcc --*_GCC48_X64_RC_PATH = DEF(GCC48_X64_PREFIX)objcopy -+*_GCC48_X64_OBJCOPY_PATH = ENV(GCC48_X64_PREFIX)objcopy -+*_GCC48_X64_CC_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_SLINK_PATH = ENV(GCC48_X64_PREFIX)ar -+*_GCC48_X64_DLINK_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_ASLDLINK_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_ASM_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_PP_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_VFRPP_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_ASLCC_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_ASLPP_PATH = ENV(GCC48_X64_PREFIX)gcc -+*_GCC48_X64_RC_PATH = ENV(GCC48_X64_PREFIX)objcopy - - *_GCC48_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC48_X64_ASLDLINK_FLAGS = DEF(GCC48_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -@@ -5328,7 +5307,7 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s - #################################################################################### - *_GCC49_*_*_FAMILY = GCC - --*_GCC49_*_MAKE_PATH = DEF(GCC49_IA32_PREFIX)make -+*_GCC49_*_MAKE_PATH = make - *_GCC49_*_*_DLL = ENV(GCC49_DLL) - *_GCC49_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -@@ -5343,17 +5322,17 @@ RELEASE_GCC48_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) -Wno-unused-but-s - ################## - # GCC49 IA32 definitions - ################## --*_GCC49_IA32_OBJCOPY_PATH = DEF(GCC49_IA32_PREFIX)objcopy --*_GCC49_IA32_CC_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_SLINK_PATH = DEF(GCC49_IA32_PREFIX)ar --*_GCC49_IA32_DLINK_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_ASLDLINK_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_ASM_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_PP_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_VFRPP_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_ASLCC_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_ASLPP_PATH = DEF(GCC49_IA32_PREFIX)gcc --*_GCC49_IA32_RC_PATH = DEF(GCC49_IA32_PREFIX)objcopy -+*_GCC49_IA32_OBJCOPY_PATH = ENV(GCC49_IA32_PREFIX)objcopy -+*_GCC49_IA32_CC_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_SLINK_PATH = ENV(GCC49_IA32_PREFIX)ar -+*_GCC49_IA32_DLINK_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_ASLDLINK_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_ASM_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_PP_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_VFRPP_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_ASLCC_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_ASLPP_PATH = ENV(GCC49_IA32_PREFIX)gcc -+*_GCC49_IA32_RC_PATH = ENV(GCC49_IA32_PREFIX)objcopy - - *_GCC49_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 - *_GCC49_IA32_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -@@ -5371,17 +5350,17 @@ RELEASE_GCC49_IA32_CC_FLAGS = DEF(GCC49_IA32_CC_FLAGS) -Os -Wno-unused-but - ################## - # GCC49 X64 definitions - ################## --*_GCC49_X64_OBJCOPY_PATH = DEF(GCC49_X64_PREFIX)objcopy --*_GCC49_X64_CC_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_SLINK_PATH = DEF(GCC49_X64_PREFIX)ar --*_GCC49_X64_DLINK_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_ASLDLINK_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_ASM_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_PP_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_VFRPP_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_ASLCC_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_ASLPP_PATH = DEF(GCC49_X64_PREFIX)gcc --*_GCC49_X64_RC_PATH = DEF(GCC49_X64_PREFIX)objcopy -+*_GCC49_X64_OBJCOPY_PATH = ENV(GCC49_X64_PREFIX)objcopy -+*_GCC49_X64_CC_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_SLINK_PATH = ENV(GCC49_X64_PREFIX)ar -+*_GCC49_X64_DLINK_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_ASLDLINK_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_ASM_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_PP_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_VFRPP_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_ASLCC_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_ASLPP_PATH = ENV(GCC49_X64_PREFIX)gcc -+*_GCC49_X64_RC_PATH = ENV(GCC49_X64_PREFIX)objcopy - - *_GCC49_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 - *_GCC49_X64_ASLDLINK_FLAGS = DEF(GCC49_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -@@ -5473,7 +5452,7 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) - #################################################################################### - *_GCC5_*_*_FAMILY = GCC - --*_GCC5_*_MAKE_PATH = DEF(GCC5_IA32_PREFIX)make -+*_GCC5_*_MAKE_PATH = make - *_GCC5_*_*_DLL = ENV(GCC5_DLL) - *_GCC5_*_ASL_PATH = DEF(UNIX_IASL_BIN) - -@@ -5488,17 +5467,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) - ################## - # GCC5 IA32 definitions - ################## --*_GCC5_IA32_OBJCOPY_PATH = DEF(GCC5_IA32_PREFIX)objcopy --*_GCC5_IA32_CC_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_SLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc-ar --*_GCC5_IA32_DLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_ASLDLINK_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_ASM_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_PP_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_VFRPP_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_ASLCC_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_ASLPP_PATH = DEF(GCC5_IA32_PREFIX)gcc --*_GCC5_IA32_RC_PATH = DEF(GCC5_IA32_PREFIX)objcopy -+*_GCC5_IA32_OBJCOPY_PATH = ENV(GCC5_IA32_PREFIX)objcopy -+*_GCC5_IA32_CC_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_SLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc-ar -+*_GCC5_IA32_DLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_ASLDLINK_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_ASM_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_PP_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_VFRPP_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_ASLCC_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_ASLPP_PATH = ENV(GCC5_IA32_PREFIX)gcc -+*_GCC5_IA32_RC_PATH = ENV(GCC5_IA32_PREFIX)objcopy - - *_GCC5_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto - *_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386 -@@ -5520,17 +5499,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -5100,17 +5100,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, ################## # GCC5 X64 definitions ################## @@ -513,5 +48,5 @@ index 03d7000..b5dceb7 100755 *_GCC5_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto *_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 -- -2.17.0 +2.17.1 diff --git a/edk2.spec b/edk2.spec index 0d615db..177fe22 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,7 +1,7 @@ -%global edk2_date 20180529 -%global edk2_githash ee3198e672e2 +%global edk2_date 20180815 +%global edk2_githash cb5f4f45ce %global openssl_version 1.1.0h -%global qosb_version 1.1.2 +%global qosb_version 1.1.3 %define qosb_testing 0 @@ -35,12 +35,14 @@ Name: edk2 Version: %{edk2_date}git%{edk2_githash} -Release: 5%{dist} +Release: 1%{dist} Summary: EFI Development Kit II Group: Applications/Emulators License: BSD URL: http://www.tianocore.org/edk2/ + +# Tarball generated from git object update-tarball.sh script Source0: edk2-%{edk2_date}-%{edk2_githash}.tar.xz Source1: openssl-%{openssl_version}-hobbled.tar.xz Source2: ovmf-whitepaper-c770f8c.txt @@ -68,17 +70,6 @@ Patch0014: 0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch Patch0015: 0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch Patch0016: 0016-ArmVirtPkg-set-early-hello-message-RH-only.patch -# upstream backports -Patch0050: 0050-OvmfPkg-PlatformBootManagerLib-connect-consoles-unco.patch -Patch0051: 0051-ArmVirtPkg-PlatformBootManagerLib-connect-Virtio-RNG.patch -Patch0052: 0052-OvmfPkg-PlatformBootManagerLib-connect-Virtio-RNG-de.patch -Patch0053: 0053-ArmVirtPkg-unify-HttpLib-resolutions-in-ArmVirt.dsc..patch -Patch0054: 0054-ArmVirtPkg-ArmVirtQemu-enable-the-IPv6-stack.patch -Patch0055: 0055-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-mark-Flash-me.patch -Patch0056: 0056-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Do-not-expose.patch -Patch0057: 0057-OvmfPkg-QemuFlashFvbServicesRuntimeDxe-Restore-C-bit.patch -Patch0058: 0058-MdeModulePkg-Variable-Check-EFI_MEMORY_RUNTIME-attri.patch - %if 0%{?cross:1} # Tweak the tools_def to support cross-compiling. # These files are meant for customization, so this is not upstream too. @@ -231,10 +222,10 @@ rm -rf EdkShellPkg rm -rf FatBinPkg rm -rf ShellBinPkg +# copy whitepaper into place cp -a -- %{SOURCE2} . - -# add openssl -(cd .. && tar -xvf %{SOURCE1}) +# extract openssl into place +tar -xvf %{SOURCE1} --strip-components=1 # Extract QOSB tar -xvf %{SOURCE3} @@ -526,6 +517,9 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_ %changelog +* Tue Aug 21 2018 Cole Robinson - 20180815gitcb5f4f45ce-1 +- Update to edk2 git cb5f4f45ce, edk2-stable201808 + * Mon Jul 23 2018 Paolo Bonzini - 20180529gitee3198e672e2-5 - Fixes for AMD SEV on OVMF_CODE.fd - Add Provides for bundled OpenSSL diff --git a/sources b/sources index e790c47..993de36 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (qemu-ovmf-secureboot-1.1.2.tar.gz) = 4dd7e06663bde90cea99849d47d4c94c48d573ac0454e56eab9174ade999b4dcef73fea63a9bc64d2bccecf8f69c9df2945b237a2f95a08c83d42d744e76d687 +SHA512 (qemu-ovmf-secureboot-1.1.3.tar.gz) = f830a525f66379e8e3c61d006fab49547e6709f7aa0f95e70f23c7d26407cc804a0ced9dcfd26af63391d603e9cb5a0714c222c7cdca8599e41852e22e13be80 SHA512 (openssl-1.1.0h-hobbled.tar.xz) = 6b544a5560a0a3d59b368e3f216284e79389112c87bb34289f8f6644a2454407161a1755b292e8045ff7c172237b070973b03610fd1da3d5204f4118a8644724 -SHA512 (edk2-20180529-ee3198e672e2.tar.xz) = ab6860417c035835ef25e0ac1aabeb17a46df61ebf72f55fcf43e4172b2728a61b28e661c06eab63fa3337b1156ba611faefa5a361ee4611ad70dba2a9fcd57b +SHA512 (edk2-20180815-cb5f4f45ce.tar.xz) = 2912bb30b5be1d7efc1b7aa6d337fd1403fc9ea7cfc580c22dd770d82273ce4c801eba2d60a6f2fda4bc1c6e49747be606de4acfdcca286c10e44b11369cde9d