BaseTools:Fix the issue that build report failed

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2201

An error occurs using special VpdPcd that is not used in the Inf file

In dsc:
[PcdsDynamicExVpd.common.DEFAULT]
gBoardModuleTokenSpaceGuid.test1|*|{CODE({
  {0x0}  // terminator
})}

In dec:
[PcdsDynamicEx]
# Vpd GPIO table
  gBoardModuleTokenSpaceGuid.test1|{0}|GPIO_INIT_CONFIG[]|0x50000018 {
  <HeaderFiles>
    Library/GpioLib.h
  <Packages>
    MdePkg/MdePkg.dec
}
ValueError: invalid literal for int() with base 0: '*'

This Patch is going to fix issue

Cc: Liming Gao <liming.gao@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 6b26f1c3b0..880459d367 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1419,10 +1419,19 @@ class PcdReport(object):
                         FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.VpdOffset))

                         VPDPcdItem = (Pcd.TokenSpaceGuidCName + '.' + PcdTokenCName, SkuIdName, SkuInfo.VpdOffset, Pcd.MaxDatumSize, SkuInfo.DefaultValue)

                         if VPDPcdItem not in VPDPcdList:

-                            VPDPcdList.append(VPDPcdItem)

+                            PcdGuidList = self.UnusedPcds.get(Pcd.TokenSpaceGuidCName)

+                            if PcdGuidList:

+                                PcdList = PcdGuidList.get(Pcd.Type)

+                                if not PcdList:

+                                    VPDPcdList.append(VPDPcdItem)

+                                for VpdPcd in PcdList:

+                                    if PcdTokenCName == VpdPcd.TokenCName:

+                                        break

+                                else:

+                                    VPDPcdList.append(VPDPcdItem)

                     if IsStructure:

                         FiledOverrideFlag = False

-                        OverrideValues = Pcd.SkuOverrideValues[Sku]

+                        OverrideValues = Pcd.SkuOverrideValues.get(Sku)

                         if OverrideValues:

                             Keys = list(OverrideValues.keys())

                             OverrideFieldStruct = self.OverrideFieldValue(Pcd, OverrideValues[Keys[0]])