diff options
| author | Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hp.com> | 2015-07-06 16:54:26 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@Edk2> | 2015-07-06 16:54:26 +0000 |
| commit | b1179c1929386b16adf755637810dc96dcbda6cc (patch) | |
| tree | 9f9590c136ef4ea44cde73164fd0a2ee3906a879 | |
| parent | c4149528d4603656fbddb21b5cba821cac90cbdb (diff) | |
| download | edk2-platforms-b1179c1929386b16adf755637810dc96dcbda6cc.tar.xz | |
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
| -rwxr-xr-x | ArmPlatformPkg/PrePi/PeiMPCore.inf | 4 | ||||
| -rwxr-xr-x | ArmPlatformPkg/PrePi/PeiUniCore.inf | 4 | ||||
| -rw-r--r-- | 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 ad996c5920..ac1f8d0391 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 f8925737ff..c5663901c9 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 27e64c78ee..7c6e7ffba1 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
|