# is pointed by *_*_*_VPD_TOOL_GUID in conf/tools_def.txt \r
#\r
#\r
-# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
import Common.EdkLogger as EdkLogger\r
import Common.BuildToolError as BuildToolError\r
import subprocess\r
+import Common.GlobalData as GlobalData\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
from Common.Misc import SaveFileOnChange\r
+from Common.DataType import *\r
\r
FILE_COMMENT_TEMPLATE = \\r
"""\r
# <NList> ::= <HexNumber> ["," <HexNumber>]*\r
#\r
class VpdInfoFile:\r
- \r
- ## The mapping dictionary from datum type to size string.\r
- _MAX_SIZE_TYPE = {"BOOLEAN":"1", "UINT8":"1", "UINT16":"2", "UINT32":"4", "UINT64":"8"}\r
+\r
_rVpdPcdLine = None \r
## Constructor\r
def __init__(self):\r
# @see BuildClassObject.PcdClassObject\r
# Value : offset in different SKU such as [sku1_offset, sku2_offset]\r
self._VpdArray = {}\r
+ self._VpdInfo = {}\r
\r
## Add a VPD PCD collected from platform's autogen when building.\r
#\r
#\r
# @param offset integer value for VPD's offset in specific SKU.\r
#\r
- def Add(self, Vpd, Offset):\r
- if (Vpd == None):\r
+ def Add(self, Vpd, skuname,Offset):\r
+ if (Vpd is None):\r
EdkLogger.error("VpdInfoFile", BuildToolError.ATTRIBUTE_UNKNOWN_ERROR, "Invalid VPD PCD entry.")\r
\r
if not (Offset >= 0 or Offset == "*"):\r
EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID, \r
"Invalid max datum size for VPD PCD %s.%s" % (Vpd.TokenSpaceGuidCName, Vpd.TokenCName))\r
elif Vpd.DatumType in ["BOOLEAN", "UINT8", "UINT16", "UINT32", "UINT64"]: \r
- if Vpd.MaxDatumSize == None or Vpd.MaxDatumSize == "":\r
- Vpd.MaxDatumSize = VpdInfoFile._MAX_SIZE_TYPE[Vpd.DatumType]\r
+ if Vpd.MaxDatumSize is None or Vpd.MaxDatumSize == "":\r
+ Vpd.MaxDatumSize = MAX_SIZE_TYPE[Vpd.DatumType]\r
else:\r
- EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID, \r
- "Invalid DatumType %s for VPD PCD %s.%s" % (Vpd.DatumType, Vpd.TokenSpaceGuidCName, Vpd.TokenCName))\r
+ if Vpd.MaxDatumSize <= 0:\r
+ EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID,\r
+ "Invalid max datum size for VPD PCD %s.%s" % (Vpd.TokenSpaceGuidCName, Vpd.TokenCName))\r
\r
- if Vpd not in self._VpdArray.keys():\r
+ if Vpd not in self._VpdArray:\r
#\r
# If there is no Vpd instance in dict, that imply this offset for a given SKU is a new one \r
#\r
- self._VpdArray[Vpd] = [Offset]\r
- else:\r
- #\r
- # If there is an offset for a specific SKU in dict, then append this offset for other sku to array.\r
- #\r
- self._VpdArray[Vpd].append(Offset)\r
+ self._VpdArray[Vpd] = {}\r
+\r
+ self._VpdArray[Vpd].update({skuname:Offset})\r
\r
\r
## Generate VPD PCD information into a text file\r
# If \r
# @param FilePath The given file path which would hold VPD information\r
def Write(self, FilePath):\r
- if not (FilePath != None or len(FilePath) != 0):\r
+ if not (FilePath is not None or len(FilePath) != 0):\r
EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID, \r
"Invalid parameter FilePath: %s." % FilePath) \r
\r
Pcds.sort()\r
for Pcd in Pcds:\r
i = 0\r
- for Offset in self._VpdArray[Pcd]:\r
- PcdValue = str(Pcd.SkuInfoList[Pcd.SkuInfoList.keys()[i]].DefaultValue).strip()\r
+ PcdTokenCName = Pcd.TokenCName\r
+ for PcdItem in GlobalData.MixedPcd:\r
+ if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:\r
+ PcdTokenCName = PcdItem[0]\r
+ for skuname in self._VpdArray[Pcd]:\r
+ PcdValue = str(Pcd.SkuInfoList[skuname].DefaultValue).strip()\r
if PcdValue == "" :\r
PcdValue = Pcd.DefaultValue\r
\r
- Content += "%s.%s|%s|%s|%s|%s \n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, str(Pcd.SkuInfoList.keys()[i]),str(Offset).strip(), str(Pcd.MaxDatumSize).strip(),PcdValue)\r
+ Content += "%s.%s|%s|%s|%s|%s \n" % (Pcd.TokenSpaceGuidCName, PcdTokenCName, skuname,str(self._VpdArray[Pcd][skuname]).strip(), str(Pcd.MaxDatumSize).strip(),PcdValue)\r
i += 1\r
\r
return SaveFileOnChange(FilePath, Content, False)\r
\r
Found = False\r
\r
- for VpdObject in self._VpdArray.keys():\r
- for sku in VpdObject.SkuInfoList.keys(): \r
- if VpdObject.TokenSpaceGuidCName == TokenSpaceName and VpdObject.TokenCName == PcdTokenName.strip() and sku == SkuId:\r
- if self._VpdArray[VpdObject][VpdObject.SkuInfoList.keys().index(sku)] == "*":\r
+ if (TokenSpaceName, PcdTokenName) not in self._VpdInfo:\r
+ self._VpdInfo[(TokenSpaceName, PcdTokenName)] = []\r
+ self._VpdInfo[(TokenSpaceName, PcdTokenName)].append((SkuId,Offset, Value))\r
+ for VpdObject in self._VpdArray:\r
+ VpdObjectTokenCName = VpdObject.TokenCName\r
+ for PcdItem in GlobalData.MixedPcd:\r
+ if (VpdObject.TokenCName, VpdObject.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:\r
+ VpdObjectTokenCName = PcdItem[0]\r
+ for sku in VpdObject.SkuInfoList:\r
+ if VpdObject.TokenSpaceGuidCName == TokenSpaceName and VpdObjectTokenCName == PcdTokenName.strip() and sku == SkuId:\r
+ if self._VpdArray[VpdObject][sku] == "*":\r
if Offset == "*":\r
EdkLogger.error("BPDG", BuildToolError.FORMAT_INVALID, "The offset of %s has not been fixed up by third-party BPDG tool." % PcdName) \r
- self._VpdArray[VpdObject][VpdObject.SkuInfoList.keys().index(sku)] = Offset\r
+ self._VpdArray[VpdObject][sku] = Offset\r
Found = True\r
if not Found:\r
EdkLogger.error("BPDG", BuildToolError.PARSER_ERROR, "Can not find PCD defined in VPD guid file.")\r
return None\r
\r
return self._VpdArray[vpd]\r
+ def GetVpdInfo(self,(PcdTokenName,TokenSpaceName)):\r
+ return self._VpdInfo.get((TokenSpaceName, PcdTokenName))\r
\r
## Call external BPDG tool to process VPD file\r
# \r
# @param VpdFileName The string path name for VPD information guid.txt\r
# \r
def CallExtenalBPDGTool(ToolPath, VpdFileName):\r
- assert ToolPath != None, "Invalid parameter ToolPath"\r
- assert VpdFileName != None and os.path.exists(VpdFileName), "Invalid parameter VpdFileName"\r
+ assert ToolPath is not None, "Invalid parameter ToolPath"\r
+ assert VpdFileName is not None and os.path.exists(VpdFileName), "Invalid parameter VpdFileName"\r
\r
OutputDir = os.path.dirname(VpdFileName)\r
FileName = os.path.basename(VpdFileName)\r
OutputBinFileName = os.path.join(OutputDir, "%s.bin" % BaseName)\r
\r
try:\r
- PopenObject = subprocess.Popen([ToolPath,\r
+ PopenObject = subprocess.Popen(' '.join([ToolPath,\r
'-o', OutputBinFileName, \r
'-m', OutputMapFileName,\r
'-q',\r
'-f',\r
- VpdFileName],\r
+ VpdFileName]),\r
stdout=subprocess.PIPE, \r
- stderr= subprocess.PIPE)\r
+ stderr= subprocess.PIPE,\r
+ shell=True)\r
except Exception, X:\r
EdkLogger.error("BPDG", BuildToolError.COMMAND_FAILURE, ExtraData="%s" % (str(X)))\r
(out, error) = PopenObject.communicate()\r
print out\r
- while PopenObject.returncode == None :\r
+ while PopenObject.returncode is None :\r
PopenObject.wait()\r
\r
if PopenObject.returncode != 0:\r
projects / mirror_edk2.git / blobdiff