diff options
| author | BobCF <bob.c.feng@intel.com> | 2018-06-22 17:14:13 +0800 |
|---|---|---|
| committer | Liming Gao <liming.gao@intel.com> | 2018-07-13 17:25:43 +0800 |
| commit | 543f5ac30facfbb40eafb2b4908649a427784080 (patch) | |
| tree | 4225636a5ca48691912bfe1a7bd3ee45d7bdfd55 /BaseTools/Source/Python/AutoGen | |
| parent | e550f259a94ecbd97bff5bfaba4dd3d5ed272be8 (diff) | |
| download | edk2-543f5ac30facfbb40eafb2b4908649a427784080.tar.gz edk2-543f5ac30facfbb40eafb2b4908649a427784080.tar.bz2 edk2-543f5ac30facfbb40eafb2b4908649a427784080.zip | |
BaseTools: Enable structure pcd in FDF file
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 | 3 | ||||
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/GenC.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 54c6b7330f..289309fff0 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -568,7 +568,7 @@ class WorkspaceAutoGen(AutoGen): DecPcdsKey.add((Pcd[0], Pcd[1], Pcd[2]))
Platform.SkuName = self.SkuId
- for Name, Guid in PcdSet:
+ for Name, Guid,Fileds in PcdSet:
if (Name, Guid) not in DecPcds:
EdkLogger.error(
'build',
@@ -582,7 +582,6 @@ class WorkspaceAutoGen(AutoGen): if (Name, Guid, TAB_PCDS_FIXED_AT_BUILD) in DecPcdsKey \
or (Name, Guid, TAB_PCDS_PATCHABLE_IN_MODULE) in DecPcdsKey \
or (Name, Guid, TAB_PCDS_FEATURE_FLAG) in DecPcdsKey:
- Platform.AddPcd(Name, Guid, PcdSet[Name, Guid])
continue
elif (Name, Guid, TAB_PCDS_DYNAMIC) in DecPcdsKey or (Name, Guid, TAB_PCDS_DYNAMIC_EX) in DecPcdsKey:
EdkLogger.error(
diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py index eac41ed9bf..2dca9ffd5b 100644 --- a/BaseTools/Source/Python/AutoGen/GenC.py +++ b/BaseTools/Source/Python/AutoGen/GenC.py @@ -890,6 +890,8 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd): if Pcd.PcdValueFromComm:
Pcd.DefaultValue = Pcd.PcdValueFromComm
+ elif Pcd.PcdValueFromFdf:
+ Pcd.DefaultValue = Pcd.PcdValueFromFdf
if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:
TokenNumber = int(Pcd.TokenValue, 0)
@@ -1183,6 +1185,8 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd): if Pcd.PcdValueFromComm:
Pcd.DefaultValue = Pcd.PcdValueFromComm
+ elif Pcd.PcdValueFromFdf:
+ Pcd.DefaultValue = Pcd.PcdValueFromFdf
#
# Write PCDs
#
|