]> git.proxmox.com Git - mirror_edk2.git/commitdiff
ArmPlatformPkg: Fixed build after latest BaseTools syncup
authoroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 13 Apr 2012 10:17:39 +0000 (10:17 +0000)
committeroliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 13 Apr 2012 10:17:39 +0000 (10:17 +0000)
BaseTools now raises an error when a PCD is not declared in a DEC.
This change:
- Remove undeclared PCDs
- Add PCD declaration to DEC file

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13195 6f19259b-4bc3-4df7-8a09-765794883524

12 files changed:
ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
ArmPlatformPkg/ArmPlatformPkg.dsc
ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEbPkg.dec
ArmPlatformPkg/ArmRealViewEbPkg/Library/GdbSerialLib/GdbSerialLib.inf
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
BeagleBoardPkg/BeagleBoardPkg.fdf

index 44a1c61bc9036986bffe8d60406ec69b7bf94eb4..fbbb79f230ce3be2fa7a3f619158d0b073af00a5 100644 (file)
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2011, ARM Limited. All rights reserved.
+#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
 #  
 #  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
   gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE
   gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedUsbDebugCmd|TRUE
   gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE
   gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE
 
index f1221a6b78644642c4300c624fc5b7bbfdfcc423..80ff4c787e03a9b659d7997f1f0c968edc9b1244 100644 (file)
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedHobCmd|TRUE\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedHwDebugCmd|TRUE\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPciDebugCmd|TRUE\r
-  gEmbeddedTokenSpaceGuid.PcdEmbeddedUsbDebugCmd|TRUE\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedIoEnable|FALSE\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedScriptCmd|FALSE\r
 \r
index f8d360f75d6c7867701fe3c3247e35b23a3e24e2..d274820b5d00498e335c636d3b6c59c3535de0b7 100644 (file)
   #\r
   gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
   \r
-  #\r
-  # ARM EB PCDS\r
-  #\r
-  gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000\r
-  \r
   #\r
   # ARM PrimeCells\r
   #\r
index 822b0848f14440cfa7bbe2dac18cd31865dffb56..195a202d365ab82885d537688469ee8781b01925 100644 (file)
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
   #\r
   gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
   \r
-  #\r
-  # ARM EB PCDS\r
-  #\r
-  gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000\r
-  \r
   #\r
   # ARM PrimeCells\r
   #\r
index 133623e083c5e7ca56f347adf61c57ccb4ad3d7e..45868b54462b75f99cefae4524ee9cb4ed3ecd70 100644 (file)
@@ -50,7 +50,7 @@ NumBlocks     = 0x20
 ################################################################################
 
 0x00000000|0x00050000
-gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvBaseSize
+gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize
 FV = FVMAIN_SEC
 
 0x00050000|0x00100000
index 5385ba2554d7c811ee9a53e807d91eec35d290f9..5220f74fe0a16781c2537e6e819700d3c3bb0228 100644 (file)
@@ -50,7 +50,7 @@ NumBlocks     = 0x20
 ################################################################################\r
 \r
 0x00000000|0x00050000\r
-gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvBaseSize\r
+gArmTokenSpaceGuid.PcdSecureFvBaseAddress|gArmTokenSpaceGuid.PcdSecureFvSize\r
 FV = FVMAIN_SEC\r
 \r
 0x00050000|0x00100000\r
