[PATCH] BaseTools:Some StructurePcd DecValue is redundant.

[PATCH] BaseTools:Some StructurePcd DecValue is redundant.

[Fan, ZhijuX]

Defined 2 PCDs(Test4 & Test401) and 2 SKUs(DEFAULT & _),
then set "SKUID_Defines" to ALL, for FixedAtBuild
gEfiStructuredPcdPkgTokenSpaceGuid. Test401 in this case,
its value should get from "Default" SKU, not from "_" SKU,
but we does not set value in SKU "_" in dsc, so Test401
should only display the value get from dec.

PCD value get from Dec file, so no *P and no DEC default
 value should be display in report.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
 BaseTools/Source/Python/build/BuildReport.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 65b2979c42..2879545f60 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1107,7 +1107,10 @@ class PcdReport(object):
                                 DscOverride = False
                             else:
                                 if not Pcd.SkuInfoList:
-                                    OverrideValues = Pcd.SkuOverrideValues
+                                    if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.gPcdSkuOverrides:
+                                        OverrideValues = GlobalData.gPcdSkuOverrides[(Pcd.TokenCName, Pcd.TokenSpaceGuidCName)]
+                                    else:
+                                        OverrideValues = Pcd.SkuOverrideValues
                                     if OverrideValues:
                                         for Data in OverrideValues.values():
                                             Struct = list(Data.values())
-- 
2.14.1.windows.1