diff options
-rw-r--r-- | pc-bios/edk2-aarch64-code.fd.bz2 | bin | 1573561 -> 1587761 bytes | |||
-rw-r--r-- | pc-bios/edk2-arm-code.fd.bz2 | bin | 1560966 -> 1569509 bytes | |||
-rw-r--r-- | pc-bios/edk2-i386-code.fd.bz2 | bin | 1770410 -> 1773520 bytes | |||
-rw-r--r-- | pc-bios/edk2-i386-secure-code.fd.bz2 | bin | 2121818 -> 2127480 bytes | |||
-rw-r--r-- | pc-bios/edk2-riscv-code.fd.bz2 | bin | 1177402 -> 1180314 bytes | |||
-rw-r--r-- | pc-bios/edk2-x86_64-code.fd.bz2 | bin | 1887921 -> 1891942 bytes | |||
-rw-r--r-- | pc-bios/edk2-x86_64-microvm.fd.bz2 | bin | 1782629 -> 1783951 bytes | |||
-rw-r--r-- | pc-bios/edk2-x86_64-secure-code.fd.bz2 | bin | 2200701 -> 2212258 bytes | |||
m--------- | roms/edk2 | 0 | ||||
-rw-r--r-- | roms/edk2-build.config | 12 | ||||
-rw-r--r-- | tests/data/acpi/virt/SSDT.memhp | bin | 1817 -> 1817 bytes |
11 files changed, 9 insertions, 3 deletions
diff --git a/pc-bios/edk2-aarch64-code.fd.bz2 b/pc-bios/edk2-aarch64-code.fd.bz2 Binary files differindex 985e69a66a..fdcf89022a 100644 --- 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 Binary files differindex ae797a8c8e..9d829f4f08 100644 --- 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 Binary files differindex e703c2f954..1a9d392574 100644 --- 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 Binary files differindex 7230d44615..fab0a77b30 100644 --- 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 Binary files differindex c1cc08561d..6394fbfff3 100644 --- a/pc-bios/edk2-riscv-code.fd.bz2 +++ b/pc-bios/edk2-riscv-code.fd.bz2 diff --git a/pc-bios/edk2-x86_64-code.fd.bz2 b/pc-bios/edk2-x86_64-code.fd.bz2 Binary files differindex 9b7767a3ac..0d325bd483 100644 --- 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 Binary files differindex 17460dd380..829429082b 100644 --- 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 Binary files differindex fd0efeacbf..c6b039819c 100644 --- 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 -Subproject 819cfc6b42a68790a23509e4fcc58ceb70e1965 +Subproject b8a3eec88cc74bbfe7fb389d026cc7d1d8a989c diff --git a/roms/edk2-build.config b/roms/edk2-build.config index bab6a9caeb..0d367dbdb7 100644 --- a/roms/edk2-build.config +++ b/roms/edk2-build.config @@ -22,9 +22,15 @@ SMM_REQUIRE = TRUE [opts.armvirt.silent] DEBUG_PRINT_ERROR_LEVEL = 0x80000000 -[pcds.nx.broken.grub] +[pcds.nx.strict] +PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5 +PcdUninstallMemAttrProtocol = FALSE + +[pcds.nx.broken.shim.grub] # grub.efi uses EfiLoaderData for code PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1 +# shim.efi has broken MemAttr code +PcdUninstallMemAttrProtocol = TRUE [pcds.workaround.202308] PcdFirstTimeWakeUpAPsBySipi = FALSE @@ -95,7 +101,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc arch = ARM opts = common armvirt.silent -pcds = nx.broken.grub +pcds = nx.broken.shim.grub plat = ArmVirtQemu-ARM dest = ../pc-bios cpy1 = FV/QEMU_EFI.fd edk2-arm-code.fd @@ -112,7 +118,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc arch = AARCH64 opts = common armvirt.silent -pcds = nx.broken.grub +pcds = nx.broken.shim.grub plat = ArmVirtQemu-AARCH64 dest = ../pc-bios cpy1 = FV/QEMU_EFI.fd edk2-aarch64-code.fd diff --git a/tests/data/acpi/virt/SSDT.memhp b/tests/data/acpi/virt/SSDT.memhp Binary files differindex 31ff6ac469..fb3dcde5a1 100644 --- a/tests/data/acpi/virt/SSDT.memhp +++ b/tests/data/acpi/virt/SSDT.memhp |