BaseTools: Fixed the issue of Multiple Skus are always disables

When multiple skus are enabled, PCD database should record the supported SKUs.
This patch fixes PCD database to add the missing supported SKUs.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <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 63cda5a8ac106c6efae79ae8b9af924c55a64af2..28e575d2196ed659c0019c7d16a8aae145eb181a 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1842,7 +1842,8 @@ class PlatformAutoGen(AutoGen):
                 for (SkuName,SkuId) in allskuset:\r
                     if type(SkuId) in (str,unicode) and eval(SkuId) == 0 or SkuId == 0:\r
                         continue\r
-                    pcd.SkuInfoList[SkuName] = pcd.SkuInfoList['DEFAULT']\r
+                    pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList['DEFAULT'])\r
+                    pcd.SkuInfoList[SkuName].SkuId = SkuId\r
         self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList\r
 \r
     def FixVpdOffset(self,VpdFile ):\r

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index b60d33526a2e5dde02031cf4f9fbe9ed24b2b572..22283ef7fe2384d51aa27eb4c44c25a941531196 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -1083,9 +1083,8 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
         'SYSTEM_SKU_ID_VALUE'           : '0U'\r
     }\r
     \r
-   \r
-    SkuObj = SkuClass(Platform.Platform.SkuName, Platform.Platform.SkuIds)\r
-    Dict['SYSTEM_SKU_ID_VALUE'] = Platform.Platform.SkuIds[SkuObj.SystemSkuId][0]\r
+    SkuObj = Platform.Platform.SkuIdMgr\r
+    Dict['SYSTEM_SKU_ID_VALUE'] = 0 if SkuObj.SkuUsageType == SkuObj.SINGLE else Platform.Platform.SkuIds[SkuObj.SystemSkuId][0]\r
 \r
     Dict['PCD_INFO_FLAG'] = Platform.Platform.PcdInfoFlag\r
 \r

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index acf33ab03a497e71abd2bab6c35e6699945d4a25..e5f1f01556e5eecaff59ee7cd0082731cd2be8d5 100644 (file)
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -168,7 +168,7 @@ class StructurePcd(PcdClassObject):
             self.DefaultValues = PcdObject.DefaultValues if PcdObject.DefaultValues else self.DefaultValues\r
             self.PcdMode = PcdObject.PcdMode if PcdObject.PcdMode else self.PcdMode\r
             self.DefaultFromDSC=None\r
-            self.OverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
+            self.SkuOverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues\r
             self.FlexibleFieldName = PcdObject.FlexibleFieldName if PcdObject.FlexibleFieldName else self.FlexibleFieldName\r
             self.StructName = PcdObject.DatumType if PcdObject.DatumType else self.StructName\r
 \r

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index a5fceb9e2b614ee681f6de590451d058acd6df27..a2979ce9ea03f91d37061ed166b388a8e0d421b1 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -845,14 +845,14 @@ class DscBuildData(PlatformBuildClassObject):
             for pcdname in Pcds:\r
                 pcd = Pcds[pcdname]\r
                 Pcds[pcdname].SkuInfoList = {"DEFAULT":pcd.SkuInfoList[skuid] for skuid in pcd.SkuInfoList if skuid in available_sku}\r
-                if type(pcd) is StructurePcd and pcd.OverrideValues:\r
-                    Pcds[pcdname].OverrideValues = {"DEFAULT":pcd.OverrideValues[skuid] for skuid in pcd.OverrideValues if skuid in available_sku}\r
+                if type(pcd) is StructurePcd and pcd.SkuOverrideValues:\r
+                    Pcds[pcdname].SkuOverrideValues = {"DEFAULT":pcd.SkuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_sku}\r
         else:\r
             for pcdname in Pcds:\r
                 pcd = Pcds[pcdname]\r
                 Pcds[pcdname].SkuInfoList = {skuid:pcd.SkuInfoList[skuid] for skuid in pcd.SkuInfoList if skuid in available_sku}\r
-                if type(pcd) is StructurePcd and pcd.OverrideValues:\r
-                    Pcds[pcdname].OverrideValues = {skuid:pcd.OverrideValues[skuid] for skuid in pcd.OverrideValues if skuid in available_sku}\r
+                if type(pcd) is StructurePcd and pcd.SkuOverrideValues:\r
+                    Pcds[pcdname].SkuOverrideValues = {skuid:pcd.SkuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_sku}\r
         return Pcds\r
     def CompleteHiiPcdsDefaultStores(self,Pcds):\r
         HiiPcd = [Pcds[pcd] for pcd in Pcds if Pcds[pcd].Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]]\r
@@ -945,9 +945,18 @@ class DscBuildData(PlatformBuildClassObject):
         return structure_pcd_data\r
 \r
     def UpdateStructuredPcds(self, TypeList, AllPcds):\r
+\r
+        DynamicPcdType = [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT],\r
+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],\r
+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_VPD],\r
+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_DEFAULT],\r
+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII],\r
+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_VPD]]\r
+\r
         Pcds = AllPcds\r
         DefaultStoreMgr = DefaultStore(self.DefaultStores)\r
-        SkuIds = set([skuid for pcdobj in AllPcds.values() for skuid in pcdobj.SkuInfoList.keys()])\r
+        SkuIds = self.SkuIdMgr.AvailableSkuIdSet\r
+        SkuIds.update({'DEFAULT':0})\r
         DefaultStores = set([storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])\r
 \r
         S_PcdSet = []\r
@@ -1003,12 +1012,7 @@ class DscBuildData(PlatformBuildClassObject):
         if S_pcd_set:\r
             GlobalData.gStructurePcd[self.Arch] = S_pcd_set\r
         for stru_pcd in S_pcd_set.values():\r
-            if stru_pcd.Type not in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT],\r
-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],\r
-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_VPD],\r
-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_DEFAULT],\r
-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII],\r
-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_VPD]]:\r
+            if stru_pcd.Type not in DynamicPcdType:\r
                 continue\r
             if stru_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
                 for skuid in SkuIds:\r
@@ -1040,6 +1044,7 @@ class DscBuildData(PlatformBuildClassObject):
                         break\r
                     nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
                 stru_pcd.SkuOverrideValues[skuid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for defaultstorename in DefaultStores})\r
+\r
         Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set)\r
         if Str_Pcd_Values:\r
             for (skuname,StoreName,PcdGuid,PcdName,PcdValue) in Str_Pcd_Values:\r
@@ -1059,7 +1064,16 @@ class DscBuildData(PlatformBuildClassObject):
                         str_pcd_obj.DefaultValue = PcdValue\r
                 else:\r
                     if skuname not in str_pcd_obj.SkuInfoList:\r
-                        str_pcd_obj.SkuInfoList[skuname] = SkuInfoClass(SkuIdName=skuname, SkuId=self.SkuIds[skuname][0], DefaultValue=PcdValue)\r
+                        nextskuid = self.SkuIdMgr.GetNextSkuId(skuname)\r
+                        NoDefault = False\r
+                        while nextskuid not in str_pcd_obj.SkuInfoList:\r
+                            if nextskuid == "DEFAULT":\r
+                                NoDefault = True\r
+                                break\r
+                            nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
+                        str_pcd_obj.SkuInfoList[skuname] = copy.deepcopy(str_pcd_obj.SkuInfoList[nextskuid]) if not NoDefault else SkuInfoClass(SkuIdName=skuname, SkuId=self.SkuIds[skuname][0], DefaultValue=PcdValue)\r
+                        str_pcd_obj.SkuInfoList[skuname].SkuId = self.SkuIds[skuname][0]\r
+                        str_pcd_obj.SkuInfoList[skuname].SkuIdName = skuname\r
                     else:\r
                         str_pcd_obj.SkuInfoList[skuname].DefaultValue = PcdValue\r
             for str_pcd_obj in S_pcd_set.values():\r
@@ -1076,6 +1090,15 @@ class DscBuildData(PlatformBuildClassObject):
                 str_pcd_obj.MaxDatumSize = self.GetStructurePcdMaxSize(str_pcd_obj)\r
                 Pcds[str_pcd_obj.TokenCName, str_pcd_obj.TokenSpaceGuidCName] = str_pcd_obj\r
 \r
+            for pcdkey in Pcds:\r
+                pcd = Pcds[pcdkey]\r
+                if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+                    pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
+                    del(pcd.SkuInfoList['COMMON'])\r
+                elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
+                    del(pcd.SkuInfoList['COMMON'])\r
+\r
+        map(self.FilterSkuSettings,[Pcds[pcdkey] for pcdkey in Pcds if Pcds[pcdkey].Type in DynamicPcdType])\r
         return Pcds\r
 \r
     ## Retrieve non-dynamic PCD settings\r
@@ -1553,13 +1576,26 @@ class DscBuildData(PlatformBuildClassObject):
                 del(pcd.SkuInfoList['COMMON'])\r
             elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
                 del(pcd.SkuInfoList['COMMON'])\r
-            if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:\r
-                if 'DEFAULT' in pcd.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in pcd.SkuInfoList.keys():\r
-                    pcd.SkuInfoList[self.SkuIdMgr.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\r
-                del(pcd.SkuInfoList['DEFAULT'])\r
+\r
+        map(self.FilterSkuSettings,Pcds.values())\r
 \r
         return Pcds\r
 \r
+    def FilterSkuSettings(self, PcdObj):\r
+\r
+        if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:\r
+            if 'DEFAULT' in PcdObj.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in PcdObj.SkuInfoList.keys():\r
+                PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId] = PcdObj.SkuInfoList['DEFAULT']\r
+            PcdObj.SkuInfoList = {'DEFAULT':PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId]}\r
+            PcdObj.SkuInfoList['DEFAULT'].SkuIdName = 'DEFAULT'\r
+            PcdObj.SkuInfoList['DEFAULT'].SkuId = '0'\r
+\r
+        elif self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.DEFAULT:\r
+            PcdObj.SkuInfoList = {'DEFAULT':PcdObj.SkuInfoList['DEFAULT']}\r
+\r
+        return PcdObj\r
+\r
+\r
     def CompareVarAttr(self, Attr1, Attr2):\r
         if not Attr1 or not Attr2:  # for empty string\r
             return True\r
