Reviewed-by: Liming Gao <liming....@intel.com>
> -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Yonghong Zhu > Sent: Friday, October 12, 2018 10:20 AM > To: edk2-devel@lists.01.org > Subject: [edk2] [PATCH] BaseTools: Not compare the VOID* difference in the > DSC and DEC file > > For structure Pcd, the type defined in the DEC file is the struct name > while if this Pcd used in the DSC file, it should add VOID* keywords > when it have max size info. so this patch filter the type compare for > this case. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yonghong Zhu <yonghong....@intel.com> > --- > BaseTools/Source/Python/Workspace/DscBuildData.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py > b/BaseTools/Source/Python/Workspace/DscBuildData.py > index 02aae3a67b..5ed879c8d7 100644 > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > @@ -935,11 +935,12 @@ class DscBuildData(PlatformBuildClassObject): > Valid, ErrStr = CheckPcdDatum(self._DecPcds[PcdCName, > TokenSpaceGuid].DatumType, ValueList[Index]) > if not Valid: > EdkLogger.error('build', FORMAT_INVALID, ErrStr, > File=self.MetaFile, Line=LineNo, > ExtraData="%s.%s" % (TokenSpaceGuid, > PcdCName)) > if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, > MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_FIXED_AT_BUILD, > MODEL_PCD_PATCHABLE_IN_MODULE): > - if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.strip() > != ValueList[1].strip(): > + if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.strip() > in TAB_PCD_NUMERIC_TYPES_VOID \ > + and self._DecPcds[PcdCName, > TokenSpaceGuid].DatumType.strip() != ValueList[1].strip(): > EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtype > used in DSC file is not the same as its declaration > in DEC file.", File=self.MetaFile, Line=LineNo, > ExtraData="%s.%s|%s" % (TokenSpaceGuid, > PcdCName, Setting)) > if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds: > if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] != > ValueList[Index]: > GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] = > ValueList[Index] > -- > 2.12.2.windows.2 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
