From d130aececbdd5f50fa93d0e2b2fa52cee036788a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=BBygowski?= Date: Mon, 1 Jul 2024 12:58:13 +0200 Subject: [PATCH] UefiPayloadPkg/UefiPayloadPkg.dsc: Move out the PCD settings from UiApp scope MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting the PCDs only in the UiApp scope does not seem not to be propagated to the DasharoModulesPkg libraries when FixedPcdGetBool is used with those PCDs. Move away the PCD settings to the global PCD section in the DSC. Signed-off-by: Michał Żygowski --- UefiPayloadPkg/UefiPayloadPkg.dsc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 4ce74c397e..662c4dbacc 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -464,6 +464,13 @@ gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0x1 !endif +!if $(DASHARO_SYSTEM_FEATURES_ENABLE) == TRUE + gDasharoSystemFeaturesTokenSpaceGuid.PcdShowMenu|TRUE + gDasharoSystemFeaturesTokenSpaceGuid.PcdShowIommuOptions|$(IOMMU_ENABLE) + gDasharoSystemFeaturesTokenSpaceGuid.PcdShowSerialPortMenu|$(SERIAL_TERMINAL) + gDasharoSystemFeaturesTokenSpaceGuid.PcdShowPs2Option|$(PS2_KEYBOARD_ENABLE) +!endif + [PcdsPatchableInModule.common] gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x7 gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F @@ -677,11 +684,6 @@ NULL|DasharoModulePkg/Library/DasharoSystemFeaturesUiLib/DasharoSystemFeaturesUiLib.inf NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf - - gDasharoSystemFeaturesTokenSpaceGuid.PcdShowMenu|$(DASHARO_SYSTEM_FEATURES_ENABLE) - gDasharoSystemFeaturesTokenSpaceGuid.PcdShowIommuOptions|$(IOMMU_ENABLE) - gDasharoSystemFeaturesTokenSpaceGuid.PcdShowSerialPortMenu|$(SERIAL_TERMINAL) - gDasharoSystemFeaturesTokenSpaceGuid.PcdShowPs2Option|$(PS2_KEYBOARD_ENABLE) } MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf !if $(RAM_DISK_ENABLE) == TRUE