@@ -1731,11 +1767,6 @@ class DscBuildData(PlatformBuildClassObject):
             elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
                 del(pcd.SkuInfoList['COMMON'])\r
 \r
-            if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:\r
-                if 'DEFAULT' in pcd.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in pcd.SkuInfoList.keys():\r
-                    pcd.SkuInfoList[self.SkuIdMgr.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\r
-                del(pcd.SkuInfoList['DEFAULT'])\r
-\r
             if pcd.MaxDatumSize.strip():\r
                 MaxSize = int(pcd.MaxDatumSize, 0)\r
             else:\r
@@ -1755,6 +1786,9 @@ class DscBuildData(PlatformBuildClassObject):
         if not rt:\r
             invalidpcd = ",".join(invalidhii)\r
             EdkLogger.error('build', PCD_VARIABLE_INFO_ERROR, Message='The same HII PCD must map to the same EFI variable for all SKUs', File=self.MetaFile, ExtraData=invalidpcd)\r
+\r
+        map(self.FilterSkuSettings,Pcds.values())\r
+\r
         return Pcds\r
 \r
     def CheckVariableNameAssignment(self,Pcds):\r
@@ -1854,11 +1888,9 @@ class DscBuildData(PlatformBuildClassObject):
                 del(pcd.SkuInfoList['COMMON'])\r
             elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
                 del(pcd.SkuInfoList['COMMON'])\r
-            if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:\r
-                if 'DEFAULT' in pcd.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in pcd.SkuInfoList.keys():\r
-                    pcd.SkuInfoList[self.SkuIdMgr.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\r
-                del(pcd.SkuInfoList['DEFAULT'])\r
 \r
+\r
+        map(self.FilterSkuSettings,Pcds.values())\r
         return Pcds\r
 \r
     ## Add external modules\r

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index e1adaabe0c127c2482714e0e2d526fd26c674c1e..75e8ec97ab8a74e224aebc4008627099c8c5384b 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1014,7 +1014,7 @@ class PcdReport(object):
                         Pcd.DatumType = Pcd.StructName\r
                         if TypeName in ('DYNVPD', 'DEXVPD'):\r
                             Pcd.SkuInfoList = SkuInfoList\r
-                        if Pcd.OverrideValues:\r
+                        if Pcd.SkuOverrideValues:\r
                             DscMatch = True\r
                             DecMatch = False\r
                     #\r
@@ -1107,7 +1107,7 @@ class PcdReport(object):
             else:\r
                 FileWrite(File, ' %-*s   : %6s %10s = %s' % (self.MaxLen, Flag + ' ' + PcdTokenCName, TypeName, '(' + Pcd.DatumType + ')', Value))\r
             if IsStructure:\r
-                OverrideValues = Pcd.OverrideValues\r
+                OverrideValues = Pcd.SkuOverrideValues\r
                 if OverrideValues:\r
                     Keys = OverrideValues.keys()\r
                     Data = OverrideValues[Keys[0]]\r
@@ -1142,7 +1142,7 @@ class PcdReport(object):
                                     FileWrite(File, ' %-*s   : %6s %10s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', '(' + DefaultStore + ')', Value))\r
                             FileWrite(File, '%*s: %s: %s' % (self.MaxLen + 4, SkuInfo.VariableGuid, SkuInfo.VariableName, SkuInfo.VariableOffset))\r
                             if IsStructure:\r
-                                OverrideValues = Pcd.OverrideValues[Sku]\r
+                                OverrideValues = Pcd.SkuOverrideValues[Sku]\r
                                 Struct = OverrideValues[DefaultStore]\r
                                 self.PrintStructureInfo(File, Struct)\r
                             self.PrintPcdDefault(File, Pcd, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue)\r
@@ -1166,7 +1166,7 @@ class PcdReport(object):
                             FileWrite(File, ' %-*s   : %6s %10s %10s = %s' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))\r
                     FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.VpdOffset))\r
                     if IsStructure:\r
-                        OverrideValues = Pcd.OverrideValues[Sku]\r
+                        OverrideValues = Pcd.SkuOverrideValues[Sku]\r
                         if OverrideValues:\r
                             Keys = OverrideValues.keys()\r
                             Struct = OverrideValues[Keys[0]]\r
@@ -1191,7 +1191,7 @@ class PcdReport(object):
                         else:\r
                             FileWrite(File, ' %-*s   : %6s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))\r
                     if IsStructure:\r
-                        OverrideValues = Pcd.OverrideValues[Sku]\r
+                        OverrideValues = Pcd.SkuOverrideValues[Sku]\r
                         if OverrideValues:\r
                             Keys = OverrideValues.keys()\r
                             Struct = OverrideValues[Keys[0]]\r