Merge tag 'firmware/edk2-20230912-pull-request' of https://gitlab.com…

…/kraxel/qemu into staging edk2: update to Aug 2023 stable tag # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEoDKM/7k6F6eZAf59TLbY7tPocTgFAmUASbwACgkQTLbY7tPo # cTimJg//Z2WIZNuv01uALXjCtRBecDb6hzCydi7PqRvjQJU4xflybxaPjz11YsX/ # EekdxCyIdTzHaMazoZ3YXoI1zQ1lyyb2BdiKhQ1ZTXx/KyDo/prcNtIYiGQ2Y4LL # F+cI5OSC1+9Rsm/vKTsN2hRM3rIeZFSOvYgIv2BX3/Raer+oI3dKcMFdUS3EkGIn # ERcEYXnrWDzu4Tlygc/0ElbRTl+vpdGLccR+kiYk3iByzCA8Slg4cijm8lG9WGgR # vOZ71acl9fg/8OA7aoSIQ8K80D74cJ0KmLxe4A3op7sZQ4abN4jt7+P9+XL2j8El # FYRvIL8Un9Tda2BetrglxKv3lKnkL2S6+ynjyRZPhMUciUcm6P865nkgfb4lRtP/ # 43RUwn+d1n6h5mfq2jkulkA948YW58Cw5gpp8YurVy67ndtBdj6iDDzSerJwSCGG # MgPy3MUp8TsWXy+HgNe+aURWRCOTi0kFG9eNupzD460ocAaM43U1M4Qs1hciBph3 # J586gdhzSJXr9nZKgo0neP+p4FtgTCfYyN9mOhCzsGbgy9zPBpPAbpr1m1dyfJU2 # FJxpjnyKjyD3vH+10wALaIJV+kTnAfoDfxezg0bttzPuoGuQf21PbsFIBRQ5ba9E # 1XYnNnQg32OGMlRYqGQUjl72s3wx2lulk8SmcMFpwCfgnpX4cy0= # =Be0l # -----END PGP SIGNATURE----- # gpg: Signature made Tue 12 Sep 2023 07:21:32 EDT # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * tag 'firmware/edk2-20230912-pull-request' of https://gitlab.com/kraxel/qemu: edk2: update binaries to edk2-stable202308 edk2: workaround edk-stable202308 bug edk2: update submodule to edk2-stable202308 edk2: update build config edk2: update build script Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
qemu · Sep 12, 2023 · eaf8511 · eaf8511
2 parents 4d5eb68 + ab31693
commit eaf8511
Show file tree

Hide file tree

Showing 13 changed files with 139 additions and 77 deletions.
diff --git a/pc-bios/edk2-aarch64-code.fd.bz2 b/pc-bios/edk2-aarch64-code.fd.bz2
diff --git a/pc-bios/edk2-arm-code.fd.bz2 b/pc-bios/edk2-arm-code.fd.bz2
diff --git a/pc-bios/edk2-i386-code.fd.bz2 b/pc-bios/edk2-i386-code.fd.bz2
diff --git a/pc-bios/edk2-i386-secure-code.fd.bz2 b/pc-bios/edk2-i386-secure-code.fd.bz2
diff --git a/pc-bios/edk2-riscv-code.fd.bz2 b/pc-bios/edk2-riscv-code.fd.bz2
diff --git a/pc-bios/edk2-riscv-vars.fd.bz2 b/pc-bios/edk2-riscv-vars.fd.bz2
diff --git a/pc-bios/edk2-riscv.fd.bz2 b/pc-bios/edk2-riscv.fd.bz2
diff --git a/pc-bios/edk2-x86_64-code.fd.bz2 b/pc-bios/edk2-x86_64-code.fd.bz2
diff --git a/pc-bios/edk2-x86_64-microvm.fd.bz2 b/pc-bios/edk2-x86_64-microvm.fd.bz2
diff --git a/pc-bios/edk2-x86_64-secure-code.fd.bz2 b/pc-bios/edk2-x86_64-secure-code.fd.bz2
diff --git a/roms/edk2 b/roms/edk2
diff --git a/roms/edk2-build.config b/roms/edk2-build.config
@@ -26,6 +26,9 @@ DEBUG_PRINT_ERROR_LEVEL  = 0x80000000
 # grub.efi uses EfiLoaderData for code
 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
 
+[pcds.workaround.202308]
+PcdFirstTimeWakeUpAPsBySipi = FALSE
+
 ####################################################################################
 # i386
 
@@ -57,6 +60,7 @@ desc = ovmf build (64-bit)
 conf = OvmfPkg/OvmfPkgX64.dsc
 arch = X64
 opts = common
+pcds = workaround.202308
 plat = OvmfX64
 dest = ../pc-bios
 cpy1 = FV/OVMF_CODE.fd edk2-x86_64-code.fd
@@ -67,6 +71,7 @@ conf = OvmfPkg/OvmfPkgIa32X64.dsc
 arch = IA32 X64
 opts = common
        ovmf.sb.smm
+pcds = workaround.202308
 plat = Ovmf3264
 dest = ../pc-bios
 cpy1 = FV/OVMF_CODE.fd edk2-x86_64-secure-code.fd
@@ -76,6 +81,7 @@ desc = ovmf build for microvm
 conf = OvmfPkg/Microvm/MicrovmX64.dsc
 arch = X64
 opts = common
+pcds = workaround.202308
 plat = MicrovmX64
 dest = ../pc-bios
 cpy1 = FV/MICROVM.fd  edk2-x86_64-microvm.fd
@@ -120,5 +126,7 @@ conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
 arch = RISCV64
 plat = RiscVVirtQemu
 dest = ../pc-bios
-cpy1 = FV/RISCV_VIRT.fd  edk2-riscv.fd
-pad1 = edk2-riscv.fd     32m
+cpy1 = FV/RISCV_VIRT_CODE.fd  edk2-riscv-code.fd
+cpy2 = FV/RISCV_VIRT_VARS.fd  edk2-riscv-vars.fd
+pad1 = edk2-riscv-code.fd     32m
+pad2 = edk2-riscv-vars.fd     32m