[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
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
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