self.OutputPath = os.path.join(os.getenv("WORKSPACE"), 'Build', PcdValueInitName)\r
else:\r
self.OutputPath = os.path.dirname(self.DscFile)\r
+ self.DefaultStores = None\r
+ self.SkuIdMgr = SkuClass(self.SkuIdentifier, self.SkuIds)\r
+ arraystr = self.SkuIdMgr.DumpSkuIdArrary()\r
\r
## XXX[key] = value\r
def __setitem__(self, key, value):\r
self._ISOLanguages = None\r
self._VpdToolGuid = None\r
self.__Macros = None\r
+ self.DefaultStores = None\r
\r
\r
## handle Override Path of Module\r
Macros = self._Macros\r
Macros["EDK_SOURCE"] = GlobalData.gEcpSource\r
for Record in RecordList:\r
- ModuleId = Record[5]\r
- LineNo = Record[6]\r
+ ModuleId = Record[6]\r
+ LineNo = Record[7]\r
ModuleFile = PathClass(NormPath(Record[0]), GlobalData.gWorkspace, Arch=self._Arch)\r
RecordList = self._RawData[MODEL_META_DATA_COMPONENT_SOURCE_OVERRIDE_PATH, self._Arch, None, ModuleId]\r
if RecordList != []:\r
if Record[1] in [None, '']:\r
EdkLogger.error('build', FORMAT_INVALID, 'No Sku ID name',\r
File=self.MetaFile, Line=Record[-1])\r
- self._SkuIds[Record[1]] = Record[0]\r
+ Pattern = re.compile('^[1-9]\d*|0$')\r
+ if Pattern.match(Record[0]) == None:\r
+ EdkLogger.error('build', FORMAT_INVALID, "The format of the Sku ID number is invalid. The correct format is '{(0-9)} {(1-9)(0-9)+}'",\r
+ File=self.MetaFile, Line=Record[-1])\r
+ if not IsValidWord(Record[1]):\r
+ EdkLogger.error('build', FORMAT_INVALID, "The format of the Sku ID name is invalid. The correct format is '(a-zA-Z0-9_)(a-zA-Z0-9_-.)*'",\r
+ File=self.MetaFile, Line=Record[-1])\r
+ self._SkuIds[Record[1]] = (Record[0],Record[1],Record[2])\r
if 'DEFAULT' not in self._SkuIds:\r
- self._SkuIds['DEFAULT'] = '0'\r
+ self._SkuIds['DEFAULT'] = ("0","DEFAULT","DEFAULT")\r
if 'COMMON' not in self._SkuIds:\r
- self._SkuIds['COMMON'] = '0'\r
+ self._SkuIds['COMMON'] = ("0","DEFAULT","DEFAULT")\r
return self._SkuIds\r
+ def ToInt(self,intstr):\r
+ return int(intstr,16) if intstr.upper().startswith("0X") else int(intstr)\r
+ def _GetDefaultStores(self):\r
+ if self.DefaultStores == None:\r
+ self.DefaultStores = sdict()\r
+ RecordList = self._RawData[MODEL_EFI_DEFAULT_STORES, self._Arch]\r
+ for Record in RecordList:\r
+ if Record[0] in [None, '']:\r
+ EdkLogger.error('build', FORMAT_INVALID, 'No DefaultStores ID number',\r
+ File=self.MetaFile, Line=Record[-1])\r
+ if Record[1] in [None, '']:\r
+ EdkLogger.error('build', FORMAT_INVALID, 'No DefaultStores ID name',\r
+ File=self.MetaFile, Line=Record[-1])\r
+ self.DefaultStores[Record[1]] = (self.ToInt(Record[0]),Record[1])\r
+ if TAB_DEFAULT_STORES_DEFAULT not in self.DefaultStores:\r
+ self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] = (0,TAB_DEFAULT_STORES_DEFAULT)\r
+ return self.DefaultStores\r
\r
## Retrieve [Components] section information\r
def _GetModules(self):\r
DuplicatedFile = False\r
\r
ModuleFile = PathClass(NormPath(Record[0], Macros), GlobalData.gWorkspace, Arch=self._Arch)\r
- ModuleId = Record[5]\r
- LineNo = Record[6]\r
+ ModuleId = Record[6]\r
+ LineNo = Record[7]\r
\r
# check the file validation\r
ErrorCode, ErrorInfo = ModuleFile.Validate('.inf')\r
for Type in [MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE, \\r
MODEL_PCD_FEATURE_FLAG, MODEL_PCD_DYNAMIC, MODEL_PCD_DYNAMIC_EX]:\r
RecordList = self._RawData[Type, self._Arch, None, ModuleId]\r
- for TokenSpaceGuid, PcdCName, Setting, Dummy1, Dummy2, Dummy3, Dummy4 in RecordList:\r
+ for TokenSpaceGuid, PcdCName, Setting, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:\r
TokenList = GetSplitValueList(Setting)\r
DefaultValue = TokenList[0]\r
if len(TokenList) > 1:\r
\r
# get module private build options\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, None, ModuleId]\r
- for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4 in RecordList:\r
+ for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:\r
if (ToolChainFamily, ToolChain) not in Module.BuildOptions:\r
Module.BuildOptions[ToolChainFamily, ToolChain] = Option\r
else:\r
RecordList = self._RawData[MODEL_EFI_LIBRARY_CLASS, self._Arch, None, -1]\r
Macros = self._Macros\r
for Record in RecordList:\r
- LibraryClass, LibraryInstance, Dummy, Arch, ModuleType, Dummy, LineNo = Record\r
+ LibraryClass, LibraryInstance, Dummy, Arch, ModuleType, Dummy,Dummy, LineNo = Record\r
if LibraryClass == '' or LibraryClass == 'NULL':\r
self._NullLibraryNumber += 1\r
LibraryClass = 'NULL%d' % self._NullLibraryNumber\r
ExtraData="%s.%s" % (TokenSpaceGuid, PcdCName))\r
return ValueList\r
\r
+ def _FilterPcdBySkuUsage(self,Pcds):\r
+ available_sku = self.SkuIdMgr.AvailableSkuIdSet\r
+ sku_usage = self.SkuIdMgr.SkuUsageType\r
+ if sku_usage == SkuClass.SINGLE:\r
+ 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
+ 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
+ return Pcds\r
## Retrieve all PCD settings in platform\r
def _GetPcds(self):\r
if self._Pcds == None:\r
self._Pcds.update(self._GetDynamicHiiPcd(MODEL_PCD_DYNAMIC_EX_HII))\r
self._Pcds.update(self._GetDynamicVpdPcd(MODEL_PCD_DYNAMIC_EX_VPD))\r
\r
+ self._Pcds = self.CompletePcdValues(self._Pcds)\r
self._Pcds = self.UpdateStructuredPcds(MODEL_PCD_TYPE_LIST, self._Pcds)\r
+ self._Pcds = self._FilterPcdBySkuUsage(self._Pcds)\r
return self._Pcds\r
\r
+ def _dumpPcdInfo(self,Pcds):\r
+ for pcd in Pcds:\r
+ pcdobj = Pcds[pcd]\r
+ if not pcdobj.TokenCName.startswith("Test"):\r
+ continue\r
+ for skuid in pcdobj.SkuInfoList:\r
+ if pcdobj.Type in (self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]):\r
+ for storename in pcdobj.SkuInfoList[skuid].DefaultStoreDict:\r
+ print "PcdCName: %s, SkuName: %s, StoreName: %s, Value: %s" % (".".join((pcdobj.TokenSpaceGuidCName, pcdobj.TokenCName)), skuid,storename,str(pcdobj.SkuInfoList[skuid].DefaultStoreDict[storename]))\r
+ else:\r
+ print "PcdCName: %s, SkuName: %s, Value: %s" % (".".join((pcdobj.TokenSpaceGuidCName, pcdobj.TokenCName)), skuid,str(pcdobj.SkuInfoList[skuid].DefaultValue))\r
## Retrieve [BuildOptions]\r
def _GetBuildOptions(self):\r
if self._BuildOptions == None:\r
#\r
for CodeBase in (EDKII_NAME, EDK_NAME):\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, CodeBase]\r
- for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4 in RecordList:\r
+ for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:\r
CurKey = (ToolChainFamily, ToolChain, CodeBase)\r
#\r
# Only flags can be appended\r
DriverType = '%s.%s' % (Edk, ModuleType)\r
CommonDriverType = '%s.%s' % ('COMMON', ModuleType)\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch, DriverType]\r
- for ToolChainFamily, ToolChain, Option, Arch, Type, Dummy3, Dummy4 in RecordList:\r
+ for ToolChainFamily, ToolChain, Option, Arch, Type, Dummy3, Dummy4,Dummy5 in RecordList:\r
if Type == DriverType or Type == CommonDriverType:\r
Key = (ToolChainFamily, ToolChain, Edk)\r
if Key not in options or not ToolChain.endswith('_FLAGS') or Option.startswith('='):\r
def GetStructurePcdInfo(self, PcdSet):\r
structure_pcd_data = {}\r
for item in PcdSet:\r
- if item[1] not in structure_pcd_data:\r
- structure_pcd_data[item[1]] = []\r
- structure_pcd_data[item[1]].append(item)\r
+ if (item[0],item[1]) not in structure_pcd_data:\r
+ structure_pcd_data[(item[0],item[1])] = []\r
+ structure_pcd_data[(item[0],item[1])].append(item)\r
\r
return structure_pcd_data\r
\r
+ def CompleteStructurePcdValue(self,pcdset):\r
+ skuset = set([item[3] for item in pcdset])\r
+ pcddatamap = {(item[0],item[1],item[2],item[3]):item for item in pcdset}\r
+ FieldSet = {}\r
+ for item in pcdset:\r
+ if (item[0],item[1]) not in FieldSet:\r
+ FieldSet[(item[0],item[1])] = set()\r
+ FieldSet[(item[0],item[1])].add(item[2])\r
+ completeset = []\r
+ for tockenspacename,pcdname, in FieldSet:\r
+ for field in FieldSet[(tockenspacename,pcdname)]:\r
+ for skuid in skuset:\r
+ nextskuid = skuid\r
+ while (tockenspacename,pcdname,field,nextskuid) not in pcddatamap:\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
+ if nextskuid == "DEFAULT":\r
+ break\r
+ if (tockenspacename,pcdname,field,nextskuid) not in pcddatamap:\r
+ continue\r
+ item = pcddatamap[tockenspacename,pcdname,field,nextskuid]\r
+ completeset.append((tockenspacename,pcdname,field,skuid, item[4],item[5], item[6]))\r
+ return completeset\r
def UpdateStructuredPcds(self, TypeList, AllPcds):\r
Pcds = AllPcds\r
- SkuObj = SkuClass(self.SkuIdentifier, self.SkuIds)\r
+ DefaultStoreMgr = DefaultStore(self.DefaultStores)\r
+ SkuIds = set([skuid for pcdobj in AllPcds.values() for skuid in pcdobj.SkuInfoList.keys()])\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
# Find out all possible PCD candidates for self._Arch\r
for Type in TypeList:\r
RecordList.extend(self._RawData[Type, self._Arch])\r
\r
- for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
+ for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, default_store, Dummy4,Dummy5 in RecordList:\r
+ if SkuName not in SkuIds:\r
+ continue\r
SkuName = 'DEFAULT' if SkuName == 'COMMON' else SkuName\r
- if SkuName in SkuObj.SkuIdSet and "." in TokenSpaceGuid:\r
- S_PcdSet.append((PcdCName, TokenSpaceGuid, SkuName, Dummy4, AnalyzePcdExpression(Setting)[0]))\r
+ if SkuName in SkuIds and "." in TokenSpaceGuid:\r
+ S_PcdSet.append(( TokenSpaceGuid.split(".")[0],TokenSpaceGuid.split(".")[1], PcdCName,SkuName, default_store,Dummy5, AnalyzePcdExpression(Setting)[0]))\r
+ S_PcdSet = self.CompleteStructurePcdValue(S_PcdSet)\r
\r
# handle pcd value override\r
StrPcdSet = self.GetStructurePcdInfo(S_PcdSet)\r
S_pcd_set = {}\r
for str_pcd in StrPcdSet:\r
- str_pcd_obj = Pcds.get((str_pcd.split(".")[1], str_pcd.split(".")[0]), None)\r
- str_pcd_dec = self._DecPcds.get((str_pcd.split(".")[1], str_pcd.split(".")[0]), None)\r
+ str_pcd_obj = Pcds.get((str_pcd[1], str_pcd[0]), None)\r
+ str_pcd_dec = self._DecPcds.get((str_pcd[1], str_pcd[0]), None)\r
if str_pcd_dec:\r
str_pcd_obj_str = StructurePcd()\r
str_pcd_obj_str.copy(str_pcd_dec)\r
if str_pcd_obj.DefaultValue:\r
str_pcd_obj_str.DefaultFromDSC = str_pcd_obj.DefaultValue\r
for str_pcd_data in StrPcdSet[str_pcd]:\r
- if str_pcd_data[2] in SkuObj.SkuIdSet:\r
- str_pcd_obj_str.AddOverrideValue(str_pcd_data[0], str(str_pcd_data[4]), 'DEFAULT' if str_pcd_data[2] == 'COMMON' else str_pcd_data[2],self.MetaFile.File,LineNo=str_pcd_data[3])\r
- S_pcd_set[str_pcd.split(".")[1], str_pcd.split(".")[0]] = str_pcd_obj_str\r
+ if str_pcd_data[3] in SkuIds:\r
+ str_pcd_obj_str.AddOverrideValue(str_pcd_data[2], str(str_pcd_data[6]), 'DEFAULT' if str_pcd_data[3] == 'COMMON' else str_pcd_data[3],'STANDARD' if str_pcd_data[4] == 'COMMON' else str_pcd_data[4], self.MetaFile.File,LineNo=str_pcd_data[5])\r
+ S_pcd_set[str_pcd[1], str_pcd[0]] = str_pcd_obj_str\r
# Add the Structure PCD that only defined in DEC, don't have override in DSC file\r
for Pcd in self._DecPcds:\r
if type (self._DecPcds[Pcd]) is StructurePcd:\r
S_pcd_set[Pcd] = str_pcd_obj_str\r
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
+ 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
+ nextskuid = skuid\r
+ if skuid not in stru_pcd.SkuOverrideValues:\r
+ while nextskuid not in stru_pcd.SkuOverrideValues:\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
+ stru_pcd.SkuOverrideValues[skuid] = {}\r
+ PcdDefaultStoreSet = set([defaultstorename for defaultstorename in stru_pcd.SkuOverrideValues[skuid]])\r
+ mindefaultstorename = DefaultStoreMgr.GetMin(PcdDefaultStoreSet)\r
+ for defaultstoreid in DefaultStores:\r
+ if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]:\r
+ stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorename]\r
+ for skuid in SkuIds:\r
+ if skuid in stru_pcd.SkuOverrideValues:\r
+ continue\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(skuid)\r
+ while nextskuid not in stru_pcd.SkuOverrideValues:\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
+ stru_pcd.SkuOverrideValues[skuid] = stru_pcd.SkuOverrideValues[nextskuid]\r
Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set)\r
if Str_Pcd_Values:\r
- for item in Str_Pcd_Values:\r
- str_pcd_obj = S_pcd_set.get((item[2], item[1]))\r
+ for (skuname,StoreName,PcdGuid,PcdName,PcdValue) in Str_Pcd_Values:\r
+ str_pcd_obj = S_pcd_set.get((PcdName, PcdGuid))\r
if str_pcd_obj is None:\r
raise\r
if str_pcd_obj.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],\r
self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
- if item[0] not in str_pcd_obj.SkuInfoList:\r
- str_pcd_obj.SkuInfoList[item[0]] = SkuInfoClass(SkuIdName=item[0], SkuId=self.SkuIds[item[0]], HiiDefaultValue=item[3])\r
+ if skuname not in str_pcd_obj.SkuInfoList:\r
+ str_pcd_obj.SkuInfoList[skuname] = SkuInfoClass(SkuIdName=skuname, SkuId=self.SkuIds[skuname][0], HiiDefaultValue=PcdValue, DefaultStore = {StoreName:PcdValue})\r
else:\r
- str_pcd_obj.SkuInfoList[item[0]].HiiDefaultValue = item[3]\r
+ str_pcd_obj.SkuInfoList[skuname].HiiDefaultValue = PcdValue\r
+ str_pcd_obj.SkuInfoList[skuname].DefaultStoreDict.update({StoreName:PcdValue})\r
elif str_pcd_obj.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD],\r
self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:\r
- if item[0] in (SkuObj.SystemSkuId, 'DEFAULT', 'COMMON'):\r
- str_pcd_obj.DefaultValue = item[3]\r
+ if skuname in (self.SkuIdMgr.SystemSkuId, 'DEFAULT', 'COMMON'):\r
+ str_pcd_obj.DefaultValue = PcdValue\r
else:\r
- if item[0] not in str_pcd_obj.SkuInfoList:\r
- str_pcd_obj.SkuInfoList[item[0]] = SkuInfoClass(SkuIdName=item[0], SkuId=self.SkuIds[item[0]], DefaultValue=item[3])\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
else:\r
- str_pcd_obj.SkuInfoList[item[0]].DefaultValue = item[3]\r
+ str_pcd_obj.SkuInfoList[skuname].DefaultValue = PcdValue\r
+ for str_pcd_obj in S_pcd_set.values():\r
+ if str_pcd_obj.Type not in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],\r
+ self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
+ continue\r
+ PcdDefaultStoreSet = set([defaultstorename for skuobj in str_pcd_obj.SkuInfoList.values() for defaultstorename in skuobj.DefaultStoreDict])\r
+ DefaultStoreObj = DefaultStore(self._GetDefaultStores())\r
+ mindefaultstorename = DefaultStoreObj.GetMin(PcdDefaultStoreSet)\r
+ str_pcd_obj.SkuInfoList[self.SkuIdMgr.SystemSkuId].HiiDefaultValue = str_pcd_obj.SkuInfoList[self.SkuIdMgr.SystemSkuId].DefaultStoreDict[mindefaultstorename]\r
\r
for str_pcd_obj in S_pcd_set.values():\r
+ if not str_pcd_obj.OverrideValues:\r
+ continue\r
str_pcd_obj.MaxDatumSize = self.GetStructurePcdMaxSize(str_pcd_obj)\r
Pcds[str_pcd_obj.TokenCName, str_pcd_obj.TokenSpaceGuidCName] = str_pcd_obj\r
\r
# PCD settings for certain ARCH\r
#\r
\r
- SkuObj = SkuClass(self.SkuIdentifier, self.SkuIds)\r
\r
PcdDict = tdict(True, 3)\r
PcdSet = set()\r
# Find out all possible PCD candidates for self._Arch\r
RecordList = self._RawData[Type, self._Arch]\r
- AvailableSkuIdSet = SkuObj.AvailableSkuIdSet.copy()\r
- AvailableSkuIdSet.update({'DEFAULT':0, 'COMMON':0})\r
PcdValueDict = sdict()\r
- for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
- if SkuName not in AvailableSkuIdSet:\r
- EdkLogger.error('Build', OPTION_VALUE_INVALID, "The SKUID name %s is not supported by the platform." % SkuName)\r
- if "." not in TokenSpaceGuid:\r
- PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\r
+ for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:\r
+ if SkuName in (self.SkuIdMgr.SystemSkuId, 'DEFAULT', 'COMMON'):\r
+ if "." not in TokenSpaceGuid:\r
+ PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\r
PcdDict[Arch, PcdCName, TokenSpaceGuid, SkuName] = Setting\r
- else:\r
- TokenSpaceGuid, PcdCName = TokenSpaceGuid.split('.')\r
- Flag = True\r
- for PcdItem in RecordList:\r
- if (TokenSpaceGuid, PcdCName) == (PcdItem[0], PcdItem[1]):\r
- Flag = False\r
- break\r
- if Flag:\r
- PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, 0))\r
- PcdDict[Arch, PcdCName, TokenSpaceGuid, SkuName] = ''\r
\r
for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdSet:\r
Setting = PcdDict[self._Arch, PcdCName, TokenSpaceGuid, SkuName]\r
PcdValue, DatumType, MaxDatumSize = PcdSetting['COMMON']\r
if 'DEFAULT' in PcdSetting:\r
PcdValue, DatumType, MaxDatumSize = PcdSetting['DEFAULT']\r
- if SkuObj.SystemSkuId in PcdSetting:\r
- PcdValue, DatumType, MaxDatumSize = PcdSetting[SkuObj.SystemSkuId]\r
+ if self.SkuIdMgr.SystemSkuId in PcdSetting:\r
+ PcdValue, DatumType, MaxDatumSize = PcdSetting[self.SkuIdMgr.SystemSkuId]\r
\r
Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
PcdCName,\r
\r
return Pcds\r
\r
+ def __UNICODE2OCTList(self,Value):\r
+ Value = Value.strip()\r
+ Value = Value[2:-1]\r
+ List = []\r
+ for Item in Value:\r
+ Temp = '%04X' % ord(Item)\r
+ List.append('0x' + Temp[2:4])\r
+ List.append('0x' + Temp[0:2])\r
+ List.append('0x00')\r
+ List.append('0x00')\r
+ return List\r
+ def __STRING2OCTList(self,Value):\r
+ OCTList = []\r
+ Value = Value.strip('"')\r
+ for char in Value:\r
+ Temp = '%02X' % ord(char)\r
+ OCTList.append('0x' + Temp)\r
+ OCTList.append('0x00')\r
+ return OCTList\r
+\r
def GetStructurePcdMaxSize(self, str_pcd):\r
pcd_default_value = str_pcd.DefaultValue\r
sku_values = [skuobj.HiiDefaultValue if str_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]] else skuobj.DefaultValue for skuobj in str_pcd.SkuInfoList.values()]\r
return Result\r
\r
def GenerateInitializeFunc(self, SkuName, DefaultStoreName, Pcd, InitByteValue, CApp):\r
- OverrideValues = None\r
+ OverrideValues = {DefaultStoreName:""}\r
if Pcd.SkuOverrideValues:\r
OverrideValues = Pcd.SkuOverrideValues[SkuName]\r
- CApp = CApp + 'void\n'\r
- CApp = CApp + 'Initialize_%s_%s_%s_%s(\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
- CApp = CApp + ' void\n'\r
- CApp = CApp + ' )\n'\r
- CApp = CApp + '{\n'\r
- CApp = CApp + ' UINT32 Size;\n'\r
- CApp = CApp + ' UINT32 FieldSize;\n'\r
- CApp = CApp + ' UINT8 *Value;\n'\r
- CApp = CApp + ' UINT32 OriginalSize;\n'\r
- CApp = CApp + ' VOID *OriginalPcd;\n'\r
- CApp = CApp + ' %s *Pcd;\n' % (Pcd.DatumType)\r
- CApp = CApp + '\n'\r
- InitByteValue += '%s.%s.%s.%s|%s|%s\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType, Pcd.DefaultValue)\r
+ for DefaultStoreName in OverrideValues.keys():\r
+ CApp = CApp + 'void\n'\r
+ CApp = CApp + 'Initialize_%s_%s_%s_%s(\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+ CApp = CApp + ' void\n'\r
+ CApp = CApp + ' )\n'\r
+ CApp = CApp + '{\n'\r
+ CApp = CApp + ' UINT32 Size;\n'\r
+ CApp = CApp + ' UINT32 FieldSize;\n'\r
+ CApp = CApp + ' UINT8 *Value;\n'\r
+ CApp = CApp + ' UINT32 OriginalSize;\n'\r
+ CApp = CApp + ' VOID *OriginalPcd;\n'\r
+ CApp = CApp + ' %s *Pcd;\n' % (Pcd.DatumType)\r
+ CApp = CApp + '\n'\r
+ Pcd.DefaultValue = Pcd.DefaultValue.strip()\r
+ if Pcd.DefaultValue.startswith('L"') and Pcd.DefaultValue.endswith('"'):\r
+ PcdDefaultValue = "{" + ",".join(self.__UNICODE2OCTList(Pcd.DefaultValue)) + "}"\r
+ elif Pcd.DefaultValue.startswith('"') and Pcd.DefaultValue.endswith('"'):\r
+ PcdDefaultValue = "{" + ",".join(self.__STRING2OCTList(Pcd.DefaultValue)) + "}"\r
+ else:\r
+ PcdDefaultValue = Pcd.DefaultValue\r
+ InitByteValue += '%s.%s.%s.%s|%s|%s\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType, PcdDefaultValue)\r
\r
- #\r
- # Get current PCD value and size\r
- #\r
- CApp = CApp + ' OriginalPcd = PcdGetPtr (%s, %s, %s, %s, &OriginalSize);\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+ #\r
+ # Get current PCD value and size\r
+ #\r
+ CApp = CApp + ' OriginalPcd = PcdGetPtr (%s, %s, %s, %s, &OriginalSize);\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
\r
- #\r
- # Determine the size of the PCD. For simple structures, sizeof(TYPE) provides\r
- # the correct value. For structures with a flexible array member, the flexible\r
- # array member is detected, and the size is based on the highest index used with\r
- # the flexible array member. The flexible array member must be the last field\r
- # in a structure. The size formula for this case is:\r
- # OFFSET_OF(FlexbleArrayField) + sizeof(FlexibleArray[0]) * (HighestIndex + 1)\r
- #\r
- CApp = CApp + ' Size = sizeof(%s);\n' % (Pcd.DatumType)\r
- for FieldList in [Pcd.DefaultValues, OverrideValues]:\r
- if not FieldList:\r
- continue\r
- for FieldName in FieldList:\r
- FieldName = "." + FieldName\r
- IsArray = self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])\r
- if IsArray:\r
- Value, ValueSize = ParseFieldValue (FieldList[FieldName.strip(".")][0])\r
- CApp = CApp + ' __FLEXIBLE_SIZE(Size, %s, %s, %d / __ARRAY_ELEMENT_SIZE(%s, %s) + ((%d %% __ARRAY_ELEMENT_SIZE(%s, %s)) ? 1 : 0));\n' % (Pcd.DatumType, FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."))\r
- else:\r
- NewFieldName = ''\r
- while '[' in FieldName:\r
- NewFieldName = NewFieldName + FieldName.split('[', 1)[0] + '[0]'\r
- ArrayIndex = int(FieldName.split('[', 1)[1].split(']', 1)[0])\r
- FieldName = FieldName.split(']', 1)[1]\r
- FieldName = NewFieldName + FieldName\r
- while '[' in FieldName:\r
- FieldName = FieldName.rsplit('[', 1)[0]\r
- CApp = CApp + ' __FLEXIBLE_SIZE(Size, %s, %s, %d);\n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1)\r
+ #\r
+ # Determine the size of the PCD. For simple structures, sizeof(TYPE) provides\r
+ # the correct value. For structures with a flexible array member, the flexible\r
+ # array member is detected, and the size is based on the highest index used with\r
+ # the flexible array member. The flexible array member must be the last field\r
+ # in a structure. The size formula for this case is:\r
+ # OFFSET_OF(FlexbleArrayField) + sizeof(FlexibleArray[0]) * (HighestIndex + 1)\r
+ #\r
+ CApp = CApp + ' Size = sizeof(%s);\n' % (Pcd.DatumType)\r
+ for FieldList in [Pcd.DefaultValues, OverrideValues.get(DefaultStoreName)]:\r
+ if not FieldList:\r
+ continue\r
+ for FieldName in FieldList:\r
+ FieldName = "." + FieldName\r
+ IsArray = self.IsFieldValueAnArray(FieldList[FieldName.strip(".")][0])\r
+ if IsArray:\r
+ Value, ValueSize = ParseFieldValue (FieldList[FieldName.strip(".")][0])\r
+ CApp = CApp + ' __FLEXIBLE_SIZE(Size, %s, %s, %d / __ARRAY_ELEMENT_SIZE(%s, %s));\n' % (Pcd.DatumType, FieldName.strip("."), ValueSize, Pcd.DatumType, FieldName.strip("."));\r
+ else:\r
+ NewFieldName = ''\r
+ while '[' in FieldName:\r
+ NewFieldName = NewFieldName + FieldName.split('[', 1)[0] + '[0]'\r
+ ArrayIndex = int(FieldName.split('[', 1)[1].split(']', 1)[0])\r
+ FieldName = FieldName.split(']', 1)[1]\r
+ FieldName = NewFieldName + FieldName\r
+ while '[' in FieldName:\r
+ FieldName = FieldName.rsplit('[', 1)[0]\r
+ CApp = CApp + ' __FLEXIBLE_SIZE(Size, %s, %s, %d);\n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1)\r
\r
- #\r
- # Allocate and zero buffer for the PCD\r
- # Must handle cases where current value is smaller, larger, or same size\r
- # Always keep that larger one as the current size\r
- #\r
- CApp = CApp + ' Size = (OriginalSize > Size ? OriginalSize : Size);\n'\r
- CApp = CApp + ' Pcd = (%s *)malloc (Size);\n' % (Pcd.DatumType)\r
- CApp = CApp + ' memset (Pcd, 0, Size);\n'\r
+ #\r
+ # Allocate and zero buffer for the PCD\r
+ # Must handle cases where current value is smaller, larger, or same size\r
+ # Always keep that larger one as the current size\r
+ #\r
+ CApp = CApp + ' Size = (OriginalSize > Size ? OriginalSize : Size);\n'\r
+ CApp = CApp + ' Pcd = (%s *)malloc (Size);\n' % (Pcd.DatumType)\r
+ CApp = CApp + ' memset (Pcd, 0, Size);\n'\r
\r
- #\r
- # Copy current PCD value into allocated buffer.\r
- #\r
- CApp = CApp + ' memcpy (Pcd, OriginalPcd, OriginalSize);\n'\r
- CApp = CApp + ' free (OriginalPcd);\n'\r
+ #\r
+ # Copy current PCD value into allocated buffer.\r
+ #\r
+ CApp = CApp + ' memcpy (Pcd, OriginalPcd, OriginalSize);\n'\r
\r
- #\r
- # Assign field values in PCD\r
- #\r
- for FieldList in [Pcd.DefaultValues, Pcd.DefaultFromDSC, OverrideValues]:\r
- if not FieldList:\r
- continue\r
- if Pcd.DefaultFromDSC and FieldList == Pcd.DefaultFromDSC:\r
- IsArray = self.IsFieldValueAnArray(FieldList)\r
- Value, ValueSize = ParseFieldValue (FieldList)\r
- if isinstance(Value, str):\r
- CApp = CApp + ' Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DefaultFromDSC)\r
- elif IsArray:\r
- #\r
- # Use memcpy() to copy value into field\r
- #\r
- CApp = CApp + ' Value = %s; // From DSC Default Value %s\n' % (self.IntToCString(Value, ValueSize), Pcd.DefaultFromDSC)\r
- CApp = CApp + ' memcpy (Pcd, Value, %d);\n' % (ValueSize)\r
- continue\r
+ #\r
+ # Assign field values in PCD\r
+ #\r
+ for FieldList in [Pcd.DefaultValues, Pcd.DefaultFromDSC,OverrideValues.get(DefaultStoreName)]:\r
+ if not FieldList:\r
+ continue\r
+ if Pcd.DefaultFromDSC and FieldList == Pcd.DefaultFromDSC:\r
+ IsArray = self.IsFieldValueAnArray(FieldList)\r
+ Value, ValueSize = ParseFieldValue (FieldList)\r
+ if isinstance(Value, str):\r
+ CApp = CApp + ' Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DefaultFromDSC)\r
+ elif IsArray:\r
+ #\r
+ # Use memcpy() to copy value into field\r
+ #\r
+ CApp = CApp + ' Value = %s; // From DSC Default Value %s\n' % (self.IntToCString(Value, ValueSize), Pcd.DefaultFromDSC)\r
+ CApp = CApp + ' memcpy (Pcd, Value, %d);\n' % (ValueSize)\r
+ continue\r
\r
- for FieldName in FieldList:\r
- IsArray = self.IsFieldValueAnArray(FieldList[FieldName][0])\r
- Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
- if isinstance(Value, str):\r
- CApp = CApp + ' Pcd->%s = %s; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
- elif IsArray:\r
- #\r
- # Use memcpy() to copy value into field\r
- #\r
- CApp = CApp + ' FieldSize = __FIELD_SIZE(%s, %s);\n' % (Pcd.DatumType, FieldName)\r
- CApp = CApp + ' Value = %s; // From %s Line %d Value %s\n' % (self.IntToCString(Value, ValueSize), FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
- CApp = CApp + ' memcpy (&Pcd->%s[0], Value, (FieldSize > 0 && FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize)\r
- else:\r
- if ValueSize > 4:\r
- CApp = CApp + ' Pcd->%s = %dULL; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ for FieldName in FieldList:\r
+ IsArray = self.IsFieldValueAnArray(FieldList[FieldName][0])\r
+ try:\r
+ Value, ValueSize = ParseFieldValue (FieldList[FieldName][0])\r
+ except Exception:\r
+ print FieldList[FieldName][0]\r
+ if isinstance(Value, str):\r
+ CApp = CApp + ' Pcd->%s = %s; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ elif IsArray:\r
+ #\r
+ # Use memcpy() to copy value into field\r
+ #\r
+ CApp = CApp + ' FieldSize = __FIELD_SIZE(%s, %s);\n' % (Pcd.DatumType, FieldName)\r
+ CApp = CApp + ' Value = %s; // From %s Line %d Value %s\n' % (self.IntToCString(Value, ValueSize), FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ CApp = CApp + ' memcpy (&Pcd->%s[0], Value, (FieldSize > 0 && FieldSize < %d) ? FieldSize : %d);\n' % (FieldName, ValueSize, ValueSize)\r
else:\r
- CApp = CApp + ' Pcd->%s = %d; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ if ValueSize > 4:\r
+ CApp = CApp + ' Pcd->%s = %dULL; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
+ else:\r
+ CApp = CApp + ' Pcd->%s = %d; // From %s Line %d Value %s\n' % (FieldName, Value, FieldList[FieldName][1], FieldList[FieldName][2], FieldList[FieldName][0])\r
\r
- #\r
- # Set new PCD value and size\r
- #\r
- CApp = CApp + ' PcdSetPtr (%s, %s, %s, %s, Size, (UINT8 *)Pcd);\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+ #\r
+ # Set new PCD value and size\r
+ #\r
+ CApp = CApp + ' PcdSetPtr (%s, %s, %s, %s, Size, (UINT8 *)Pcd);\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
\r
- #\r
- # Free PCD\r
- #\r
- CApp = CApp + ' free (Pcd);\n'\r
- CApp = CApp + '}\n'\r
- CApp = CApp + '\n'\r
+ #\r
+ # Free PCD\r
+ #\r
+ CApp = CApp + ' free (Pcd);\n'\r
+ CApp = CApp + '}\n'\r
+ CApp = CApp + '\n'\r
return InitByteValue, CApp\r
\r
def GenerateByteArrayValue (self, StructuredPcds):\r
for PcdName in StructuredPcds:\r
Pcd = StructuredPcds[PcdName]\r
if not Pcd.SkuOverrideValues:\r
- InitByteValue, CApp = self.GenerateInitializeFunc('DEFAULT', 'STANDARD', Pcd, InitByteValue, CApp)\r
+ InitByteValue, CApp = self.GenerateInitializeFunc(self.SkuIdMgr.SystemSkuId, 'STANDARD', Pcd, InitByteValue, CApp)\r
else:\r
for SkuName in Pcd.SkuOverrideValues:\r
for DefaultStoreName in Pcd.DefaultStoreName:\r
CApp = CApp + '{\n'\r
for Pcd in StructuredPcds.values():\r
if not Pcd.SkuOverrideValues:\r
- CApp = CApp + ' Initialize_%s_%s_%s_%s();\n' % ('DEFAULT', 'STANDARD', Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
+ CApp = CApp + ' Initialize_%s_%s_%s_%s();\n' % (self.SkuIdMgr.SystemSkuId, 'STANDARD', Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
else:\r
for SkuName in Pcd.SkuOverrideValues:\r
- for DefaultStoreName in Pcd.DefaultStoreName:\r
+ for DefaultStoreName in Pcd.SkuOverrideValues[SkuName]:\r
CApp = CApp + ' Initialize_%s_%s_%s_%s();\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName)\r
CApp = CApp + '}\n'\r
\r
for Pcd in FileBuffer:\r
PcdValue = Pcd.split ('|')\r
PcdInfo = PcdValue[0].split ('.')\r
- StructurePcdSet.append((PcdInfo[0], PcdInfo[2], PcdInfo[3], PcdValue[2].strip()))\r
+ StructurePcdSet.append((PcdInfo[0],PcdInfo[1], PcdInfo[2], PcdInfo[3], PcdValue[2].strip()))\r
return StructurePcdSet\r
\r
## Retrieve dynamic PCD settings\r
#\r
def _GetDynamicPcd(self, Type):\r
\r
- SkuObj = SkuClass(self.SkuIdentifier, self.SkuIds)\r
\r
Pcds = sdict()\r
#\r
PcdList = []\r
# Find out all possible PCD candidates for self._Arch\r
RecordList = self._RawData[Type, self._Arch]\r
- AvailableSkuIdSet = SkuObj.AvailableSkuIdSet.copy()\r
+ AvailableSkuIdSet = copy.copy(self.SkuIds)\r
\r
- AvailableSkuIdSet.update({'DEFAULT':0, 'COMMON':0})\r
\r
- for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
+ for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:\r
if SkuName not in AvailableSkuIdSet:\r
- EdkLogger.error('Build', OPTION_VALUE_INVALID, "The SKUID name %s is not supported by the platform." % SkuName)\r
+ continue\r
if "." not in TokenSpaceGuid:\r
PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
continue\r
\r
PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
- SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName], '', '', '', '', '', PcdValue)\r
+ SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', '', PcdValue)\r
if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
pcdObject.SkuInfoList[SkuName] = SkuInfo\r
del(pcd.SkuInfoList['COMMON'])\r
elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
del(pcd.SkuInfoList['COMMON'])\r
- if SkuObj.SkuUsageType == SkuObj.SINGLE:\r
- if 'DEFAULT' in pcd.SkuInfoList.keys() and SkuObj.SystemSkuId not in pcd.SkuInfoList.keys():\r
- pcd.SkuInfoList[SkuObj.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\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
return Pcds\r
return True\r
else:\r
return False\r
+ def CompletePcdValues(self,PcdSet):\r
+ Pcds = {}\r
+ DefaultStoreObj = DefaultStore(self._GetDefaultStores())\r
+ SkuIds = set([skuid for pcdobj in PcdSet.values() for skuid in pcdobj.SkuInfoList.keys()])\r
+ DefaultStores = set([storename for pcdobj in PcdSet.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])\r
+ for PcdCName, TokenSpaceGuid in PcdSet:\r
+ PcdObj = PcdSet[(PcdCName, TokenSpaceGuid)]\r
+ if PcdObj.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
+ Pcds[PcdCName, TokenSpaceGuid]= PcdObj\r
+ continue\r
+ PcdType = PcdObj.Type\r
+ if PcdType in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
+ for skuid in PcdObj.SkuInfoList:\r
+ skuobj = PcdObj.SkuInfoList[skuid]\r
+ mindefaultstorename = DefaultStoreObj.GetMin(set([defaultstorename for defaultstorename in skuobj.DefaultStoreDict]))\r
+ for defaultstorename in DefaultStores:\r
+ if defaultstorename not in skuobj.DefaultStoreDict:\r
+ skuobj.DefaultStoreDict[defaultstorename] = skuobj.DefaultStoreDict[mindefaultstorename]\r
+ skuobj.HiiDefaultValue = skuobj.DefaultStoreDict[mindefaultstorename]\r
+ for skuid in SkuIds:\r
+ if skuid not in PcdObj.SkuInfoList:\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(skuid)\r
+ while nextskuid not in PcdObj.SkuInfoList:\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
+ PcdObj.SkuInfoList[skuid] = PcdObj.SkuInfoList[nextskuid]\r
+ if PcdType in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
+ PcdObj.DefaultValue = PcdObj.SkuInfoList.values()[0].HiiDefaultValue if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE else PcdObj.SkuInfoList["DEFAULT"].HiiDefaultValue\r
+ Pcds[PcdCName, TokenSpaceGuid]= PcdObj\r
+ return Pcds\r
## Retrieve dynamic HII PCD settings\r
#\r
# @param Type PCD type\r
#\r
def _GetDynamicHiiPcd(self, Type):\r
\r
- SkuObj = SkuClass(self.SkuIdentifier, self.SkuIds)\r
VariableAttrs = {}\r
\r
Pcds = sdict()\r
# tdict is a special dict kind of type, used for selecting correct\r
# PCD settings for certain ARCH and SKU\r
#\r
- PcdDict = tdict(True, 4)\r
+ PcdDict = tdict(True, 5)\r
PcdSet = set()\r
RecordList = self._RawData[Type, self._Arch]\r
# Find out all possible PCD candidates for self._Arch\r
- AvailableSkuIdSet = SkuObj.AvailableSkuIdSet.copy()\r
+ AvailableSkuIdSet = copy.copy(self.SkuIds)\r
\r
- AvailableSkuIdSet.update({'DEFAULT':0, 'COMMON':0})\r
- for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
+ for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, DefaultStore, Dummy4,Dummy5 in RecordList:\r
+ if DefaultStore == "COMMON":\r
+ DefaultStore = "STANDARD"\r
if SkuName not in AvailableSkuIdSet:\r
- EdkLogger.error('Build', OPTION_VALUE_INVALID, "The SKUID name %s is not supported by the platform." % SkuName)\r
+ continue\r
if "." not in TokenSpaceGuid:\r
- PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\r
- PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
+ PcdSet.add((PcdCName, TokenSpaceGuid, SkuName,DefaultStore, Dummy4))\r
+ PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid,DefaultStore] = Setting\r
\r
\r
# Remove redundant PCD candidates, per the ARCH and SKU\r
- for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdSet:\r
+ for PcdCName, TokenSpaceGuid, SkuName,DefaultStore, Dummy4 in PcdSet:\r
\r
- Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid]\r
+ Setting = PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceGuid,DefaultStore]\r
if Setting == None:\r
continue\r
VariableName, VariableGuid, VariableOffset, DefaultValue, VarAttribute = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
if not self.CompareVarAttr(VariableAttrs[(VariableName, VariableGuid)], VarAttribute):\r
EdkLogger.error('Build', PCD_VARIABLE_ATTRIBUTES_CONFLICT_ERROR, "The variable %s.%s for DynamicHii PCDs has conflicting attributes [%s] and [%s] " % (VariableGuid, VariableName, VarAttribute, VariableAttrs[(VariableName, VariableGuid)]))\r
\r
- SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute)\r
pcdDecObject = self._DecPcds[PcdCName, TokenSpaceGuid]\r
if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
- pcdObject.SkuInfoList[SkuName] = SkuInfo\r
+ if SkuName in pcdObject.SkuInfoList:\r
+ Skuitem = pcdObject.SkuInfoList[SkuName]\r
+ Skuitem.DefaultStoreDict.update({DefaultStore:DefaultValue})\r
+ else:\r
+ SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute,DefaultStore={DefaultStore:DefaultValue})\r
+ pcdObject.SkuInfoList[SkuName] = SkuInfo\r
else:\r
+ SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], VariableName, VariableGuid, VariableOffset, DefaultValue, VariableAttribute=VarAttribute,DefaultStore={DefaultStore:DefaultValue})\r
Pcds[PcdCName, TokenSpaceGuid] = PcdClassObject(\r
PcdCName,\r
TokenSpaceGuid,\r
elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
del(pcd.SkuInfoList['COMMON'])\r
\r
- if SkuObj.SkuUsageType == SkuObj.SINGLE:\r
- if 'DEFAULT' in pcd.SkuInfoList.keys() and SkuObj.SystemSkuId not in pcd.SkuInfoList.keys():\r
- pcd.SkuInfoList[SkuObj.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\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
#\r
def _GetDynamicVpdPcd(self, Type):\r
\r
- SkuObj = SkuClass(self.SkuIdentifier, self.SkuIds)\r
\r
Pcds = sdict()\r
#\r
\r
# Find out all possible PCD candidates for self._Arch\r
RecordList = self._RawData[Type, self._Arch]\r
- AvailableSkuIdSet = SkuObj.AvailableSkuIdSet.copy()\r
+ AvailableSkuIdSet = copy.copy(self.SkuIds)\r
\r
- AvailableSkuIdSet.update({'DEFAULT':0, 'COMMON':0})\r
- for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4 in RecordList:\r
+ for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:\r
if SkuName not in AvailableSkuIdSet:\r
- EdkLogger.error('Build', OPTION_VALUE_INVALID, "The SKUID name %s is not supported by the platform." % SkuName)\r
+ continue\r
if "." not in TokenSpaceGuid:\r
PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
# until the DEC parser has been called.\r
#\r
VpdOffset, MaxDatumSize, InitialValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
- SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName], '', '', '', '', VpdOffset, InitialValue)\r
+ SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', VpdOffset, InitialValue)\r
if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
pcdObject.SkuInfoList[SkuName] = SkuInfo\r
del(pcd.SkuInfoList['COMMON'])\r
elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
del(pcd.SkuInfoList['COMMON'])\r
- if SkuObj.SkuUsageType == SkuObj.SINGLE:\r
- if 'DEFAULT' in pcd.SkuInfoList.keys() and SkuObj.SystemSkuId not in pcd.SkuInfoList.keys():\r
- pcd.SkuInfoList[SkuObj.SystemSkuId] = pcd.SkuInfoList['DEFAULT']\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
return Pcds\r
for Item in GetSplitValueList(self._CurrentLine[1:-1], TAB_COMMA_SPLIT):\r
if Item == '':\r
continue\r
- ItemList = GetSplitValueList(Item, TAB_SPLIT,2)\r
+ ItemList = GetSplitValueList(Item, TAB_SPLIT,3)\r
# different section should not mix in one section\r
if self._SectionName != '' and self._SectionName != ItemList[0].upper():\r
EdkLogger.error('Parser', FORMAT_INVALID, "Different section names in the same section",\r
S2 = ItemList[2].upper()\r
else:\r
S2 = 'COMMON'\r
- self._Scope.append([S1, S2])\r
+ if len(ItemList) > 3:\r
+ S3 = ItemList[3]\r
+ else:\r
+ S3 = "COMMON"\r
+ self._Scope.append([S1, S2, S3])\r
\r
# 'COMMON' must not be used with specific ARCHs at the same section\r
if 'COMMON' in ArchList and len(ArchList) > 1:\r
\r
## Construct section Macro dict \r
def _ConstructSectionMacroDict(self, Name, Value):\r
- ScopeKey = [(Scope[0], Scope[1]) for Scope in self._Scope]\r
+ ScopeKey = [(Scope[0], Scope[1],Scope[2]) for Scope in self._Scope]\r
ScopeKey = tuple(ScopeKey)\r
SectionDictKey = self._SectionType, ScopeKey\r
#\r
continue\r
\r
for ActiveScope in self._Scope:\r
- Scope0, Scope1 = ActiveScope[0], ActiveScope[1]\r
- if(Scope0, Scope1) not in Scope:\r
+ Scope0, Scope1 ,Scope2= ActiveScope[0], ActiveScope[1],ActiveScope[2]\r
+ if(Scope0, Scope1,Scope2) not in Scope:\r
break\r
else:\r
SpeSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])\r
\r
for ActiveScope in self._Scope:\r
- Scope0, Scope1 = ActiveScope[0], ActiveScope[1]\r
- if(Scope0, Scope1) not in Scope and (Scope0, "COMMON") not in Scope and ("COMMON", Scope1) not in Scope:\r
+ Scope0, Scope1,Scope2 = ActiveScope[0], ActiveScope[1],ActiveScope[2]\r
+ if(Scope0, Scope1,Scope2) not in Scope and (Scope0, "COMMON","COMMON") not in Scope and ("COMMON", Scope1,"COMMON") not in Scope:\r
break\r
else:\r
ComSpeMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])\r
\r
- if ("COMMON", "COMMON") in Scope:\r
+ if ("COMMON", "COMMON","COMMON") in Scope:\r
ComComMacroDict.update(self._SectionsMacroDict[(SectionType, Scope)])\r
\r
Macros.update(ComComMacroDict)\r
# Model, Value1, Value2, Value3, Arch, Platform, BelongsToItem=-1,\r
# LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1\r
#\r
- for Arch, Platform in self._Scope:\r
+ for Arch, Platform,_ in self._Scope:\r
LastItem = self._Store(self._SectionType,\r
self._ValueList[0],\r
self._ValueList[1],\r
# DSC file supported data types (one type per section)\r
DataType = {\r
TAB_SKUIDS.upper() : MODEL_EFI_SKU_ID,\r
+ TAB_DEFAULT_STORES.upper() : MODEL_EFI_DEFAULT_STORES,\r
TAB_LIBRARIES.upper() : MODEL_EFI_LIBRARY_INSTANCE,\r
TAB_LIBRARY_CLASSES.upper() : MODEL_EFI_LIBRARY_CLASS,\r
TAB_BUILD_OPTIONS.upper() : MODEL_META_DATA_BUILD_OPTION,\r
# Model, Value1, Value2, Value3, Arch, ModuleType, BelongsToItem=-1, BelongsToFile=-1,\r
# LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1\r
#\r
- for Arch, ModuleType in self._Scope:\r
+ for Arch, ModuleType, DefaultStore in self._Scope:\r
Owner = self._Owner[-1]\r
if self._SubsectionType != MODEL_UNKNOWN:\r
Owner = OwnerId[Arch]\r
self._ValueList[2],\r
Arch,\r
ModuleType,\r
+ DefaultStore,\r
Owner,\r
self._From,\r
self._LineIndex + 1,\r
ExtraData=self._CurrentLine)\r
\r
ItemType = self.DataType[DirectiveName]\r
- Scope = [['COMMON', 'COMMON']]\r
+ Scope = [['COMMON', 'COMMON','COMMON']]\r
if ItemType == MODEL_META_DATA_INCLUDE:\r
Scope = self._Scope\r
if ItemType == MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF:\r
# Model, Value1, Value2, Value3, Arch, ModuleType, BelongsToItem=-1, BelongsToFile=-1,\r
# LineBegin=-1, ColumnBegin=-1, LineEnd=-1, ColumnEnd=-1, Enabled=-1\r
#\r
- for Arch, ModuleType in Scope:\r
+ for Arch, ModuleType, DefaultStore in Scope:\r
self._LastItem = self._Store(\r
ItemType,\r
self._ValueList[0],\r
self._ValueList[2],\r
Arch,\r
ModuleType,\r
+ DefaultStore,\r
self._Owner[-1],\r
self._From,\r
self._LineIndex + 1,\r
\r
@ParseMacro\r
def _SkuIdParser(self):\r
+ TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT)\r
+ if len(TokenList) not in (2,3):\r
+ EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '<Integer>|<UiName>[|<UiName>]'",\r
+ ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
+ self._ValueList[0:len(TokenList)] = TokenList\r
+ @ParseMacro\r
+ def _DefaultStoresParser(self):\r
TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT)\r
if len(TokenList) != 2:\r
EdkLogger.error('Parser', FORMAT_INVALID, "Correct format is '<Integer>|<UiName>'",\r
MODEL_META_DATA_CONDITIONAL_STATEMENT_ENDIF : self.__ProcessDirective,\r
MODEL_META_DATA_CONDITIONAL_STATEMENT_ELSEIF : self.__ProcessDirective,\r
MODEL_EFI_SKU_ID : self.__ProcessSkuId,\r
+ MODEL_EFI_DEFAULT_STORES : self.__ProcessDefaultStores,\r
MODEL_EFI_LIBRARY_INSTANCE : self.__ProcessLibraryInstance,\r
MODEL_EFI_LIBRARY_CLASS : self.__ProcessLibraryClass,\r
MODEL_PCD_FIXED_AT_BUILD : self.__ProcessPcd,\r
self._ContentIndex = 0\r
self._InSubsection = False\r
while self._ContentIndex < len(self._Content) :\r
- Id, self._ItemType, V1, V2, V3, S1, S2, Owner, self._From, \\r
+ Id, self._ItemType, V1, V2, V3, S1, S2, S3,Owner, self._From, \\r
LineStart, ColStart, LineEnd, ColEnd, Enabled = self._Content[self._ContentIndex]\r
\r
if self._From < 0:\r
\r
self._ContentIndex += 1\r
\r
- self._Scope = [[S1, S2]]\r
+ self._Scope = [[S1, S2, S3]]\r
#\r
# For !include directive, handle it specially,\r
# merge arch and module type in case of duplicate items\r
if self._ContentIndex >= len(self._Content):\r
break\r
Record = self._Content[self._ContentIndex]\r
- if LineStart == Record[9] and LineEnd == Record[11]:\r
- if [Record[5], Record[6]] not in self._Scope:\r
- self._Scope.append([Record[5], Record[6]])\r
+ if LineStart == Record[10] and LineEnd == Record[12]:\r
+ if [Record[5], Record[6],Record[7]] not in self._Scope:\r
+ self._Scope.append([Record[5], Record[6],Record[7]])\r
self._ContentIndex += 1\r
else:\r
break\r
self._ValueList[2],\r
S1,\r
S2,\r
+ S3,\r
NewOwner,\r
self._From,\r
self._LineIndex + 1,\r
MODEL_PCD_DYNAMIC_VPD, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_DYNAMIC_EX_HII,\r
MODEL_PCD_DYNAMIC_EX_VPD):\r
Records = self._RawTable.Query(PcdType, BelongsToItem= -1.0)\r
- for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, ID, Line in Records:\r
+ for TokenSpaceGuid, PcdName, Value, Dummy2, Dummy3, Dummy4,ID, Line in Records:\r
Name = TokenSpaceGuid + '.' + PcdName\r
if Name not in GlobalData.gPlatformOtherPcds:\r
PcdLine = Line\r
def __ProcessSkuId(self):\r
self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)\r
for Value in self._ValueList]\r
+ def __ProcessDefaultStores(self):\r
+ self._ValueList = [ReplaceMacro(Value, self._Macros, RaiseError=True)\r
+ for Value in self._ValueList]\r
\r
def __ProcessLibraryInstance(self):\r
self._ValueList = [ReplaceMacro(Value, self._Macros) for Value in self._ValueList]\r
_SectionParser = {\r
MODEL_META_DATA_HEADER : _DefineParser,\r
MODEL_EFI_SKU_ID : _SkuIdParser,\r
+ MODEL_EFI_DEFAULT_STORES : _DefaultStoresParser,\r
MODEL_EFI_LIBRARY_INSTANCE : _LibraryInstanceParser,\r
MODEL_EFI_LIBRARY_CLASS : _LibraryClassParser,\r
MODEL_PCD_FIXED_AT_BUILD : _PcdParser,\r
projects / mirror_edk2.git / commitdiff