# @param Platform (not used for DscBuildData)\r
# @param Macros Macros used for replacement in DSC file\r
#\r
- def __init__(self, FilePath, RawData, BuildDataBase, Arch='COMMON', Target=None, Toolchain=None):\r
+ def __init__(self, FilePath, RawData, BuildDataBase, Arch=TAB_ARCH_COMMON, Target=None, Toolchain=None):\r
self.MetaFile = FilePath\r
self._RawData = RawData\r
self._Bdb = BuildDataBase\r
if self._Header is None:\r
self._GetHeaderInfo()\r
if self._SkuName is None:\r
- self._SkuName = 'DEFAULT'\r
+ self._SkuName = TAB_DEFAULT\r
return self._SkuName\r
\r
## Override SKUID_IDENTIFIER\r
#\r
# If command line defined, should override the value in DSC file.\r
#\r
- if 'FIX_LOAD_TOP_MEMORY_ADDRESS' in GlobalData.gCommandLineDefines.keys():\r
+ if 'FIX_LOAD_TOP_MEMORY_ADDRESS' in GlobalData.gCommandLineDefines:\r
try:\r
self._LoadFixAddress = int(GlobalData.gCommandLineDefines['FIX_LOAD_TOP_MEMORY_ADDRESS'], 0)\r
except:\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].upper()] = (str(DscBuildData.ToInt(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
- self._SkuIds['COMMON'] = ("0","DEFAULT","DEFAULT")\r
+ if TAB_DEFAULT not in self._SkuIds:\r
+ self._SkuIds[TAB_DEFAULT] = ("0", TAB_DEFAULT, TAB_DEFAULT)\r
+ if TAB_COMMON not in self._SkuIds:\r
+ self._SkuIds[TAB_COMMON] = ("0", TAB_DEFAULT, TAB_DEFAULT)\r
return self._SkuIds\r
\r
@staticmethod\r
self.DefaultStores[Record[1].upper()] = (DscBuildData.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
+ GlobalData.gDefaultStores = sorted(self.DefaultStores.keys())\r
return self.DefaultStores\r
\r
## Retrieve [Components] section information\r
ExtraData=ErrorInfo)\r
# Check duplication\r
# If arch is COMMON, no duplicate module is checked since all modules in all component sections are selected\r
- if self._Arch != 'COMMON' and ModuleFile in self._Modules:\r
+ if self._Arch != TAB_ARCH_COMMON and ModuleFile in self._Modules:\r
DuplicatedFile = True\r
\r
Module = ModuleBuildClassObject()\r
EdkLogger.error('build', ErrorCode, File=self.MetaFile, Line=LineNo,\r
ExtraData=ErrorInfo)\r
\r
- if ModuleType != 'COMMON' and ModuleType not in SUP_MODULE_LIST:\r
+ if ModuleType != TAB_COMMON and ModuleType not in SUP_MODULE_LIST:\r
EdkLogger.error('build', OPTION_UNKNOWN, "Unknown module type [%s]" % ModuleType,\r
File=self.MetaFile, ExtraData=LibraryInstance, Line=LineNo)\r
LibraryClassDict[Arch, ModuleType, LibraryClass] = LibraryInstance\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
+ Pcds[pcdname].SkuInfoList = {TAB_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
+ Pcds[pcdname].SkuOverrideValues = {TAB_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
self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE]]:\r
pcd.PcdValueFromComm = pcd.DefaultValue\r
elif pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:\r
- pcd.PcdValueFromComm = pcd.SkuInfoList.get("DEFAULT").HiiDefaultValue\r
+ pcd.PcdValueFromComm = pcd.SkuInfoList.get(TAB_DEFAULT).HiiDefaultValue\r
else:\r
- pcd.PcdValueFromComm = pcd.SkuInfoList.get("DEFAULT").DefaultValue\r
+ pcd.PcdValueFromComm = pcd.SkuInfoList.get(TAB_DEFAULT).DefaultValue\r
for pcd in self._Pcds:\r
if isinstance(self._Pcds[pcd],StructurePcd) and (self._Pcds[pcd].PcdValueFromComm or self._Pcds[pcd].PcdFieldValueFromComm):\r
UpdateCommandLineValue(self._Pcds[pcd])\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,Dummy5 in RecordList:\r
- if Dummy3.upper() != 'COMMON':\r
+ if Dummy3.upper() != TAB_COMMON:\r
continue\r
CurKey = (ToolChainFamily, ToolChain, CodeBase)\r
#\r
options = OrderedDict()\r
self._ModuleTypeOptions[Edk, ModuleType] = options\r
DriverType = '%s.%s' % (Edk, ModuleType)\r
- CommonDriverType = '%s.%s' % ('COMMON', ModuleType)\r
+ CommonDriverType = '%s.%s' % (TAB_COMMON, ModuleType)\r
RecordList = self._RawData[MODEL_META_DATA_BUILD_OPTION, self._Arch]\r
for ToolChainFamily, ToolChain, Option, Dummy1, Dummy2, Dummy3, Dummy4,Dummy5 in RecordList:\r
Type = Dummy2 + '.' + Dummy3\r
Pcds = AllPcds\r
DefaultStoreMgr = DefaultStore(self.DefaultStores)\r
SkuIds = self.SkuIdMgr.AvailableSkuIdSet\r
- SkuIds.update({'DEFAULT':0})\r
+ SkuIds.update({TAB_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
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
+ SkuName = TAB_DEFAULT if SkuName == TAB_COMMON else SkuName\r
if SkuName not in SkuIds:\r
continue\r
\r
str_pcd_obj_str.DefaultFromDSC = {skuname:{defaultstore: str_pcd_obj.SkuInfoList[skuname].DefaultStoreDict.get(defaultstore, str_pcd_obj.SkuInfoList[skuname].DefaultValue) for defaultstore in DefaultStores} for skuname in str_pcd_obj.SkuInfoList}\r
for str_pcd_data in StrPcdSet[str_pcd]:\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],TAB_DEFAULT_STORES_DEFAULT if str_pcd_data[4] == 'COMMON' else str_pcd_data[4], self.MetaFile.File if self.WorkspaceDir not in self.MetaFile.File else self.MetaFile.File[len(self.WorkspaceDir) if self.WorkspaceDir.endswith(os.path.sep) else len(self.WorkspaceDir)+1:],LineNo=str_pcd_data[5])\r
+ str_pcd_obj_str.AddOverrideValue(str_pcd_data[2], str(str_pcd_data[6]), TAB_DEFAULT if str_pcd_data[3] == TAB_COMMON else str_pcd_data[3],TAB_DEFAULT_STORES_DEFAULT if str_pcd_data[4] == TAB_COMMON else str_pcd_data[4], self.MetaFile.File if self.WorkspaceDir not in self.MetaFile.File else self.MetaFile.File[len(self.WorkspaceDir) if self.WorkspaceDir.endswith(os.path.sep) else len(self.WorkspaceDir)+1:],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
NoDefault = False\r
if skuid not in stru_pcd.SkuOverrideValues:\r
while nextskuid not in stru_pcd.SkuOverrideValues:\r
- if nextskuid == "DEFAULT":\r
+ if nextskuid == TAB_DEFAULT:\r
NoDefault = True\r
break\r
nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\r
NoDefault = False\r
if skuid not in stru_pcd.SkuOverrideValues:\r
while nextskuid not in stru_pcd.SkuOverrideValues:\r
- if nextskuid == "DEFAULT":\r
+ if nextskuid == TAB_DEFAULT:\r
NoDefault = True\r
break\r
nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\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 skuname in (self.SkuIdMgr.SystemSkuId, 'DEFAULT', 'COMMON'):\r
+ if skuname in (self.SkuIdMgr.SystemSkuId, TAB_DEFAULT, TAB_COMMON):\r
str_pcd_obj.DefaultValue = PcdValue\r
else:\r
if skuname not in str_pcd_obj.SkuInfoList:\r
nextskuid = self.SkuIdMgr.GetNextSkuId(skuname)\r
NoDefault = False\r
while nextskuid not in str_pcd_obj.SkuInfoList:\r
- if nextskuid == "DEFAULT":\r
+ if nextskuid == TAB_DEFAULT:\r
NoDefault = True\r
break\r
nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)\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
+ if TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ pcd.SkuInfoList[TAB_DEFAULT] = pcd.SkuInfoList[TAB_COMMON]\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
+ elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
\r
map(self.FilterSkuSettings,[Pcds[pcdkey] for pcdkey in Pcds if Pcds[pcdkey].Type in DynamicPcdType])\r
return Pcds\r
PcdValueDict = OrderedDict()\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
+ SkuName = TAB_DEFAULT if SkuName == TAB_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 SkuName in (self.SkuIdMgr.SystemSkuId, TAB_DEFAULT, TAB_COMMON):\r
if "." not in TokenSpaceGuid:\r
PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, Dummy5))\r
PcdDict[Arch, PcdCName, TokenSpaceGuid, SkuName] = Setting\r
else:\r
PcdValueDict[PcdCName, TokenSpaceGuid] = {SkuName:(PcdValue, DatumType, MaxDatumSize)}\r
\r
- PcdsKeys = PcdValueDict.keys()\r
- for PcdCName, TokenSpaceGuid in PcdsKeys:\r
-\r
- PcdSetting = PcdValueDict[PcdCName, TokenSpaceGuid]\r
+ for ((PcdCName,TokenSpaceGuid),PcdSetting) in PcdValueDict.iteritems():\r
PcdValue = None\r
DatumType = None\r
MaxDatumSize = None\r
- if 'COMMON' in PcdSetting:\r
- PcdValue, DatumType, MaxDatumSize = PcdSetting['COMMON']\r
- if 'DEFAULT' in PcdSetting:\r
- PcdValue, DatumType, MaxDatumSize = PcdSetting['DEFAULT']\r
+ if TAB_COMMON in PcdSetting:\r
+ PcdValue, DatumType, MaxDatumSize = PcdSetting[TAB_COMMON]\r
+ if TAB_DEFAULT in PcdSetting:\r
+ PcdValue, DatumType, MaxDatumSize = PcdSetting[TAB_DEFAULT]\r
if self.SkuIdMgr.SystemSkuId in PcdSetting:\r
PcdValue, DatumType, MaxDatumSize = PcdSetting[self.SkuIdMgr.SystemSkuId]\r
\r
\r
@staticmethod\r
def GetPcdMaxSize(Pcd):\r
+ if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r
+ return MAX_SIZE_TYPE[Pcd.DatumType]\r
+\r
MaxSize = int(Pcd.MaxDatumSize,10) if Pcd.MaxDatumSize else 0\r
- if Pcd.DatumType not in ['BOOLEAN','UINT8','UINT16','UINT32','UINT64']:\r
- if Pcd.PcdValueFromComm:\r
- if Pcd.PcdValueFromComm.startswith("{") and Pcd.PcdValueFromComm.endswith("}"):\r
- MaxSize = max([len(Pcd.PcdValueFromComm.split(",")),MaxSize])\r
- elif Pcd.PcdValueFromComm.startswith("\"") or Pcd.PcdValueFromComm.startswith("\'"):\r
- MaxSize = max([len(Pcd.PcdValueFromComm)-2+1,MaxSize])\r
- elif Pcd.PcdValueFromComm.startswith("L\""):\r
- MaxSize = max([2*(len(Pcd.PcdValueFromComm)-3+1),MaxSize])\r
- else:\r
- MaxSize = max([len(Pcd.PcdValueFromComm),MaxSize])\r
- elif Pcd.DatumType not in ['BOOLEAN','UINT8']:\r
- MaxSize = 1\r
- elif Pcd.DatumType == 'UINT16':\r
- MaxSize = 2\r
- elif Pcd.DatumType == 'UINT32':\r
- MaxSize = 4\r
- elif Pcd.DatumType == 'UINT64':\r
- MaxSize = 8\r
+ if Pcd.PcdValueFromComm:\r
+ if Pcd.PcdValueFromComm.startswith("{") and Pcd.PcdValueFromComm.endswith("}"):\r
+ return max([len(Pcd.PcdValueFromComm.split(",")),MaxSize])\r
+ elif Pcd.PcdValueFromComm.startswith("\"") or Pcd.PcdValueFromComm.startswith("\'"):\r
+ return max([len(Pcd.PcdValueFromComm)-2+1,MaxSize])\r
+ elif Pcd.PcdValueFromComm.startswith("L\""):\r
+ return max([2*(len(Pcd.PcdValueFromComm)-3+1),MaxSize])\r
+ else:\r
+ return max([len(Pcd.PcdValueFromComm),MaxSize])\r
return MaxSize\r
\r
def GenerateSizeFunction(self,Pcd):\r
FieldName = FieldName.rsplit('[', 1)[0]\r
CApp = CApp + ' __FLEXIBLE_SIZE(*Size, %s, %s, %d); // From %s Line %d Value %s\n' % (Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1, FieldList[FieldName_ori][1], FieldList[FieldName_ori][2], FieldList[FieldName_ori][0])\r
for skuname in Pcd.SkuOverrideValues:\r
- if skuname == "COMMON":\r
+ if skuname == TAB_COMMON:\r
continue\r
for defaultstorenameitem in Pcd.SkuOverrideValues[skuname]:\r
CApp = CApp + "// SkuName: %s, DefaultStoreName: %s \n" % (skuname, defaultstorenameitem)\r
CApp = CApp + ' UINT32 FieldSize;\n'\r
CApp = CApp + ' CHAR8 *Value;\n'\r
\r
- CApp = CApp + "// SkuName: %s, DefaultStoreName: %s \n" % ('DEFAULT', TAB_DEFAULT_STORES_DEFAULT)\r
+ CApp = CApp + "// SkuName: %s, DefaultStoreName: %s \n" % (TAB_DEFAULT, TAB_DEFAULT_STORES_DEFAULT)\r
inherit_OverrideValues = Pcd.SkuOverrideValues[SkuName]\r
- if (SkuName,DefaultStoreName) == ('DEFAULT',TAB_DEFAULT_STORES_DEFAULT):\r
- pcddefaultvalue = Pcd.DefaultFromDSC.get('DEFAULT',{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue\r
+ if (SkuName,DefaultStoreName) == (TAB_DEFAULT,TAB_DEFAULT_STORES_DEFAULT):\r
+ pcddefaultvalue = Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue\r
else:\r
if not Pcd.DscRawValue:\r
# handle the case that structure pcd is not appear in DSC\r
(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, FieldList))\r
Value, ValueSize = ParseFieldValue (FieldList)\r
\r
- if (SkuName,DefaultStoreName) == ('DEFAULT',TAB_DEFAULT_STORES_DEFAULT):\r
+ if (SkuName,DefaultStoreName) == (TAB_DEFAULT,TAB_DEFAULT_STORES_DEFAULT):\r
if isinstance(Value, str):\r
- CApp = CApp + ' Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DefaultFromDSC.get('DEFAULT',{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)\r
+ CApp = CApp + ' Pcd = %s; // From DSC Default Value %s\n' % (Value, Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)\r
elif IsArray:\r
#\r
# Use memcpy() to copy value into field\r
#\r
- CApp = CApp + ' Value = %s; // From DSC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DefaultFromDSC.get('DEFAULT',{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)\r
+ CApp = CApp + ' Value = %s; // From DSC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DefaultFromDSC.get(TAB_DEFAULT,{}).get(TAB_DEFAULT_STORES_DEFAULT, Pcd.DefaultValue) if Pcd.DefaultFromDSC else Pcd.DefaultValue)\r
CApp = CApp + ' memcpy (Pcd, Value, %d);\n' % (ValueSize)\r
else:\r
if isinstance(Value, str):\r
CApp = CApp + ' Value = %s; // From DSC Default Value %s\n' % (DscBuildData.IntToCString(Value, ValueSize), Pcd.DscRawValue.get(SkuName,{}).get(DefaultStoreName))\r
CApp = CApp + ' memcpy (Pcd, Value, %d);\n' % (ValueSize)\r
continue\r
- if (SkuName,DefaultStoreName) == ('DEFAULT',TAB_DEFAULT_STORES_DEFAULT) or (( (SkuName,'') not in Pcd.ValueChain) and ( (SkuName,DefaultStoreName) not in Pcd.ValueChain )):\r
+ if (SkuName,DefaultStoreName) == (TAB_DEFAULT,TAB_DEFAULT_STORES_DEFAULT) or (( (SkuName,'') not in Pcd.ValueChain) and ( (SkuName,DefaultStoreName) not in Pcd.ValueChain )):\r
for FieldName in FieldList:\r
IsArray = IsFieldValueAnArray(FieldList[FieldName][0])\r
if IsArray:\r
OverrideValues = {DefaultStore:""}\r
if Pcd.SkuOverrideValues:\r
OverrideValues = Pcd.SkuOverrideValues[SkuName]\r
- for DefaultStoreName in OverrideValues.keys():\r
+ for DefaultStoreName in OverrideValues:\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
\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
+ SkuName = TAB_DEFAULT if SkuName == TAB_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
\r
PcdValue, DatumType, MaxDatumSize = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', '', PcdValue)\r
- if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
+ if (PcdCName, TokenSpaceGuid) in Pcds:\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
pcdObject.SkuInfoList[SkuName] = SkuInfo\r
if MaxDatumSize.strip():\r
for sku in pcd.SkuInfoList.values():\r
if not sku.DefaultValue:\r
sku.DefaultValue = pcdDecObject.DefaultValue\r
- if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+ if TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON not in pcd.SkuInfoList:\r
valuefromDec = pcdDecObject.DefaultValue\r
- SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', '', 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
- del(pcd.SkuInfoList['COMMON'])\r
- elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
- del(pcd.SkuInfoList['COMMON'])\r
+ SkuInfo = SkuInfoClass(TAB_DEFAULT, '0', '', '', '', '', '', valuefromDec)\r
+ pcd.SkuInfoList[TAB_DEFAULT] = SkuInfo\r
+ elif TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ pcd.SkuInfoList[TAB_DEFAULT] = pcd.SkuInfoList[TAB_COMMON]\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
+ elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
\r
map(self.FilterSkuSettings,Pcds.values())\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
+ if TAB_DEFAULT in PcdObj.SkuInfoList and self.SkuIdMgr.SystemSkuId not in PcdObj.SkuInfoList:\r
+ PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId] = PcdObj.SkuInfoList[TAB_DEFAULT]\r
+ PcdObj.SkuInfoList = {TAB_DEFAULT:PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId]}\r
+ PcdObj.SkuInfoList[TAB_DEFAULT].SkuIdName = TAB_DEFAULT\r
+ PcdObj.SkuInfoList[TAB_DEFAULT].SkuId = '0'\r
\r
elif self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.DEFAULT:\r
- PcdObj.SkuInfoList = {'DEFAULT':PcdObj.SkuInfoList['DEFAULT']}\r
+ PcdObj.SkuInfoList = {TAB_DEFAULT:PcdObj.SkuInfoList[TAB_DEFAULT]}\r
\r
return PcdObj\r
\r
def CompletePcdValues(self,PcdSet):\r
Pcds = {}\r
DefaultStoreObj = DefaultStore(self._GetDefaultStores())\r
- SkuIds = {skuname:skuid for skuname,skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname !='COMMON'}\r
+ SkuIds = {skuname:skuid for skuname,skuid in self.SkuIdMgr.AvailableSkuIdSet.items() if skuname != TAB_COMMON}\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
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
+ PcdObj.DefaultValue = PcdObj.SkuInfoList.values()[0].HiiDefaultValue if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE else PcdObj.SkuInfoList[TAB_DEFAULT].HiiDefaultValue\r
Pcds[PcdCName, TokenSpaceGuid]= PcdObj\r
return Pcds\r
## Retrieve dynamic HII PCD settings\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
+ SkuName = TAB_DEFAULT if SkuName == TAB_COMMON else SkuName\r
DefaultStore = DefaultStore.upper()\r
- if DefaultStore == "COMMON":\r
+ if DefaultStore == TAB_COMMON:\r
DefaultStore = TAB_DEFAULT_STORES_DEFAULT\r
if SkuName not in AvailableSkuIdSet:\r
EdkLogger.error('build', PARAMETER_INVALID, 'Sku %s is not defined in [SkuIds] section' % SkuName,\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
pcdDecObject = self._DecPcds[PcdCName, TokenSpaceGuid]\r
- if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
+ if (PcdCName, TokenSpaceGuid) in Pcds:\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
if SkuName in pcdObject.SkuInfoList:\r
Skuitem = pcdObject.SkuInfoList[SkuName]\r
for default_store in sku.DefaultStoreDict:\r
sku.DefaultStoreDict[default_store]=pcdDecObject.DefaultValue\r
pcd.DefaultValue = pcdDecObject.DefaultValue\r
- if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+ if TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON not in pcd.SkuInfoList:\r
valuefromDec = pcdDecObject.DefaultValue\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
- del(pcd.SkuInfoList['COMMON'])\r
- elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
- del(pcd.SkuInfoList['COMMON'])\r
+ SkuInfo = SkuInfoClass(TAB_DEFAULT, '0', SkuInfoObj.VariableName, SkuInfoObj.VariableGuid, SkuInfoObj.VariableOffset, valuefromDec,VariableAttribute=SkuInfoObj.VariableAttribute,DefaultStore={DefaultStore:valuefromDec})\r
+ pcd.SkuInfoList[TAB_DEFAULT] = SkuInfo\r
+ elif TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ pcd.SkuInfoList[TAB_DEFAULT] = pcd.SkuInfoList[TAB_COMMON]\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
+ elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
\r
if pcd.MaxDatumSize.strip():\r
MaxSize = int(pcd.MaxDatumSize, 0)\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
+ SkuName = TAB_DEFAULT if SkuName == TAB_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
#\r
VpdOffset, MaxDatumSize, InitialValue = self._ValidatePcd(PcdCName, TokenSpaceGuid, Setting, Type, Dummy4)\r
SkuInfo = SkuInfoClass(SkuName, self.SkuIds[SkuName][0], '', '', '', '', VpdOffset, InitialValue)\r
- if (PcdCName, TokenSpaceGuid) in Pcds.keys():\r
+ if (PcdCName, TokenSpaceGuid) in Pcds:\r
pcdObject = Pcds[PcdCName, TokenSpaceGuid]\r
pcdObject.SkuInfoList[SkuName] = SkuInfo\r
if MaxDatumSize.strip():\r
for sku in pcd.SkuInfoList.values():\r
if not sku.DefaultValue:\r
sku.DefaultValue = pcdDecObject.DefaultValue\r
- if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' not in pcd.SkuInfoList.keys():\r
+ if TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON not in pcd.SkuInfoList:\r
valuefromDec = pcdDecObject.DefaultValue\r
- SkuInfo = SkuInfoClass('DEFAULT', '0', '', '', '', '', SkuInfoObj.VpdOffset, 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
- del(pcd.SkuInfoList['COMMON'])\r
- elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():\r
- del(pcd.SkuInfoList['COMMON'])\r
+ SkuInfo = SkuInfoClass(TAB_DEFAULT, '0', '', '', '', '', SkuInfoObj.VpdOffset, valuefromDec)\r
+ pcd.SkuInfoList[TAB_DEFAULT] = SkuInfo\r
+ elif TAB_DEFAULT not in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ pcd.SkuInfoList[TAB_DEFAULT] = pcd.SkuInfoList[TAB_COMMON]\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
+ elif TAB_DEFAULT in pcd.SkuInfoList and TAB_COMMON in pcd.SkuInfoList:\r
+ del pcd.SkuInfoList[TAB_COMMON]\r
\r
\r
map(self.FilterSkuSettings,Pcds.values())\r