UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DecBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DecBuildData.py b/BaseTools/Source/Python/Workspace/DecBuildData.py
index 13b653bd9872ff90a0af4f36b25c54cc5849577b..eeb7c490ac8ce3784136ffdcf16ced876fcfeb44 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DecBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DecBuildData.py
@@ -3,13 +3,7 @@
 #\r
 # Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.<BR>\r
 # (C) Copyright 2016 Hewlett Packard Enterprise Development LP<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
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 from Common.StringUtils import *\r
 from Common.DataType import *\r
@@ -18,7 +12,7 @@ from types import *
 from collections import OrderedDict\r
 from CommonDataClass.DataClass import *\r
 from Workspace.BuildClassObject import PackageBuildClassObject, StructurePcd, PcdClassObject\r
-from Common.GlobalData import gGlobalDefines, gEcpSource\r
+from Common.GlobalData import gGlobalDefines\r
 from re import compile\r
 \r
 ## Platform build information from DEC file\r
@@ -27,20 +21,6 @@ from re import compile
 # into PackageBuildClassObject form for easier use for AutoGen.\r
 #\r
 class DecBuildData(PackageBuildClassObject):\r
-    # dict used to convert PCD type in database to string used by build tool\r
-    _PCD_TYPE_STRING_ = {\r
-        MODEL_PCD_FIXED_AT_BUILD        :   TAB_PCDS_FIXED_AT_BUILD,\r
-        MODEL_PCD_PATCHABLE_IN_MODULE   :   TAB_PCDS_PATCHABLE_IN_MODULE,\r
-        MODEL_PCD_FEATURE_FLAG          :   TAB_PCDS_FEATURE_FLAG,\r
-        MODEL_PCD_DYNAMIC               :   TAB_PCDS_DYNAMIC,\r
-        MODEL_PCD_DYNAMIC_DEFAULT       :   TAB_PCDS_DYNAMIC,\r
-        MODEL_PCD_DYNAMIC_HII           :   TAB_PCDS_DYNAMIC_HII,\r
-        MODEL_PCD_DYNAMIC_VPD           :   TAB_PCDS_DYNAMIC_VPD,\r
-        MODEL_PCD_DYNAMIC_EX            :   TAB_PCDS_DYNAMIC_EX,\r
-        MODEL_PCD_DYNAMIC_EX_DEFAULT    :   TAB_PCDS_DYNAMIC_EX,\r
-        MODEL_PCD_DYNAMIC_EX_HII        :   TAB_PCDS_DYNAMIC_EX_HII,\r
-        MODEL_PCD_DYNAMIC_EX_VPD        :   TAB_PCDS_DYNAMIC_EX_VPD,\r
-    }\r
 \r
     # dict used to convert part of [Defines] to members of DecBuildData directly\r
     _PROPERTY_ = {\r
@@ -53,7 +33,6 @@ class DecBuildData(PackageBuildClassObject):
         TAB_DEC_DEFINES_PKG_UNI_FILE                : "_PkgUniFile",\r
     }\r
 \r
-\r
     ## Constructor of DecBuildData\r
     #\r
     #  Initialize object of DecBuildData\r
@@ -74,6 +53,7 @@ class DecBuildData(PackageBuildClassObject):
         self._Target = Target\r
         self._Toolchain = Toolchain\r
         self._Clear()\r
+        self.UpdatePcdTypeDict()\r
 \r
     ## XXX[key] = value\r
     def __setitem__(self, key, value):\r
@@ -121,7 +101,7 @@ class DecBuildData(PackageBuildClassObject):
 \r
     ## Retrieve all information in [Defines] section\r
     #\r
-    #   (Retriving all [Defines] information in one-shot is just to save time.)\r
+    #   (Retrieving all [Defines] information in one-shot is just to save time.)\r
     #\r
     def _GetHeaderInfo(self):\r
         RecordList = self._RawData[MODEL_META_DATA_HEADER, self._Arch]\r
@@ -167,7 +147,7 @@ class DecBuildData(PackageBuildClassObject):
         if self._Protocols is None:\r
             #\r
             # tdict is a special kind of dict, used for selecting correct\r
-            # protocol defition for given ARCH\r
+            # protocol definition for given ARCH\r
             #\r
             ProtocolDict = tdict(True)\r
             PrivateProtocolDict = tdict(True)\r
@@ -210,7 +190,7 @@ class DecBuildData(PackageBuildClassObject):
         if self._Ppis is None:\r
             #\r
             # tdict is a special kind of dict, used for selecting correct\r
-            # PPI defition for given ARCH\r
+            # PPI definition for given ARCH\r
             #\r
             PpiDict = tdict(True)\r
             PrivatePpiDict = tdict(True)\r
@@ -253,7 +233,7 @@ class DecBuildData(PackageBuildClassObject):
         if self._Guids is None:\r
             #\r
             # tdict is a special kind of dict, used for selecting correct\r
-            # GUID defition for given ARCH\r
+            # GUID definition for given ARCH\r
             #\r
             GuidDict = tdict(True)\r
             PrivateGuidDict = tdict(True)\r
@@ -300,7 +280,6 @@ class DecBuildData(PackageBuildClassObject):
             PublicInclues = []\r
             RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch]\r
             Macros = self._Macros\r
-            Macros["EDK_SOURCE"] = gEcpSource\r
             for Record in RecordList:\r
                 File = PathClass(NormPath(Record[0], Macros), self._PackageDir, Arch=self._Arch)\r
                 LineNo = Record[-1]\r
@@ -402,7 +381,7 @@ class DecBuildData(PackageBuildClassObject):
                     struct_pcd.TokenSpaceGuidCName, struct_pcd.TokenCName = pcdname.split(".")\r
                     struct_pcd.PcdDefineLineNo = LineNo\r
                     struct_pcd.PkgPath = self.MetaFile.File\r
-                    struct_pcd.SetDecDefaultValue(item.DefaultValue)\r
+                    struct_pcd.SetDecDefaultValue(item.DefaultValue,self.MetaFile.File,LineNo)\r
                 else:\r
                     DemesionAttr, Fields = self.ParsePcdName(item.TokenCName)\r
                     struct_pcd.AddDefaultValue(Fields, item.DefaultValue, self.MetaFile.File, LineNo,DemesionAttr)\r