PcdFirmwareVersionString is defined in MdeModulePkg to be either fixed or dynamic, but is restricted in ArmPlatformPkg drivers to FixedPcd. Changed to remove the FixedPcd restrictions to allow platforms to chose the correct type in their DSC files.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahm...@hp.com> --- ArmPlatformPkg/PrePi/PeiMPCore.inf | 4 +++- ArmPlatformPkg/PrePi/PeiUniCore.inf | 4 +++- ArmPlatformPkg/Sec/Sec.inf | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf index ad996c5..ac1f8d0 100755 --- a/ArmPlatformPkg/PrePi/PeiMPCore.inf +++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf @@ -1,5 +1,6 @@ #/** @file # +# (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> # Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR> # # This program and the accompanying materials @@ -73,9 +74,10 @@ gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores -[FixedPcd] +[Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString +[FixedPcd] gArmTokenSpaceGuid.PcdVFPEnabled gArmTokenSpaceGuid.PcdFdBaseAddress diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf index f892573..c566390 100755 --- a/ArmPlatformPkg/PrePi/PeiUniCore.inf +++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf @@ -1,5 +1,6 @@ #/** @file # +# (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> # Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR> # # This program and the accompanying materials @@ -72,9 +73,10 @@ gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores -[FixedPcd] +[Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString +[FixedPcd] gArmTokenSpaceGuid.PcdVFPEnabled gArmTokenSpaceGuid.PcdFdBaseAddress diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf index 27e64c7..7c6e7ff 100644 --- a/ArmPlatformPkg/Sec/Sec.inf +++ b/ArmPlatformPkg/Sec/Sec.inf @@ -1,6 +1,7 @@ #/** @file # SEC - Reset vector code that jumps to C and starts the PEI phase # +# (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> # Copyright (c) 2011-2013, ARM Limited. All rights reserved. # # This program and the accompanying materials @@ -55,9 +56,11 @@ PrintLib SerialPortLib -[FixedPcd.common] +[Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString +[FixedPcd.common] + gArmTokenSpaceGuid.PcdTrustzoneSupport gArmTokenSpaceGuid.PcdVFPEnabled -- 1.9.5.msysgit.0 ------------------------------------------------------------------------------ Monitor 25 network devices or servers for free with OpManager! OpManager is web-based network management software that monitors network devices and physical & virtual servers, alerts via email & sms for fault. Monitor 25 devices for free with no restriction. Download now http://ad.doubleclick.net/ddm/clk/292181274;119417398;o _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel
