BaseTools: Fixed incorrect VPD size.

The VPD size is incorrect if that VPD is not used in Module.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Feng Bob C <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 2800820b72ed61442adc43302879b789a3ae975f..ab178c9a4ab8170baf918cc1a722b60a16a4686e 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1746,14 +1746,12 @@ class PlatformAutoGen(AutoGen):
                         if not FoundFlag :\r
                             # just pick the a value to determine whether is unicode string type\r
                             SkuValueMap = {}\r
                         if not FoundFlag :\r
                             # just pick the a value to determine whether is unicode string type\r
                             SkuValueMap = {}\r

+                            SkuObjList = DscPcdEntry.SkuInfoList.items()\r

                             DefaultSku = DscPcdEntry.SkuInfoList.get('DEFAULT')\r
                             if DefaultSku:\r
                             DefaultSku = DscPcdEntry.SkuInfoList.get('DEFAULT')\r
                             if DefaultSku:\r

-                                PcdValue = DefaultSku.DefaultValue\r
-                                if PcdValue not in SkuValueMap:\r
-                                    SkuValueMap[PcdValue] = []\r
-                                    VpdFile.Add(DscPcdEntry, 'DEFAULT',DefaultSku.VpdOffset)\r
-                                SkuValueMap[PcdValue].append(DefaultSku)\r
-                            for (SkuName,Sku) in DscPcdEntry.SkuInfoList.items():\r
+                                defaultindex = SkuObjList.index(('DEFAULT',DefaultSku))\r
+                                SkuObjList[0],SkuObjList[defaultindex] = SkuObjList[defaultindex],SkuObjList[0]\r
+                            for (SkuName,Sku) in SkuObjList:\r

                                 Sku.VpdOffset = Sku.VpdOffset.strip() \r
                                 \r
                                 # Need to iterate DEC pcd information to get the value & datumtype\r
                                 Sku.VpdOffset = Sku.VpdOffset.strip() \r
                                 \r
                                 # Need to iterate DEC pcd information to get the value & datumtype\r