From 51229eee58c12ff6fd444f07e71f79ccd2259702 Mon Sep 17 00:00:00 2001 From: Leif Lindholm Date: Tue, 8 Apr 2025 18:29:15 +0100 Subject: [PATCH] ArmPkg,ArmVirtPkg,UefiPayloadPkg: make PcdVFPEnabled ARM-only AArch64 no longer uses PcdVFPEnabled, so make the definition ARM-specific and stop explicitly setting it for AArch64 platforms. Continuous-integration-options: PatchCheck.ignore-multi-package Signed-off-by: Leif Lindholm --- ArmPkg/ArmPkg.dec | 8 ++++---- ArmVirtPkg/ArmVirtCloudHv.dsc | 4 ---- ArmVirtPkg/ArmVirtKvmTool.dsc | 4 ---- ArmVirtPkg/ArmVirtQemu.dsc | 2 -- ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ---- ArmVirtPkg/ArmVirtXen.dsc | 4 ---- ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf | 5 +++-- UefiPayloadPkg/UefiPayloadPkg.dsc | 2 -- 8 files changed, 7 insertions(+), 26 deletions(-) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 5f3f41b35f..edf45670c6 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -130,10 +130,6 @@ [PcdsFixedAtBuild.common] gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE|BOOLEAN|0x00000006 - # This PCD should be a FeaturePcd. But we used this PCD as an '#if' in an ASM file. - # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor. - gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024 - gArmTokenSpaceGuid.PcdCpuResetAddress|0x00000000|UINT32|0x00000005 # @@ -212,6 +208,10 @@ gArmTokenSpaceGuid.PcdFvBaseAddress|0|UINT64|0x0000002D [PcdsFixedAtBuild.ARM] + # This PCD should be a FeaturePcd. But we used this PCD as an '#if' in an ASM file. + # Using a FeaturePcd make a '(BOOLEAN) casting for its value which is not understood by the preprocessor. + gArmTokenSpaceGuid.PcdVFPEnabled|0|UINT32|0x00000024 + # # ARM Security Extension # diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index ca1aa13e1f..8b475e23e5 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -87,10 +87,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE [PcdsFixedAtBuild.common] -!if $(ARCH) == AARCH64 - gArmTokenSpaceGuid.PcdVFPEnabled|1 -!endif - gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x4007c000 gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc index 2714593271..e5751f904a 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.dsc +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc @@ -133,10 +133,6 @@ gArmPlatformTokenSpaceGuid.PcdCoreCount|1 -!if $(ARCH) == AARCH64 - gArmTokenSpaceGuid.PcdVFPEnabled|1 -!endif - gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 29aa2dcba8..61463cae73 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -246,8 +246,6 @@ # point only, for entry point versions >= 3.0. gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosEntryPointProvideMethod|0x2 - gArmTokenSpaceGuid.PcdVFPEnabled|1 - [PcdsDynamicDefault.common] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 0dee41cf9f..b08f57ef0a 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -121,10 +121,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE [PcdsFixedAtBuild.common] -!if $(ARCH) == AARCH64 - gArmTokenSpaceGuid.PcdVFPEnabled|1 -!endif - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress|0x00000000 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize|$(FD_SIZE) gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 1df6dca23f..edf7c93e6f 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -78,10 +78,6 @@ ################################################################################ [PcdsFixedAtBuild.common] -!if $(ARCH) == AARCH64 - gArmTokenSpaceGuid.PcdVFPEnabled|1 -!endif - gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize|0x4000 # Size of the region used by UEFI in permanent memory (Reserved 64MB) diff --git a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf index 1f6538a4e5..635b7c1b35 100755 --- a/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf +++ b/ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf @@ -65,8 +65,6 @@ [FixedPcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString - gArmTokenSpaceGuid.PcdVFPEnabled - gArmTokenSpaceGuid.PcdFdSize gArmTokenSpaceGuid.PcdFvSize @@ -86,6 +84,9 @@ gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData +[FixedPcd.ARM] + gArmTokenSpaceGuid.PcdVFPEnabled + [Pcd] gArmTokenSpaceGuid.PcdSystemMemoryBase gArmTokenSpaceGuid.PcdSystemMemorySize diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 3d0fd47d22..11cf4142f9 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -623,8 +623,6 @@ !endif [PcdsFixedAtBuild.AARCH64] - gArmTokenSpaceGuid.PcdVFPEnabled|1 - # System Memory Base -- fixed at 0x4000_0000 gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000