[edk2] [PATCH] ArmPlatformPkg: Allow PcdFirmwareVersionString to be a dynamic PCD

Discussion:

Samer El-Haj-Mahmoud

2015-06-28 06:14:18 UTC

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-***@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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. 
#
# 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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. 
#
# 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. 
# 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

El-Haj-Mahmoud, Samer

2015-06-28 16:42:12 UTC

Permalink

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-***@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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. # # 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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. # # 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. 
# 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

El-Haj-Mahmoud, Samer

2015-07-01 14:25:39 UTC

Permalink

Oliver,

Can you please help review this ?

-----Original Message-----
From: El-Haj-Mahmoud, Samer
Sent: Sunday, June 28, 2015 11:42 AM
To: edk2-***@lists.sourceforge.net
Cc: ***@arm.com
Subject: RE: [PATCH] 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-***@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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. # # 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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. # # 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. 
# 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

Olivier Martin

2015-07-01 14:33:39 UTC

Permalink

Reviewed-By: Olivier Martin <***@arm.com>

-----Original Message-----
From: El-Haj-Mahmoud, Samer [mailto:samer.el-haj-***@hp.com]
Sent: 01 July 2015 15:26
To: edk2-***@lists.sourceforge.net
Cc: Olivier Martin
Subject: RE: [PATCH] ArmPlatformPkg: Allow PcdFirmwareVersionString to be a dynamic PCD

Oliver,

Can you please help review this ?

-----Original Message-----
From: El-Haj-Mahmoud, Samer
Sent: Sunday, June 28, 2015 11:42 AM
To: edk2-***@lists.sourceforge.net
Cc: ***@arm.com
Subject: RE: [PATCH] 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-***@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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. # # 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. 
# Copyright (c) 2011-2014, ARM Ltd. All rights reserved. # # 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. 
# 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

-- IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

ARM Limited, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2557590
ARM Holdings plc, Registered office 110 Fulbourn Road, Cambridge CB1 9NJ, Registered in England & Wales, Company No: 2548782