diff options
Diffstat (limited to 'roms')
| m--------- | roms/edk2 | 0 | ||||
| -rw-r--r-- | roms/edk2-build.config | 12 | ||||
| m--------- | roms/opensbi | 0 |
3 files changed, 9 insertions, 3 deletions
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/roms/opensbi b/roms/opensbi -Subproject 057eb10b6d523540012e6947d5c9f63e95244e9 +Subproject a2b255b88918715173942f2c5e1f97ac9e90c87 |