diff options
| author | BobCF <bob.c.feng@intel.com> | 2018-03-02 18:11:13 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-03-03 12:40:39 +0800 |
| commit | b854e2bf752940b8d4dd3a569942d9c07b5d498f (patch) | |
| tree | 98e5372765319bcd830bf5842a517a364f5e07e3 /BaseTools/Source/Python/AutoGen | |
| parent | 0537f332c968e6c3adeefa2222b5f1aa7252b711 (diff) | |
| download | edk2-b854e2bf752940b8d4dd3a569942d9c07b5d498f.tar.gz edk2-b854e2bf752940b8d4dd3a569942d9c07b5d498f.tar.bz2 edk2-b854e2bf752940b8d4dd3a569942d9c07b5d498f.zip | |
BaseTools: Fixed Pcd value override issue.
1. Handle the Pcd maxsize issue for the case
that the length of Pcd value from CommandLine
bigger that its maxsize
2. The Pcd value override in commandline.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools/Source/Python/AutoGen')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 26 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/GenPcdDb.py | 12 |
2 files changed, 0 insertions, 38 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index e2589cfbae..439e360955 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -1368,27 +1368,6 @@ class PlatformAutoGen(AutoGen): # This interface should be invoked explicitly when platform action is created.
#
def CollectPlatformDynamicPcds(self):
- # Override the platform Pcd's value by build option
- if GlobalData.BuildOptionPcd:
- for PcdItem in GlobalData.BuildOptionPcd:
- PlatformPcd = self.Platform.Pcds.get((PcdItem[1],PcdItem[0]))
- if PlatformPcd:
- if PlatformPcd.DatumType in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64,'BOOLEAN']:
- for sku in PlatformPcd.SkuInfoList:
- PlatformPcd.SkuInfoList[sku].DefaultValue = PcdItem[2]
- else:
- PcdDefaultValue = StringToArray(PcdItem[2])
- for sku in PlatformPcd.SkuInfoList:
- skuinfo = PlatformPcd.SkuInfoList[sku]
- if skuinfo.VariableGuid:
- skuinfo.HiiDefaultValue = PcdDefaultValue
- else:
- skuinfo.DefaultValue = PcdDefaultValue
- PlatformPcd.DefaultValue = PcdDefaultValue
- if PlatformPcd.MaxDatumSize:
- PlatformPcd.MaxDatumSize = str(max([int(PlatformPcd.MaxDatumSize),len(PcdDefaultValue.split(","))]))
- else:
- PlatformPcd.MaxDatumSize = str(len(PcdDefaultValue.split(",")))
for key in self.Platform.Pcds:
for SinglePcd in GlobalData.MixedPcd:
@@ -2373,11 +2352,6 @@ class PlatformAutoGen(AutoGen): TokenCName = PcdItem[0]
break
if FromPcd != None:
- if GlobalData.BuildOptionPcd:
- for pcd in GlobalData.BuildOptionPcd:
- if (FromPcd.TokenSpaceGuidCName, FromPcd.TokenCName) == (pcd[0], pcd[1]):
- FromPcd.DefaultValue = pcd[2]
- break
if ToPcd.Pending and FromPcd.Type not in [None, '']:
ToPcd.Type = FromPcd.Type
elif (ToPcd.Type not in [None, '']) and (FromPcd.Type not in [None, ''])\
diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py index 82360ae57d..e2848e7aaf 100644 --- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py +++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py @@ -1184,12 +1184,6 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase): if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:
CName = PcdItem[0]
- if GlobalData.BuildOptionPcd:
- for PcdItem in GlobalData.BuildOptionPcd:
- if (Pcd.TokenSpaceGuidCName, CName) == (PcdItem[0], PcdItem[1]):
- Pcd.DefaultValue = PcdItem[2]
- break
-
EdkLogger.debug(EdkLogger.DEBUG_3, "PCD: %s %s (%s : %s)" % (CName, TokenSpaceGuidCName, Pcd.Phase, Phase))
if Pcd.Phase == 'PEI':
@@ -1505,12 +1499,6 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase): if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:
CName = PcdItem[0]
- if GlobalData.BuildOptionPcd:
- for PcdItem in GlobalData.BuildOptionPcd:
- if (Pcd.TokenSpaceGuidCName, CName) == (PcdItem[0], PcdItem[1]):
- Pcd.DefaultValue = PcdItem[2]
- break
-
EdkLogger.debug(EdkLogger.DEBUG_1, "PCD = %s.%s" % (CName, TokenSpaceGuidCName))
EdkLogger.debug(EdkLogger.DEBUG_1, "phase = %s" % Phase)
EdkLogger.debug(EdkLogger.DEBUG_1, "GeneratedTokenNumber = %s" % str(GeneratedTokenNumber))
|