BaseTools: Update --pcd parser to support flexible pcd format

This patch update --pcd parser to support flexible pcd format.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

3 files changed, 11 insertions, 57 deletions

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index fc2b409847..76d7e6ac19 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -928,6 +928,7 @@ class FdfParser:
         if GlobalData.BuildOptionPcd:

             for Item in GlobalData.BuildOptionPcd:

                 PcdName, TmpValue = Item.split("=")

+                TmpValue = BuildOptionValue(TmpValue, {})

                 MacroDict[PcdName.strip()] = TmpValue

         # Highest priority

 

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index dfff892e21..a348233911 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -1,7 +1,7 @@
 ## @file

 # process FFS generation from INF statement

 #

-#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

 #  Copyright (c) 2014-2016 Hewlett-Packard Development Company, L.P.<BR>

 #

 #  This program and the accompanying materials

@@ -274,7 +274,9 @@ class FfsInfStatement(FfsInfStatementClassObject):
             if GlobalData.BuildOptionPcd:

                 for pcd in GlobalData.BuildOptionPcd:

                     if PcdKey == (pcd[1], pcd[0]):

-                        DefaultValue = pcd[2]

+                        if pcd[2]:

+                            continue

+                        DefaultValue = pcd[3]

                         BuildOptionOverride = True

                         break

 

@@ -288,15 +290,15 @@ class FfsInfStatement(FfsInfStatementClassObject):
                 except BadExpression:

                     EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] Value "%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, DefaultValue), File=self.InfFileName)

 

-            if Pcd.DefaultValue:

+            if Pcd.InfDefaultValue:

                 try:

-                    Pcd.DefaultValue = ValueExpressionEx(Pcd.DefaultValue, Pcd.DatumType, Platform._GuidDict)(True)

+                    Pcd.InfDefaultValue = ValueExpressionEx(Pcd.InfDefaultValue, Pcd.DatumType, Platform._GuidDict)(True)

                 except BadExpression:

                     EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] Value "%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DefaultValue),File=self.InfFileName)

 

             # Check value, if value are equal, no need to patch

             if Pcd.DatumType == "VOID*":

-                if Pcd.DefaultValue == DefaultValue or DefaultValue in [None, '']:

+                if Pcd.InfDefaultValue == DefaultValue or DefaultValue in [None, '']:

                     continue

                 # Get the string size from FDF or DSC

                 if DefaultValue[0] == 'L':

@@ -310,15 +312,15 @@ class FfsInfStatement(FfsInfStatementClassObject):
                     Pcd.MaxDatumSize = PatchPcd.MaxDatumSize

                 # If no defined the maximum size in DSC, try to get current size from INF

                 if Pcd.MaxDatumSize in ['', None]:

-                    Pcd.MaxDatumSize = str(len(Pcd.DefaultValue.split(',')))

+                    Pcd.MaxDatumSize = str(len(Pcd.InfDefaultValue.split(',')))

             else:

                 Base1 = Base2 = 10

-                if Pcd.DefaultValue.upper().startswith('0X'):

+                if Pcd.InfDefaultValue.upper().startswith('0X'):

                     Base1 = 16

                 if DefaultValue.upper().startswith('0X'):

                     Base2 = 16

                 try:

-                    PcdValueInImg = int(Pcd.DefaultValue, Base1)

+                    PcdValueInImg = int(Pcd.InfDefaultValue, Base1)

                     PcdValueInDscOrFdf = int(DefaultValue, Base2)

                     if PcdValueInImg == PcdValueInDscOrFdf:

                         continue

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 9ca7c8706a..4c56cbb02a 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -38,8 +38,6 @@ from Common.Misc import DirCache, PathClass
 from Common.Misc import SaveFileOnChange

 from Common.Misc import ClearDuplicatedInf

 from Common.Misc import GuidStructureStringToGuidString

-from Common.Misc import CheckPcdDatum

-from Common.Misc import BuildOptionPcdValueFormat

 from Common.BuildVersion import gBUILD_VERSION

 from Common.MultipleWorkspace import MultipleWorkspace as mws

 import FfsFileStatement

@@ -369,53 +367,6 @@ def SingleCheckCallback(option, opt_str, value, parser):
     else:

         parser.error("Option %s only allows one instance in command line!" % option)

 

-def CheckBuildOptionPcd():

-    for Arch in GenFdsGlobalVariable.ArchList:

-        PkgList  = GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag)

-        for i, pcd in enumerate(GlobalData.BuildOptionPcd):

-            if type(pcd) is tuple:

-                continue

-            (pcdname, pcdvalue) = pcd.split('=')

-            if not pcdvalue:

-                EdkLogger.error('GenFds', OPTION_MISSING, "No Value specified for the PCD %s." % (pcdname))

-            if '.' in pcdname:

-                (TokenSpaceGuidCName, TokenCName) = pcdname.split('.')

-                HasTokenSpace = True

-            else:

-                TokenCName = pcdname

-                TokenSpaceGuidCName = ''

-                HasTokenSpace = False

-            TokenSpaceGuidCNameList = []

-            FoundFlag = False

-            PcdDatumType = ''

-            NewValue = ''

-            for package in PkgList:

-                for key in package.Pcds:

-                    PcdItem = package.Pcds[key]

-                    if HasTokenSpace:

-                        if (PcdItem.TokenCName, PcdItem.TokenSpaceGuidCName) == (TokenCName, TokenSpaceGuidCName):

-                            PcdDatumType = PcdItem.DatumType

-                            NewValue = BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)

-                            FoundFlag = True

-                    else:

-                        if PcdItem.TokenCName == TokenCName:

-                            if not PcdItem.TokenSpaceGuidCName in TokenSpaceGuidCNameList:

-                                if len (TokenSpaceGuidCNameList) < 1:

-                                    TokenSpaceGuidCNameList.append(PcdItem.TokenSpaceGuidCName)

-                                    PcdDatumType = PcdItem.DatumType

-                                    TokenSpaceGuidCName = PcdItem.TokenSpaceGuidCName

-                                    NewValue = BuildOptionPcdValueFormat(TokenSpaceGuidCName, TokenCName, PcdDatumType, pcdvalue)

-                                    FoundFlag = True

-                                else:

-                                    EdkLogger.error(

-                                            'GenFds',

-                                            PCD_VALIDATION_INFO_ERROR,

-                                            "The Pcd %s is found under multiple different TokenSpaceGuid: %s and %s." % (TokenCName, PcdItem.TokenSpaceGuidCName, TokenSpaceGuidCNameList[0])

-                                            )

-

-            GlobalData.BuildOptionPcd[i] = (TokenSpaceGuidCName, TokenCName, NewValue)

-

-

 ## FindExtendTool()

 #

 #  Find location of tools to process data