# is pointed by *_*_*_VPD_TOOL_GUID in conf/tools_def.txt \r
#\r
#\r
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2010 - 2016, 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
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
#\r
-import os\r
+import Common.LongFilePathOs as os\r
import re\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
\r
FILE_COMMENT_TEMPLATE = \\r
"""\r
if not (FilePath != None or len(FilePath) != 0):\r
EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID, \r
"Invalid parameter FilePath: %s." % FilePath) \r
- try:\r
- fd = open(FilePath, "w")\r
- except:\r
- EdkLogger.error("VpdInfoFile", \r
- BuildToolError.FILE_OPEN_FAILURE, \r
- "Fail to open file %s for written." % FilePath)\r
- \r
- try:\r
- # write file header\r
- fd.write(FILE_COMMENT_TEMPLATE)\r
\r
- # write each of PCD in VPD type\r
- for Pcd in self._VpdArray.keys():\r
- for Offset in self._VpdArray[Pcd]:\r
- PcdValue = str(Pcd.SkuInfoList[Pcd.SkuInfoList.keys()[0]].DefaultValue).strip()\r
- if PcdValue == "" :\r
- PcdValue = Pcd.DefaultValue\r
- \r
- fd.write("%s.%s|%s|%s|%s \n" % (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, str(Offset).strip(), str(Pcd.MaxDatumSize).strip(),PcdValue))\r
- except:\r
- EdkLogger.error("VpdInfoFile",\r
- BuildToolError.FILE_WRITE_FAILURE,\r
- "Fail to write file %s" % FilePath) \r
- fd.close()\r
+ Content = FILE_COMMENT_TEMPLATE\r
+ Pcds = self._VpdArray.keys()\r
+ Pcds.sort()\r
+ for Pcd in Pcds:\r
+ i = 0\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 Offset in self._VpdArray[Pcd]:\r
+ PcdValue = str(Pcd.SkuInfoList[Pcd.SkuInfoList.keys()[i]].DefaultValue).strip()\r
+ if PcdValue == "" :\r
+ PcdValue = Pcd.DefaultValue\r
+\r
+ Content += "%s.%s|%s|%s|%s|%s \n" % (Pcd.TokenSpaceGuidCName, PcdTokenCName, str(Pcd.SkuInfoList.keys()[i]),str(Offset).strip(), str(Pcd.MaxDatumSize).strip(),PcdValue)\r
+ i += 1\r
+\r
+ return SaveFileOnChange(FilePath, Content, False)\r
\r
## Read an existing VPD PCD info file.\r
#\r
# the line must follow output format defined in BPDG spec.\r
#\r
try:\r
- PcdName, Offset, Size, Value = Line.split("#")[0].split("|")\r
+ PcdName, SkuId,Offset, Size, Value = Line.split("#")[0].split("|")\r
+ PcdName, SkuId,Offset, Size, Value = PcdName.strip(), SkuId.strip(),Offset.strip(), Size.strip(), Value.strip()\r
TokenSpaceName, PcdTokenName = PcdName.split(".")\r
except:\r
EdkLogger.error("BPDG", BuildToolError.PARSER_ERROR, "Fail to parse VPD information file %s" % FilePath)\r
\r
Found = False\r
+ \r
for VpdObject in self._VpdArray.keys():\r
- if VpdObject.TokenSpaceGuidCName == TokenSpaceName and VpdObject.TokenCName == PcdTokenName.strip():\r
- if self._VpdArray[VpdObject][0] == "*":\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
- \r
- self._VpdArray[VpdObject][0] = Offset\r
- Found = True\r
- break\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.keys():\r
+ if VpdObject.TokenSpaceGuidCName == TokenSpaceName and VpdObjectTokenCName == PcdTokenName.strip() and sku == SkuId:\r
+ if self._VpdArray[VpdObject][VpdObject.SkuInfoList.keys().index(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
+ Found = True\r
if not Found:\r
EdkLogger.error("BPDG", BuildToolError.PARSER_ERROR, "Can not find PCD defined in VPD guid file.")\r
\r
# @param ToolPath The string path name for BPDG tool\r
# @param VpdFileName The string path name for VPD information guid.txt\r
# \r
-def CallExtenalBPDGTool(ToolPath, VpdFilePath, VpdFileName):\r
+def CallExtenalBPDGTool(ToolPath, VpdFileName):\r
assert ToolPath != None, "Invalid parameter ToolPath"\r
- assert VpdFilePath != None and os.path.exists(VpdFilePath), "Invalid parameter VpdFileName"\r
+ assert VpdFileName != None and os.path.exists(VpdFileName), "Invalid parameter VpdFileName"\r
\r
- OutputDir = os.path.dirname(VpdFilePath)\r
- if (VpdFileName == None or VpdFileName == "") :\r
- FileName = os.path.basename(VpdFilePath)\r
- BaseName, ext = os.path.splitext(FileName)\r
- OutputMapFileName = os.path.join(OutputDir, "%s.map" % BaseName)\r
- OutputBinFileName = os.path.join(OutputDir, "%s.bin" % BaseName)\r
- else :\r
- OutputMapFileName = os.path.join(OutputDir, "%s.map" % VpdFileName)\r
- OutputBinFileName = os.path.join(OutputDir, "%s.bin" % VpdFileName)\r
+ OutputDir = os.path.dirname(VpdFileName)\r
+ FileName = os.path.basename(VpdFileName)\r
+ BaseName, ext = os.path.splitext(FileName)\r
+ OutputMapFileName = os.path.join(OutputDir, "%s.map" % BaseName)\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
- '-s',\r
+ '-q',\r
'-f',\r
- '-v',\r
- VpdFilePath],\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
projects / mirror_edk2.git / blobdiff