else:\r
self.OutputPath = os.path.dirname(self.DscFile)\r
self.DefaultStores = None\r
- self.SkuIdMgr = SkuClass(self.SkuIdentifier, self.SkuIds)\r
+ self.SkuIdMgr = SkuClass(self.SkuName, self.SkuIds)\r
arraystr = self.SkuIdMgr.DumpSkuIdArrary()\r
\r
## XXX[key] = value\r
self._SupArchList = None\r
self._BuildTargets = None\r
self._SkuName = None\r
- self._SkuIdentifier = None\r
- self._AvilableSkuIds = None\r
self._PcdInfoFlag = None\r
self._VarCheckFlag = None\r
self._FlashDefinition = None\r
elif Name == TAB_DSC_DEFINES_SKUID_IDENTIFIER:\r
if self._SkuName == None:\r
self._SkuName = Record[2]\r
- self._SkuIdentifier = Record[2]\r
- self._AvilableSkuIds = Record[2]\r
+ if GlobalData.gSKUID_CMD:\r
+ self._SkuName = GlobalData.gSKUID_CMD\r
elif Name == TAB_DSC_DEFINES_PCD_INFO_GENERATION:\r
self._PcdInfoFlag = Record[2]\r
elif Name == TAB_DSC_DEFINES_PCD_VAR_CHECK_GENERATION:\r
return True\r
else:\r
return False\r
- def _GetAviableSkuIds(self):\r
- if self._AvilableSkuIds:\r
- return self._AvilableSkuIds\r
- return self.SkuIdentifier\r
- def _GetSkuIdentifier(self):\r
- if self._SkuName:\r
- return self._SkuName\r
- if self._SkuIdentifier == None:\r
- if self._Header == None:\r
- self._GetHeaderInfo()\r
- return self._SkuIdentifier\r
- ## Retrieve SKUID_IDENTIFIER\r
+\r
+ # # Retrieve SKUID_IDENTIFIER\r
def _GetSkuName(self):\r
if self._SkuName == None:\r
if self._Header == None:\r
self._GetHeaderInfo()\r
- if (self._SkuName == None or self._SkuName not in self.SkuIds):\r
+ if self._SkuName == None:\r
self._SkuName = 'DEFAULT'\r
return self._SkuName\r
\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
+ self._SkuIds[Record[1].upper()] = (Record[0], Record[1].upper(), Record[2].upper())\r
if 'DEFAULT' not in self._SkuIds:\r
self._SkuIds['DEFAULT'] = ("0","DEFAULT","DEFAULT")\r
if 'COMMON' not in self._SkuIds:\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
+ self.DefaultStores[Record[1].upper()] = (self.ToInt(Record[0]),Record[1].upper())\r
if TAB_DEFAULT_STORES_DEFAULT not in self.DefaultStores:\r
self.DefaultStores[TAB_DEFAULT_STORES_DEFAULT] = (0,TAB_DEFAULT_STORES_DEFAULT)\r
+ GlobalData.gDefaultStores = self.DefaultStores.keys()\r
+ if GlobalData.gDefaultStores:\r
+ GlobalData.gDefaultStores.sort()\r
return self.DefaultStores\r
\r
## Retrieve [Components] section information\r
\r
def _ValidatePcd(self, PcdCName, TokenSpaceGuid, Setting, PcdType, LineNo):\r
if self._DecPcds == None:\r
- self._DecPcds = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain)\r
+\r
FdfInfList = []\r
if GlobalData.gFdfParser:\r
FdfInfList = GlobalData.gFdfParser.Profile.InfList\r
continue\r
ModuleData = self._Bdb[ModuleFile, self._Arch, self._Target, self._Toolchain]\r
PkgSet.update(ModuleData.Packages)\r
- DecPcds = {}\r
- for Pkg in PkgSet:\r
- for Pcd in Pkg.Pcds:\r
- DecPcds[Pcd[0], Pcd[1]] = Pkg.Pcds[Pcd]\r
- self._DecPcds.update(DecPcds)\r
\r
- if (PcdCName, TokenSpaceGuid) not in self._DecPcds and "." in TokenSpaceGuid and (TokenSpaceGuid.split(".")[1], TokenSpaceGuid.split(".")[0]) not in self._DecPcds:\r
+ self._DecPcds = GetDeclaredPcd(self, self._Bdb, self._Arch, self._Target, self._Toolchain,PkgSet)\r
+\r
+\r
+ if (PcdCName, TokenSpaceGuid) not in self._DecPcds:\r
EdkLogger.error('build', PARSER_ERROR,\r
"Pcd (%s.%s) defined in DSC is not declared in DEC files. Arch: ['%s']" % (TokenSpaceGuid, PcdCName, self._Arch),\r
File=self.MetaFile, Line=LineNo)\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
+ 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.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
+ DefaultStoreMgr = DefaultStore(self.DefaultStores)\r
+ for pcd in HiiPcd:\r
+ for skuid in pcd.SkuInfoList:\r
+ skuobj = pcd.SkuInfoList.get(skuid)\r
+ if "STANDARD" not in skuobj.DefaultStoreDict:\r
+ PcdDefaultStoreSet = set([defaultstorename for defaultstorename in skuobj.DefaultStoreDict])\r
+ mindefaultstorename = DefaultStoreMgr.GetMin(PcdDefaultStoreSet)\r
+ skuobj.DefaultStoreDict['STANDARD'] = copy.deepcopy(skuobj.DefaultStoreDict[mindefaultstorename])\r
+ return Pcds\r
+\r
## Retrieve all PCD settings in platform\r
def _GetPcds(self):\r
if self._Pcds == None:\r
\r
self._Pcds = self.CompletePcdValues(self._Pcds)\r
self._Pcds = self.UpdateStructuredPcds(MODEL_PCD_TYPE_LIST, self._Pcds)\r
+ self._Pcds = self.CompleteHiiPcdsDefaultStores(self._Pcds)\r
self._Pcds = self._FilterPcdBySkuUsage(self._Pcds)\r
return self._Pcds\r
\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
+\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
# Find out all possible PCD candidates for self._Arch\r
RecordList = []\r
+\r
for Type in TypeList:\r
RecordList.extend(self._RawData[Type, self._Arch])\r
\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, default_store, Dummy4,Dummy5 in RecordList:\r
+ SkuName = SkuName.upper()\r
+ default_store = default_store.upper()\r
+ SkuName = 'DEFAULT' if SkuName == 'COMMON' else SkuName\r
if SkuName not in SkuIds:\r
continue\r
- SkuName = 'DEFAULT' if SkuName == 'COMMON' else SkuName\r
+\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
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
+ else:\r
+ EdkLogger.error('build', PARSER_ERROR,\r
+ "Pcd (%s.%s) defined in DSC is not declared in DEC files. Arch: ['%s']" % (str_pcd[0], str_pcd[1], self._Arch),\r
+ File=self.MetaFile,Line = StrPcdSet[str_pcd][0][5])\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
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
+ for skuid in SkuIds:\r
+ if skuid in stru_pcd.SkuOverrideValues:\r
+ continue\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(skuid)\r
+ NoDefault = False\r
+ while nextskuid not in stru_pcd.SkuOverrideValues:\r
+ if nextskuid == "DEFAULT":\r
+ NoDefault = True\r
+ 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} if DefaultStores else {'STANDARD':stru_pcd.DefaultValues})\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
+ NoDefault = False\r
if skuid not in stru_pcd.SkuOverrideValues:\r
while nextskuid not in stru_pcd.SkuOverrideValues:\r
+ if nextskuid == "DEFAULT":\r
+ NoDefault = True\r
+ break\r
nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
- stru_pcd.SkuOverrideValues[skuid] = {}\r
- PcdDefaultStoreSet = set([defaultstorename for defaultstorename in stru_pcd.SkuOverrideValues[skuid]])\r
+ if NoDefault:\r
+ continue\r
+ PcdDefaultStoreSet = set([defaultstorename for defaultstorename in stru_pcd.SkuOverrideValues[nextskuid]])\r
mindefaultstorename = DefaultStoreMgr.GetMin(PcdDefaultStoreSet)\r
+\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
+ stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid][mindefaultstorename])\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
str_pcd_obj = S_pcd_set.get((PcdName, PcdGuid))\r
if str_pcd_obj is None:\r
+ print PcdName, PcdGuid\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
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
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
+\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
+ 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
# tdict is a special dict kind of type, used for selecting correct\r
# PCD settings for certain ARCH\r
#\r
-\r
+ AvailableSkuIdSet = copy.copy(self.SkuIds)\r
\r
PcdDict = tdict(True, 3)\r
PcdSet = set()\r
RecordList = self._RawData[Type, self._Arch]\r
PcdValueDict = sdict()\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:\r
+ SkuName = SkuName.upper()\r
+ SkuName = 'DEFAULT' if SkuName == 'COMMON' else SkuName\r
+ if SkuName not in AvailableSkuIdSet:\r
+ EdkLogger.error('build ', PARAMETER_INVALID, 'Sku %s is not defined in [SkuIds] section' % SkuName,\r
+ File=self.MetaFile, Line=Dummy5)\r
if SkuName in (self.SkuIdMgr.SystemSkuId, 'DEFAULT', 'COMMON'):\r
if "." not in TokenSpaceGuid:\r
PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\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 + ' CHAR8 *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
+\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
+ PcdDefaultValue = StringToArray(Pcd.DefaultValue)\r
+\r
InitByteValue += '%s.%s.%s.%s|%s|%s\n' % (SkuName, DefaultStoreName, Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DatumType, PcdDefaultValue)\r
\r
#\r
else:\r
MakeApp = MakeApp + PcdGccMakefile\r
MakeApp = MakeApp + 'APPNAME = %s\n' % (PcdValueInitName) + 'OBJECTS = %s/%s.o\n' % (self.OutputPath, PcdValueInitName) + \\r
- 'include $(MAKEROOT)/Makefiles/app.makefile\n' + 'BUILD_CFLAGS += -Wno-error\n' + 'INCLUDE +='\r
+ 'include $(MAKEROOT)/Makefiles/app.makefile\n' + 'BUILD_CFLAGS += -Wno-pointer-to-int-cast -Wno-unused-variable\n' + 'INCLUDE +='\r
\r
PlatformInc = {}\r
for Cache in self._Bdb._CACHE_.values():\r
File.write(InitByteValue)\r
File.close()\r
\r
+ Messages = ''\r
if sys.platform == "win32":\r
StdOut, StdErr = self.ExecuteCommand ('nmake clean & nmake -f %s' % (MakeFileName))\r
+ Messages = StdOut\r
else:\r
StdOut, StdErr = self.ExecuteCommand ('make clean & make -f %s' % (MakeFileName))\r
- Messages = StdOut.split('\r')\r
+ Messages = StdErr\r
+ Messages = Messages.split('\n')\r
for Message in Messages:\r
- if " error " in Message:\r
+ if " error" in Message:\r
FileInfo = Message.strip().split('(')\r
- if len (FileInfo) > 0:\r
+ if len (FileInfo) > 1:\r
FileName = FileInfo [0]\r
FileLine = FileInfo [1].split (')')[0]\r
else:\r
dsc_line = error_line\r
\r
message_itmes = Message.split(":")\r
+ Index = 0\r
for item in message_itmes:\r
if "PcdValueInit.c" in item:\r
- message_itmes[message_itmes.index(item)] = dsc_line.strip()\r
+ Index = message_itmes.index(item)\r
+ message_itmes[Index] = dsc_line.strip()\r
+ break\r
\r
- EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, ":".join(message_itmes[1:]))\r
+ EdkLogger.error("build", PCD_STRUCTURE_PCD_ERROR, ":".join(message_itmes[Index:]))\r
\r
PcdValueInitExe = PcdValueInitName\r
if not sys.platform == "win32":\r
\r
\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:\r
+ SkuName = SkuName.upper()\r
+ SkuName = 'DEFAULT' if SkuName == 'COMMON' else SkuName\r
if SkuName not in AvailableSkuIdSet:\r
- continue\r
+ EdkLogger.error('build', PARAMETER_INVALID, 'Sku %s is not defined in [SkuIds] section' % SkuName,\r
+ File=self.MetaFile, Line=Dummy5)\r
if "." not in TokenSpaceGuid:\r
PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
\r
for pcd in Pcds.values():\r
pcdDecObject = self._DecPcds[pcd.TokenCName, pcd.TokenSpaceGuidCName]\r
+ # Only fix the value while no value provided in DSC file.\r
+ for sku in pcd.SkuInfoList.values():\r
+ if (sku.DefaultValue == "" or sku.DefaultValue==None):\r
+ sku.DefaultValue = pcdDecObject.DefaultValue\r
if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
valuefromDec = pcdDecObject.DefaultValue\r
SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', '', valuefromDec)\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 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
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
+ SkuIds = set([(skuid,skuobj.SkuId) for pcdobj in PcdSet.values() for skuid,skuobj in pcdobj.SkuInfoList.items()])\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
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.DefaultStoreDict[defaultstorename] = copy.deepcopy(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
+ for skuname,skuid in SkuIds:\r
+ if skuname not in PcdObj.SkuInfoList:\r
+ nextskuid = self.SkuIdMgr.GetNextSkuId(skuname)\r
while nextskuid not in PcdObj.SkuInfoList:\r
nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
- PcdObj.SkuInfoList[skuid] = PcdObj.SkuInfoList[nextskuid]\r
+ PcdObj.SkuInfoList[skuname] = copy.deepcopy(PcdObj.SkuInfoList[nextskuid])\r
+ PcdObj.SkuInfoList[skuname].SkuId = skuid\r
+ PcdObj.SkuInfoList[skuname].SkuIdName = skuname\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
RecordList = self._RawData[Type, self._Arch]\r
# Find out all possible PCD candidates for self._Arch\r
AvailableSkuIdSet = copy.copy(self.SkuIds)\r
+ DefaultStoresDefine = self._GetDefaultStores()\r
\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, DefaultStore, Dummy4,Dummy5 in RecordList:\r
+ SkuName = SkuName.upper()\r
+ SkuName = 'DEFAULT' if SkuName == 'COMMON' else SkuName\r
+ DefaultStore = DefaultStore.upper()\r
if DefaultStore == "COMMON":\r
DefaultStore = "STANDARD"\r
if SkuName not in AvailableSkuIdSet:\r
- continue\r
+ EdkLogger.error('build', PARAMETER_INVALID, 'Sku %s is not defined in [SkuIds] section' % SkuName,\r
+ File=self.MetaFile, Line=Dummy5)\r
+ if DefaultStore not in DefaultStoresDefine:\r
+ EdkLogger.error('build', PARAMETER_INVALID, 'DefaultStores %s is not defined in [DefaultStores] section' % DefaultStore,\r
+ File=self.MetaFile, Line=Dummy5)\r
if "." not in TokenSpaceGuid:\r
PcdSet.add((PcdCName, TokenSpaceGuid, SkuName,DefaultStore, Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid,DefaultStore] = Setting\r
sku.HiiDefaultValue = pcdDecObject.DefaultValue\r
if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
valuefromDec = pcdDecObject.DefaultValue\r
- SkuInfo = SkuInfoClass('DEFAULT', '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec)\r
+ SkuInfo = SkuInfoClass('DEFAULT', '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec,VariableAttribute=SkuInfoObj.VariableAttribute,DefaultStore={DefaultStore:valuefromDec})\r
pcd.SkuInfoList['DEFAULT'] = SkuInfo\r
elif 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']\r
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
MaxSize = 0\r
if pcdDecObject.DatumType == 'VOID*':\r
- for (skuname, skuobj) in pcd.SkuInfoList.items():\r
+ for (_, skuobj) in pcd.SkuInfoList.items():\r
datalen = 0\r
- if skuobj.HiiDefaultValue.startswith("L"):\r
- datalen = (len(skuobj.HiiDefaultValue) - 3 + 1) * 2\r
- elif skuobj.HiiDefaultValue.startswith("{"):\r
- datalen = len(skuobj.HiiDefaultValue.split(","))\r
- else:\r
- datalen = len(skuobj.HiiDefaultValue) - 2 + 1\r
+ skuobj.HiiDefaultValue = StringToArray(skuobj.HiiDefaultValue)\r
+ datalen = len(skuobj.HiiDefaultValue.split(","))\r
if datalen > MaxSize:\r
MaxSize = datalen\r
+ for defaultst in skuobj.DefaultStoreDict:\r
+ skuobj.DefaultStoreDict[defaultst] = StringToArray(skuobj.DefaultStoreDict[defaultst])\r
+ pcd.DefaultValue = StringToArray(pcd.DefaultValue)\r
pcd.MaxDatumSize = str(MaxSize)\r
- return Pcds\r
+ rt, invalidhii = self.CheckVariableNameAssignment(Pcds)\r
+ 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
+ invalidhii = []\r
+ for pcdname in Pcds:\r
+ pcd = Pcds[pcdname]\r
+ varnameset = set([sku.VariableName for (skuid,sku) in pcd.SkuInfoList.items()])\r
+ if len(varnameset) > 1:\r
+ invalidhii.append(".".join((pcdname[1],pcdname[0])))\r
+ if len(invalidhii):\r
+ return False,invalidhii\r
+ else:\r
+ return True, []\r
## Retrieve dynamic VPD PCD settings\r
#\r
# @param Type PCD type\r
AvailableSkuIdSet = copy.copy(self.SkuIds)\r
\r
for TokenSpaceGuid, PcdCName, Setting, Arch, SkuName, Dummy3, Dummy4,Dummy5 in RecordList:\r
+ SkuName = SkuName.upper()\r
+ SkuName = 'DEFAULT' if SkuName == 'COMMON' else SkuName\r
if SkuName not in AvailableSkuIdSet:\r
- continue\r
+ EdkLogger.error('build', PARAMETER_INVALID, 'Sku %s is not defined in [SkuIds] section' % SkuName,\r
+ File=self.MetaFile, Line=Dummy5)\r
if "." not in TokenSpaceGuid:\r
PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Dummy4))\r
PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] = Setting\r
for pcd in Pcds.values():\r
SkuInfoObj = pcd.SkuInfoList.values()[0]\r
pcdDecObject = self._DecPcds[pcd.TokenCName, pcd.TokenSpaceGuidCName]\r
+ # Only fix the value while no value provided in DSC file.\r
+ for sku in pcd.SkuInfoList.values():\r
+ if (sku.DefaultValue == "" or sku.DefaultValue==None):\r
+ sku.DefaultValue = pcdDecObject.DefaultValue\r
if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
valuefromDec = pcdDecObject.DefaultValue\r
SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', SkuInfoObj.VpdOffset, valuefromDec)\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 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
SupArchList = property(_GetSupArch)\r
BuildTargets = property(_GetBuildTarget)\r
SkuName = property(_GetSkuName, _SetSkuName)\r
- SkuIdentifier = property(_GetSkuIdentifier)\r
- AvilableSkuIds = property(_GetAviableSkuIds)\r
PcdInfoFlag = property(_GetPcdInfoFlag)\r
VarCheckFlag = property(_GetVarCheckFlag)\r
FlashDefinition = property(_GetFdfFile)\r
projects / mirror_edk2.git / blobdiff