ArmPlatformPkg: Allow PcdFirmwareVersionString to be a dynamic PCD

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-mahmoud@hp.com>
Reviewed-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17833 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/PrePi/PeiMPCore.inf b/ArmPlatformPkg/PrePi/PeiMPCore.inf
index ad996c5920be291201a2a7a86d9b51271581abed..ac1f8d0391c00fd5ba393898480ecb0d5932a51a 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PeiMPCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiMPCore.inf
@@ -1,5 +1,6 @@
 #/** @file\r
 #\r
+#  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 #  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
@@ -73,9 +74,10 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores\r
 \r
-[FixedPcd]\r
+[Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString\r
 \r
+[FixedPcd]\r
   gArmTokenSpaceGuid.PcdVFPEnabled\r
 \r
   gArmTokenSpaceGuid.PcdFdBaseAddress\r

diff --git a/ArmPlatformPkg/PrePi/PeiUniCore.inf b/ArmPlatformPkg/PrePi/PeiUniCore.inf
index f8925737ff628852e2d9f5deb3c5a34e9d9332d4..c5663901c93ec83824106d6ccb2c02d0117f297e 100755 (executable)
--- a/ArmPlatformPkg/PrePi/PeiUniCore.inf
+++ b/ArmPlatformPkg/PrePi/PeiUniCore.inf
@@ -1,5 +1,6 @@
 #/** @file\r
 #\r
+#  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 #  Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
@@ -72,9 +73,10 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiProduceMemoryTypeInformationHob\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores\r
 \r
-[FixedPcd]\r
+[Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString\r
 \r
+[FixedPcd]\r
   gArmTokenSpaceGuid.PcdVFPEnabled\r
 \r
   gArmTokenSpaceGuid.PcdFdBaseAddress\r

diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index 27e64c78ee86b4004ee5d149c2c299153ceacf0b..7c6e7ffba1c62cbfa88b9507cc3677dec6bf975f 100644 (file)
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -1,6 +1,7 @@
 #/** @file\r
 #  SEC - Reset vector code that jumps to C and starts the PEI phase\r
 #\r
+#  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
 #  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
@@ -55,9 +56,11 @@
   PrintLib\r
   SerialPortLib\r
 \r
-[FixedPcd.common]\r
+[Pcd]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString\r
 \r
+[FixedPcd.common]\r
+\r
   gArmTokenSpaceGuid.PcdTrustzoneSupport\r
   gArmTokenSpaceGuid.PcdVFPEnabled\r
 \r