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
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
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
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
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 = True\r
break\r
nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
- stru_pcd.SkuOverrideValues[skuid] = {}\r
if NoDefault:\r
continue\r
PcdDefaultStoreSet = set([defaultstorename for defaultstorename in stru_pcd.SkuOverrideValues[nextskuid]])\r
for defaultstoreid in DefaultStores:\r
if defaultstoreid not in stru_pcd.SkuOverrideValues[skuid]:\r
stru_pcd.SkuOverrideValues[skuid][defaultstoreid] = copy.deepcopy(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
- 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})\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.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
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
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
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
if pcdDecObject.DatumType == 'VOID*':\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
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
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