index a43080bcd0a9e6c4cc110a9e9d13f97931787c57..47292d2e416d4cb027fa92dfcc67f5c621b90f53 100644 (file)
@@ -1,37 +1,39 @@
-#/** @file
-# Arm RealView EB package.
-#
-# Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
-#
-#    This program and the accompanying materials are licensed and made available under
-#    the terms and conditions of the BSD License which accompanies this distribution.
-#    The full text of the license may be found at
-#    http://opensource.org/licenses/bsd-license.php
-#
-#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#**/
-
-[Defines]
-  DEC_SPECIFICATION              = 0x00010005
-  PACKAGE_NAME                   = ArmRealViewEbPkg
-  PACKAGE_GUID                   = 44577A0D-361A-45B2-B33D-BB9EE60D5A4F
-  PACKAGE_VERSION                = 0.1
-
-################################################################################
-#
-# Include Section - list of Include Paths that are provided by this package.
-#                   Comments are used for Keywords and Module Types.
-#
-# Supported Module Types:
-#  BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION
-#
-################################################################################
-[Includes.common]
-  Include                        # Root include for the package
-
-[Guids.common]
-  gArmRealViewEbPkgTokenSpaceGuid    =  { 0x44577A0D, 0x361A, 0x45B2, { 0xb3, 0x3d, 0xbb, 0x9e, 0xe6, 0x0d, 0x5a, 0x4f} } 
-
-[PcdsFeatureFlag.common]
+#/** @file\r
+# Arm RealView EB package.\r
+#\r
+# Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2012, Arm Ltd. All rights reserved.<BR>\r
+#\r
+#    This program and the accompanying materials are licensed and made available under\r
+#    the terms and conditions of the BSD License which accompanies this distribution.\r
+#    The full text of the license may be found at\r
+#    http://opensource.org/licenses/bsd-license.php\r
+#\r
+#    THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#    WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  DEC_SPECIFICATION              = 0x00010005\r
+  PACKAGE_NAME                   = ArmRealViewEbPkg\r
+  PACKAGE_GUID                   = 44577A0D-361A-45B2-B33D-BB9EE60D5A4F\r
+  PACKAGE_VERSION                = 0.1\r
+\r
+################################################################################\r
+#\r
+# Include Section - list of Include Paths that are provided by this package.\r
+#                   Comments are used for Keywords and Module Types.\r
+#\r
+# Supported Module Types:\r
+#  BASE SEC PEI_CORE PEIM DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER DXE_SAL_DRIVER UEFI_DRIVER UEFI_APPLICATION\r
+#\r
+################################################################################\r
+[Includes.common]\r
+  Include                        # Root include for the package\r
+\r
+[Guids.common]\r
+  gArmRealViewEbPkgTokenSpaceGuid    =  { 0x44577A0D, 0x361A, 0x45B2, { 0xb3, 0x3d, 0xbb, 0x9e, 0xe6, 0x0d, 0x5a, 0x4f} } \r
+\r
+[PcdsFixedAtBuild.common]\r
+  gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0|UINT32|0x00000001\r
index 3a609c7189c6cca814821251354626bc6f207e3d..b81ec91ed62d2193ef2140f295f059dec3e07157 100644 (file)
@@ -1,40 +1,39 @@
-#/** @file
-#  
-#  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#  
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#  
-#**/
-
-[Defines]
-  INF_VERSION                    = 0x00010005
-  BASE_NAME                      = GdbSerialLib
-  FILE_GUID                      = E8EA1309-2F14-428f-ABE3-7016CE4B4305
-  MODULE_TYPE                    = BASE
-  VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = GdbSerialLib
-
-  CONSTRUCTOR                    = GdbSerialLibConstructor
-
-
-[Sources.common]
-  GdbSerialLib.c
-
-
-[Packages]
-  MdePkg/MdePkg.dec
-  EmbeddedPkg/EmbeddedPkg.dec
-  ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEbPkg.dec
-
-[LibraryClasses]
-  DebugLib
-  IoLib   
-
-[FixedPcd]
-
-  gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase
\ No newline at end of file
+#/** @file\r
+#  \r
+#  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
+#  This program and the accompanying materials\r
+#  are licensed and made available under the terms and conditions of the BSD License\r
+#  which accompanies this distribution.  The full text of the license may be found at\r
+#  http://opensource.org/licenses/bsd-license.php\r
+#  \r
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  \r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = GdbSerialLib\r
+  FILE_GUID                      = E8EA1309-2F14-428f-ABE3-7016CE4B4305\r
+  MODULE_TYPE                    = BASE\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = GdbSerialLib\r
+\r
+  CONSTRUCTOR                    = GdbSerialLibConstructor\r
+\r
+\r
+[Sources.common]\r
+  GdbSerialLib.c\r
+\r
+\r
+[Packages]\r
+  MdePkg/MdePkg.dec\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
+  ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEbPkg.dec\r
+\r
+[LibraryClasses]\r
+  DebugLib\r
+  IoLib   \r
+\r
+[FixedPcd]\r
+  gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase\r
index 7de7da234c00a71cfa80f18fbab0df5ff3595189..6ec78346e3bc71e0d09a122ca1b34fa63897b9f9 100644 (file)
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultTimeout|1000000\r
 \r
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000\r
index 2bb5aaf860e977cd75786677e795bf7c0568a5ac..69a89b633aa3d3f02180b5c1a1be19a6bca055af 100644 (file)
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultTimeout|1000000\r
 \r
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000\r
index c54a7ef6d29a561846d0bd07437537e3f010d51f..719b66c328528a4e5f99fabcfb93f24edd97155f 100644 (file)
   gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum|34\r
   gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x1c110000\r
   gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase|0x1c110020\r
-  gArmPlatformTokenSpaceGuid.PcdSP804TimerDebugAgentTimerBase|0x1c120000\r
   gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0x1c120020\r
 \r
   ## SP805 Watchdog - Motherboard Watchdog\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32\r
-  gArmPlatformTokenSpaceGuid.PcdUartDefaultTimeout|1000000\r
 \r
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x1C170000\r
index 653e78197654eb1cef6de7445c3fa63154204874..27f5167e56dc7c20fa7c26eddd1aaf38834a3cac 100644 (file)
@@ -49,7 +49,7 @@ NumBlocks     = 0x80000
 #\r
 ################################################################################\r
 0x00000000|0x00080000\r
-gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvBaseSize\r
+gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize\r
 FV = FVMAIN_COMPACT\r
 \r
 ################################################################################\r