From nobody Tue Apr 30 05:23:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1520488591269474.6739756114956; Wed, 7 Mar 2018 21:56:31 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C48F821ED1C60; Wed, 7 Mar 2018 21:50:13 -0800 (PST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DD23521E082B7 for ; Wed, 7 Mar 2018 21:50:11 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2018 21:56:27 -0800 Received: from shwdeopenpsi105.ccr.corp.intel.com ([10.239.9.129]) by fmsmga002.fm.intel.com with ESMTP; 07 Mar 2018 21:56:26 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=bob.c.feng@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,439,1515484800"; d="scan'208";a="26197736" From: BobCF To: edk2-devel@lists.01.org Date: Thu, 8 Mar 2018 13:56:21 +0800 Message-Id: <20180308055621.10952-1-bob.c.feng@intel.com> X-Mailer: git-send-email 2.14.3.windows.1 Subject: [edk2] [Patch] BaseTools: Fixed Pcd from command line issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Save the pcd command line value in Pcd object Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bob Feng Cc: Liming Gao Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/GenC.py | 15 +++-------- BaseTools/Source/Python/AutoGen/GenMake.py | 28 +++++++------------ .../Source/Python/Workspace/BuildClassObject.py | 4 +-- BaseTools/Source/Python/Workspace/DscBuildData.py | 31 +++++++++++-------= ---- 4 files changed, 31 insertions(+), 47 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Pyt= hon/AutoGen/GenC.py index 3e98506cc8..481c4dda14 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -914,15 +914,12 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd= ): PcdTokenName =3D '_PCD_TOKEN_' + TokenCName PatchPcdSizeTokenName =3D '_PCD_PATCHABLE_' + TokenCName +'_SIZE' PatchPcdSizeVariableName =3D '_gPcd_BinaryPatch_Size_' + TokenCName FixPcdSizeTokenName =3D '_PCD_SIZE_' + TokenCName =20 - if GlobalData.BuildOptionPcd: - for PcdItem in GlobalData.BuildOptionPcd: - if (Pcd.TokenSpaceGuidCName, TokenCName) =3D=3D (PcdItem[0], P= cdItem[1]): - Pcd.DefaultValue =3D PcdItem[2] - break + if Pcd.PcdValueFromComm: + Pcd.DefaultValue =3D Pcd.PcdValueFromComm =20 if Pcd.Type in gDynamicExPcd: TokenNumber =3D int(Pcd.TokenValue, 0) # Add TokenSpaceGuidValue value to PcdTokenName to discriminate th= e DynamicEx PCDs with=20 # different Guids but same TokenCName @@ -1213,16 +1210,12 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, = Pcd): PcdTokenName =3D '_PCD_TOKEN_' + TokenCName FixPcdSizeTokenName =3D '_PCD_SIZE_' + TokenCName PatchPcdSizeTokenName =3D '_PCD_PATCHABLE_' + TokenCName +'_SIZE' PatchPcdSizeVariableName =3D '_gPcd_BinaryPatch_Size_' + TokenCName =20 - if GlobalData.BuildOptionPcd: - for PcdItem in GlobalData.BuildOptionPcd: - if (Pcd.TokenSpaceGuidCName, TokenCName) =3D=3D (PcdItem[0], P= cdItem[1]): - Pcd.DefaultValue =3D PcdItem[2] - break - + if Pcd.PcdValueFromComm: + Pcd.DefaultValue =3D Pcd.PcdValueFromComm # # Write PCDs # if Pcd.Type in gDynamicExPcd: TokenNumber =3D int(Pcd.TokenValue, 0) diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/= Python/AutoGen/GenMake.py index 1b0cf17e25..60bd625cd2 100644 --- a/BaseTools/Source/Python/AutoGen/GenMake.py +++ b/BaseTools/Source/Python/AutoGen/GenMake.py @@ -1549,29 +1549,19 @@ class TopLevelMakefile(BuildFile): if GlobalData.gEnableGenfdsMultiThread: ExtraOption +=3D " --genfds-multi-thread" if GlobalData.gIgnoreSource: ExtraOption +=3D " --ignore-sources" =20 - for index, option in enumerate(GlobalData.gCommand): - if "--pcd" =3D=3D option and GlobalData.gCommand[index+1]: - pcdName, pcdValue =3D GlobalData.gCommand[index+1].split('= =3D') - for Item in GlobalData.BuildOptionPcd: - if '.'.join(Item[0:2]) =3D=3D pcdName: - pcdValue =3D Item[2] - if pcdValue.startswith('L') or pcdValue.startswith= ('"'): - pcdValue, Size =3D ParseFieldValue(pcdValue) - NewVal =3D '{' - for S in range(Size): - NewVal =3D NewVal + '0x%02X' % ((pcdValue = >> S * 8) & 0xff) - NewVal +=3D ',' - pcdValue =3D NewVal[:-1] + '}' - break - if pcdValue.startswith('{'): - pcdValue =3D 'H' + '"' + pcdValue + '"' - ExtraOption +=3D " --pcd " + pcdName + '=3D' + pcdValue - else: - ExtraOption +=3D " --pcd " + GlobalData.gCommand[index= +1] + for pcd in GlobalData.BuildOptionPcd: + if pcd[2]: + pcdname =3D '.'.join(pcd[0:3]) + else: + pcdname =3D '.'.join(pcd[0:2]) + if pcd[3].startswith('{'): + ExtraOption +=3D " --pcd " + pcdname + '=3D' + 'H' + '"' += pcd[3] + '"' + else: + ExtraOption +=3D " --pcd " + pcdname + '=3D' + pcd[3] =20 MakefileName =3D self._FILE_NAME_[self._FileType] SubBuildCommandList =3D [] for A in PlatformInfo.ArchList: Command =3D self._MAKE_TEMPLATE_[self._FileType] % {"file":os.= path.join("$(BUILD_DIR)", A, MakefileName)} diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTo= ols/Source/Python/Workspace/BuildClassObject.py index 711ba492ef..1352fa21c8 100644 --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py @@ -66,10 +66,11 @@ class PcdClassObject(object): self.expressions =3D expressions self.DscDefaultValue =3D None self.DscRawValue =3D None if IsDsc: self.DscDefaultValue =3D Value + self.PcdValueFromComm =3D "" =20 ## Convert the class to a string # # Convert each member of the class to string # Organize to a signle line format string @@ -127,11 +128,10 @@ class StructurePcd(PcdClassObject): self.StructName =3D None self.PcdDefineLineNo =3D 0 self.PkgPath =3D "" self.DefaultValueFromDec =3D "" self.ValueChain =3D dict() - self.PcdValueFromComm =3D "" self.PcdFieldValueFromComm =3D collections.OrderedDict({}) def __repr__(self): return self.TypeName =20 def AddDefaultValue (self, FieldName, Value, FileName=3D"", LineNo=3D0= ): @@ -175,10 +175,11 @@ class StructurePcd(PcdClassObject): self.IsFromDsc =3D PcdObject.IsFromDsc if PcdObject.IsFromDsc else= self.IsFromDsc self.validateranges =3D PcdObject.validateranges if PcdObject.vali= dateranges else self.validateranges self.validlists =3D PcdObject.validlists if PcdObject.validlists e= lse self.validlists self.expressions =3D PcdObject.expressions if PcdObject.expression= s else self.expressions self.DscRawValue =3D PcdObject.DscRawValue if PcdObject.DscRawValu= e else self.DscRawValue + self.PcdValueFromComm =3D PcdObject.PcdValueFromComm if PcdObject.= PcdValueFromComm else self.PcdValueFromComm if type(PcdObject) is StructurePcd: self.StructuredPcdIncludeFile =3D PcdObject.StructuredPcdInclu= deFile if PcdObject.StructuredPcdIncludeFile else self.StructuredPcdInclude= File self.PackageDecs =3D PcdObject.PackageDecs if PcdObject.Packag= eDecs else self.PackageDecs self.DefaultValues =3D PcdObject.DefaultValues if PcdObject.De= faultValues else self.DefaultValues self.PcdMode =3D PcdObject.PcdMode if PcdObject.PcdMode else s= elf.PcdMode @@ -188,11 +189,10 @@ class StructurePcd(PcdClassObject): self.FlexibleFieldName =3D PcdObject.FlexibleFieldName if PcdO= bject.FlexibleFieldName else self.FlexibleFieldName self.StructName =3D PcdObject.DatumType if PcdObject.DatumType= else self.StructName self.PcdDefineLineNo =3D PcdObject.PcdDefineLineNo if PcdObjec= t.PcdDefineLineNo else self.PcdDefineLineNo self.PkgPath =3D PcdObject.PkgPath if PcdObject.PkgPath else s= elf.PkgPath self.ValueChain =3D PcdObject.ValueChain if PcdObject.ValueCha= in else self.ValueChain - self.PcdValueFromComm =3D PcdObject.PcdValueFromComm if PcdObj= ect.PcdValueFromComm else self.PcdValueFromComm self.PcdFieldValueFromComm =3D PcdObject.PcdFieldValueFromComm= if PcdObject.PcdFieldValueFromComm else self.PcdFieldValueFromComm =20 ## LibraryClassObject # # This Class defines LibraryClassObject used in BuildDatabase diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 9d787702c2..e72b7779ce 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -891,22 +891,22 @@ class DscBuildData(PlatformBuildClassObject): mindefaultstorename =3D DefaultStoreMgr.GetMin(PcdDefa= ultStoreSet) skuobj.DefaultStoreDict['STANDARD'] =3D copy.deepcopy(= skuobj.DefaultStoreDict[mindefaultstorename]) return Pcds =20 def RecoverCommandLinePcd(self): - pcdset =3D [] - if GlobalData.BuildOptionPcd: - for pcd in GlobalData.BuildOptionPcd: - if pcd[2] =3D=3D "": - pcdset.append((pcd[0],pcd[1],pcd[3])) - else: - if (pcd[1],pcd[0]) not in self._Pcds: - pcdvalue =3D pcd[3] if len(pcd) =3D=3D 4 else pcd[= 2] - pcdset.append((pcd[0],pcd[1],pcdvalue)) - #else: - # remove the settings from command line since it h= as been handled. - GlobalData.BuildOptionPcd =3D pcdset + def UpdateCommandLineValue(pcd): + if pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUIL= D], + self._PCD_TYPE_STRING_[MODEL_PCD_P= ATCHABLE_IN_MODULE]]: + pcd.PcdValueFromComm =3D pcd.DefaultValue + elif pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII= ], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]: + pcd.PcdValueFromComm =3D pcd.SkuInfoList.get("DEFAULT").Hi= iDefaultValue + else: + pcd.PcdValueFromComm =3D pcd.SkuInfoList.get("DEFAULT").De= faultValue + for pcd in self._Pcds: + if isinstance(self._Pcds[pcd],StructurePcd) and (self._Pcds[pc= d].PcdValueFromComm or self._Pcds[pcd].PcdFieldValueFromComm): + UpdateCommandLineValue(self._Pcds[pcd]) + def GetFieldValueFromComm(self,ValueStr,TokenSpaceGuidCName, TokenCNam= e, FieldName): PredictedFieldType =3D "VOID*" if ValueStr.startswith('L'): if not ValueStr[1]: EdkLogger.error("build", FORMAT_INVALID, 'For Void* type P= CD, when specify the Value in the command line, please use the following fo= rmat: "string", L"string", H"{...}"') @@ -1240,10 +1240,11 @@ class DscBuildData(PlatformBuildClassObject): if (Name,Guid) in AllPcds: Pcd =3D AllPcds.get((Name,Guid)) if isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenS= paceGuidCName), None),StructurePcd): self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCN= ame)).PcdValueFromComm =3D NoFiledValues[(Pcd.TokenSpaceGuidCName,Pcd.Token= CName)][0] else: + Pcd.PcdValueFromComm =3D NoFiledValues[(Pcd.TokenSpace= GuidCName,Pcd.TokenCName)][0] Pcd.DefaultValue =3D NoFiledValues[(Pcd.TokenSpaceGuid= CName,Pcd.TokenCName)][0] for sku in Pcd.SkuInfoList: SkuInfo =3D Pcd.SkuInfoList[sku] if SkuInfo.DefaultValue: SkuInfo.DefaultValue =3D NoFiledValues[(Pcd.To= kenSpaceGuidCName,Pcd.TokenCName)][0] @@ -1264,13 +1265,12 @@ class DscBuildData(PlatformBuildClassObject): else: MaxSize =3D max([len(Pcd.DefaultValue),MaxSize= ]) Pcd.MaxDatumSize =3D str(MaxSize) else: PcdInDec =3D self.DecPcds.get((Name,Guid)) - if isinstance(PcdInDec,StructurePcd): - PcdInDec.PcdValueFromComm =3D NoFiledValues[(Guid,Name= )][0] if PcdInDec: + PcdInDec.PcdValueFromComm =3D NoFiledValues[(Guid,Name= )][0] if PcdInDec.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_= FIXED_AT_BUILD], self._PCD_TYPE_STRING_[MODEL_PCD_P= ATCHABLE_IN_MODULE]]: self.Pcds[Name, Guid] =3D copy.deepcopy(PcdInDec) self.Pcds[Name, Guid].DefaultValue =3D NoFiledValu= es[( Guid,Name)][0] return AllPcds @@ -1709,10 +1709,11 @@ class DscBuildData(PlatformBuildClassObject): try: DefaultValueFromDec =3D ValueExpressionEx(Pcd.DefaultValue= FromDec, "VOID*")(True) except BadExpression: EdkLogger.error("Build", FORMAT_INVALID, "Invalid value fo= rmat for %s.%s, from DEC: %s" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, = DefaultValueFromDec)) + DefaultValueFromDec =3D StringToArray(DefaultValueFromDec) Value, ValueSize =3D ParseFieldValue (DefaultValueFromDec) if isinstance(Value, str): CApp =3D CApp + ' Pcd =3D %s; // From DEC Default Value %s\n'= % (Value, Pcd.DefaultValueFromDec) elif IsArray: # @@ -1848,11 +1849,11 @@ class DscBuildData(PlatformBuildClassObject): IsArray =3D self.IsFieldValueAnArray(FieldList) if IsArray: try: FieldList =3D ValueExpressionEx(FieldList, "VOID*"= )(True) except BadExpression: - EdkLogger.error("Build", FORMAT_INVALID, "Invalid = value format for %s.%s, from DSC: %s" % + EdkLogger.error("Build", FORMAT_INVALID, "Invalid = value format for %s.%s, from Command: %s" % (Pcd.TokenSpaceGuidCName, Pcd.Toke= nCName, FieldList)) Value, ValueSize =3D ParseFieldValue (FieldList) =20 if isinstance(Value, str): CApp =3D CApp + ' Pcd =3D %s; // From Command Line \n= ' % (Value) --=20 2.14.3.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel