From 7f43970f2a6c1d9a04a28245f31d81db0f3fd7c1 Mon Sep 17 00:00:00 2001 From: Mikhail Krichanov Date: Wed, 25 Dec 2024 12:34:31 +0300 Subject: [PATCH] Revert "ArmVirtPkg/ArmVirtQemu: Disable PcdPrePiProduceMemoryTypeInformationHob for ARM" This reverts commit a86d9d688e5cb9615d3dc308dcb40b6f648f8522. --- ArmVirtPkg/ArmVirt.dsc.inc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 6837232202..5d5868eb0e 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -274,22 +274,14 @@ [PcdsFeatureFlag.common] gEfiMdeModulePkgTokenSpaceGuid.PcdHiiOsRuntimeSupport|FALSE + gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE + [PcdsFeatureFlag.AARCH64] # # Activate AcpiSdtProtocol # gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol|TRUE - # - # FIXME: The PcdPrePiProduceMemoryTypeInformationHob on ARM breaks Linux efistub boot. - # The efistub for arm32 uncompresses Linux kernel into memory ranges which occupied - # by DXE-phase drivers which leads to 'permission denied'-error during page write. - # - # So as a temporary solution we use PcdPrePiProduceMemoryTypeInformationHob - # only for AARCH64 - # - gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob|TRUE - [PcdsFixedAtBuild.common] !ifdef $(FIRMWARE_VER) gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)"