diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-09-10 16:23:09 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2017-09-11 10:58:45 +0800 |
| commit | aa9aa47e06ac0082948b880c226c8bdf2a12102b (patch) | |
| tree | 0e727ccc6a71ee17c68faa1e2d74882882ff251b /BaseTools | |
| parent | 2f6ef874ac96db0969d1f6c09f210cd2ebb88a82 (diff) | |
| download | edk2-aa9aa47e06ac0082948b880c226c8bdf2a12102b.zip edk2-aa9aa47e06ac0082948b880c226c8bdf2a12102b.tar.gz edk2-aa9aa47e06ac0082948b880c226c8bdf2a12102b.tar.bz2 | |
BaseTools: Fix a bug for Mixed Pcd value display in the report
the case is that override the mixed pcd value in DSC [Components]
section, the value display in the report is incorrect.
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Source/Python/AutoGen/AutoGen.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py index 70e2e62..1a8c0d9 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -2335,8 +2335,18 @@ class PlatformAutoGen(AutoGen): if Module in self.Platform.Modules:
PlatformModule = self.Platform.Modules[str(Module)]
for Key in PlatformModule.Pcds:
+ Flag = False
if Key in Pcds:
- self._OverridePcd(Pcds[Key], PlatformModule.Pcds[Key], Module)
+ ToPcd = Pcds[Key]
+ Flag = True
+ elif Key in GlobalData.MixedPcd:
+ for PcdItem in GlobalData.MixedPcd[Key]:
+ if PcdItem in Pcds:
+ ToPcd = Pcds[PcdItem]
+ Flag = True
+ break
+ if Flag:
+ self._OverridePcd(ToPcd, PlatformModule.Pcds[Key], Module)
return Pcds.values()
## Resolve library names to library modules
|