add PcdUninstallMemAttrProtocol configuration

This commit is contained in:
Gerd Hoffmann 2023-12-12 12:20:40 +01:00
parent 5a72362f6c
commit c17e4f232c
2 changed files with 17 additions and 8 deletions

View File

@ -47,10 +47,14 @@ TPM2_CONFIG_ENABLE = FALSE
[pcds.nx.strict] [pcds.nx.strict]
PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5
# Default is FALSE, so there no need to actually set it.
#PcdUninstallMemAttrProtocol = FALSE
[pcds.nx.broken.grub] [pcds.nx.broken.shim.grub]
# grub.efi uses EfiLoaderData for code # grub.efi uses EfiLoaderData for code
PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
# shim.efi has broken MemAttr code
PcdUninstallMemAttrProtocol = TRUE
##################################################################### #####################################################################
@ -157,7 +161,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common opts = ovmf.common
armvirt.verbose armvirt.verbose
pcds = nx.broken.grub pcds = nx.broken.shim.grub
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = Fedora/aarch64 dest = Fedora/aarch64
cpy1 = FV/QEMU_EFI.fd cpy1 = FV/QEMU_EFI.fd
@ -173,7 +177,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common opts = ovmf.common
armvirt.silent armvirt.silent
pcds = nx.broken.grub pcds = nx.broken.shim.grub
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = Fedora/aarch64 dest = Fedora/aarch64
cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd
@ -187,7 +191,7 @@ arch = AARCH64
opts = ovmf.common opts = ovmf.common
armvirt.silent armvirt.silent
armvirt.kernel armvirt.kernel
pcds = nx.broken.grub pcds = nx.broken.shim.grub
plat = ArmVirtQemuKernel-AARCH64 plat = ArmVirtQemuKernel-AARCH64
dest = Fedora/aarch64 dest = Fedora/aarch64
cpy1 = FV/QEMU_EFI.fd QEMU_EFI.kernel.fd cpy1 = FV/QEMU_EFI.fd QEMU_EFI.kernel.fd
@ -241,7 +245,7 @@ desc = ArmVirt build for qemu, 32-bit (arm v7)
conf = ArmVirtPkg/ArmVirtQemu.dsc conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = ARM arch = ARM
opts = ovmf.common opts = ovmf.common
pcds = nx.broken.grub pcds = nx.broken.shim.grub
plat = ArmVirtQemu-ARM plat = ArmVirtQemu-ARM
dest = Fedora/arm dest = Fedora/arm
cpy1 = FV/QEMU_EFI.fd cpy1 = FV/QEMU_EFI.fd

View File

@ -31,12 +31,17 @@ DEBUG_PRINT_ERROR_LEVEL = 0x8040004F
[opts.armvirt.silent] [opts.armvirt.silent]
DEBUG_PRINT_ERROR_LEVEL = 0x80000000 DEBUG_PRINT_ERROR_LEVEL = 0x80000000
[pcds.nx.strict] [pcds.nx.strict]
PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5
PcdUninstallMemAttrProtocol = FALSE
[pcds.nx.broken.grub] [pcds.nx.broken.shim.grub]
# grub.efi uses EfiLoaderData for code # grub.efi uses EfiLoaderData for code
PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1 PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
# shim.efi has broken MemAttr code
PcdUninstallMemAttrProtocol = TRUE
##################################################################### #####################################################################
# stateful ovmf builds (with vars in flash) # stateful ovmf builds (with vars in flash)
@ -100,7 +105,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common opts = ovmf.common
armvirt.verbose armvirt.verbose
pcds = nx.broken.grub pcds = nx.broken.shim.grub
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = RHEL-9/aarch64 dest = RHEL-9/aarch64
cpy1 = FV/QEMU_EFI.fd cpy1 = FV/QEMU_EFI.fd
@ -116,7 +121,7 @@ conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common opts = ovmf.common
armvirt.silent armvirt.silent
pcds = nx.broken.grub pcds = nx.broken.shim.grub
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = RHEL-9/aarch64 dest = RHEL-9/aarch64
cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd