# @param BaseName The full file path of image. \r
# @param Guid The GUID for image.\r
# @param Arch Arch of this image.\r
- # @param OutpuDir The output directory for image.\r
+ # @param OutputDir The output directory for image.\r
+ # @param DebugDir The debug directory for image.\r
# @param ImageClass PeImage Information\r
#\r
- def __init__(self, BaseName, Guid, Arch, OutpuDir, ImageClass):\r
+ def __init__(self, BaseName, Guid, Arch, OutputDir, DebugDir, ImageClass):\r
self.BaseName = BaseName\r
self.Guid = Guid\r
self.Arch = Arch\r
- self.OutpuDir = OutpuDir\r
+ self.OutputDir = OutputDir\r
+ self.DebugDir = DebugDir\r
self.Image = ImageClass\r
self.Image.Size = (self.Image.Size / 0x1000 + 1) * 0x1000\r
\r
BuildTarget, FlashDefinition, FdList=[], FvList=[],\r
MakefileType="nmake", SilentMode=False, ThreadNumber=2,\r
SkipAutoGen=False, Reparse=False, SkuId=None, \r
- ReportFile=None, ReportType=None):\r
+ ReportFile=None, ReportType=None, UniFlag=None):\r
\r
self.WorkspaceDir = WorkspaceDir\r
self.Target = Target\r
self.BuildDatabase = self.Db.BuildObject\r
self.Platform = None\r
self.LoadFixAddress = 0\r
+ self.UniFlag = UniFlag\r
\r
# print dot charater during doing some time-consuming work\r
self.Progress = Utils.Progressor()\r
sys.stdout.flush()
ModuleInfo = ModuleList[InfFile]\r
ModuleName = ModuleInfo.BaseName\r
+ ModuleOutputImage = ModuleInfo.Image.FileName\r
+ ModuleDebugImage = os.path.join(ModuleInfo.DebugDir, ModuleInfo.BaseName + '.efi')\r
## for SMM module in SMRAM, the SMRAM will be allocated from base to top.\r
if not ModeIsSmm:\r
BaseAddress = BaseAddress - ModuleInfo.Image.Size\r
#\r
# Update Image to new BaseAddress by GenFw tool\r
#\r
- LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleInfo.Image.FileName], ModuleInfo.OutpuDir)\r
+ LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleOutputImage], ModuleInfo.OutputDir)\r
+ LaunchCommand(["GenFw", "--rebase", str(BaseAddress), "-r", ModuleDebugImage], ModuleInfo.DebugDir)\r
else:\r
#\r
# Set new address to the section header only for SMM driver.\r
#\r
- LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleInfo.Image.FileName], ModuleInfo.OutpuDir)\r
+ LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleOutputImage], ModuleInfo.OutputDir)\r
+ LaunchCommand(["GenFw", "--address", str(BaseAddress), "-r", ModuleDebugImage], ModuleInfo.DebugDir)\r
#\r
# Collect funtion address from Map file\r
#\r
- ImageMapTable = ModuleInfo.Image.FileName.replace('.efi', '.map')\r
+ ImageMapTable = ModuleOutputImage.replace('.efi', '.map')\r
FunctionList = []\r
if os.path.exists(ImageMapTable):\r
OrigImageBaseAddress = 0\r
elif SectionHeader[0] in ['.data', '.sdata']:\r
DataSectionAddress = SectionHeader[1]\r
if AddrIsOffset:\r
- MapBuffer.write('(GUID=%s, .textbaseaddress=-0x%010X, .databaseaddress=-0x%010X)\n\n' % (ModuleInfo.Guid, 0 - (BaseAddress + TextSectionAddress), 0 - (BaseAddress + DataSectionAddress))) \r
+ MapBuffer.write('(GUID=%s, .textbaseaddress=-0x%010X, .databaseaddress=-0x%010X)\n' % (ModuleInfo.Guid, 0 - (BaseAddress + TextSectionAddress), 0 - (BaseAddress + DataSectionAddress))) \r
else:\r
- MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress)) \r
+ MapBuffer.write('(GUID=%s, .textbaseaddress=0x%010X, .databaseaddress=0x%010X)\n' % (ModuleInfo.Guid, BaseAddress + TextSectionAddress, BaseAddress + DataSectionAddress)) \r
+ #\r
+ # Add debug image full path.\r
+ #\r
+ MapBuffer.write('(IMAGE=%s)\n\n' % (ModuleDebugImage))\r
#\r
# Add funtion address\r
#\r
if self.Fdf != '':\r
# First get the XIP base address for FV map file.\r
GuidPattern = re.compile("[-a-fA-F0-9]+")\r
+ GuidName = re.compile("\(GUID=[-a-fA-F0-9]+")\r
for FvName in Wa.FdfProfile.FvDict.keys():\r
FvMapBuffer = os.path.join(Wa.FvDir, FvName + '.Fv.map')\r
if not os.path.exists(FvMapBuffer):\r
if GuidString.upper() in ModuleList:\r
Line = Line.replace(GuidString, ModuleList[GuidString.upper()].Name)\r
MapBuffer.write('%s' % (Line))\r
+ #\r
+ # Add the debug image full path.\r
+ #\r
+ MatchGuid = GuidName.match(Line)\r
+ if MatchGuid != None:\r
+ GuidString = MatchGuid.group().split("=")[1]\r
+ if GuidString.upper() in ModuleList:\r
+ MapBuffer.write('(IMAGE=%s)\n' % (os.path.join(ModuleList[GuidString.upper()].DebugDir, ModuleList[GuidString.upper()].Name + '.efi')))\r
+\r
FvMap.close()\r
\r
## Collect MAP information of all modules\r
ImageClass = PeImageClass (OutputImageFile)\r
if not ImageClass.IsValid:\r
EdkLogger.error("build", FILE_PARSE_FAILURE, ExtraData=ImageClass.ErrorInfo)\r
- ImageInfo = PeImageInfo(Module.Name, Module.Guid, Module.Arch, Module.OutputDir, ImageClass)\r
+ ImageInfo = PeImageInfo(Module.Name, Module.Guid, Module.Arch, Module.OutputDir, Module.DebugDir, ImageClass)\r
if Module.ModuleType in ['PEI_CORE', 'PEIM', 'COMBINED_PEIM_DRIVER','PIC_PEIM', 'RELOCATABLE_PEIM', 'DXE_CORE']:\r
PeiModuleList[Module.MetaFile] = ImageInfo\r
PeiSize += ImageInfo.Image.Size\r
#\r
# Save address map into MAP file.\r
#\r
- SaveFileOnChange(MapFilePath, MapBuffer.getvalue(), False)\r
+ MapFile = open(MapFilePath, "wb")
+ MapFile.write(MapBuffer.getvalue())
+ MapFile.close()
MapBuffer.close()\r
if self.LoadFixAddress != 0:
sys.stdout.write ("\nLoad Module At Fix Address Map file saved to %s\n" %(MapFilePath))
self.Fdf,\r
self.FdList,\r
self.FvList,\r
- self.SkuId\r
+ self.SkuId,\r
+ self.UniFlag\r
)\r
self.BuildReport.AddPlatformReport(Wa)\r
self.Progress.Stop("done!")\r
# Rebase module to the preferred memory address before GenFds\r
#\r
self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
+ if self.Fdf != '':\r
+ #\r
+ # create FDS again for the updated EFI image\r
+ #\r
+ self._Build("fds", Wa)\r
if self.Fdf != '':\r
- #\r
- # create FDS again for the updated EFI image\r
- #\r
- self._Build("fds", Wa)\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
self.Fdf,\r
self.FdList,\r
self.FvList,\r
- self.SkuId\r
+ self.SkuId,\r
+ self.UniFlag\r
)\r
Wa.CreateMakeFile(False)\r
self.Progress.Stop("done!")\r
self.Fdf,\r
self.FdList,\r
self.FvList,\r
- self.SkuId\r
+ self.SkuId,\r
+ self.UniFlag\r
)\r
self.BuildReport.AddPlatformReport(Wa)\r
Wa.CreateMakeFile(False)\r
if self.LoadFixAddress != 0:\r
self._CollectModuleMapBuffer(MapBuffer, ModuleList)\r
\r
- # Generate FD image if there's a FDF file found\r
- if self.Fdf != '' and self.Target in ["", "all", "fds"]:\r
- LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
-\r
- # Create MAP file for all platform FV after GenFds\r
- if self.Target in ["", "all", "fds"]:\r
if self.Fdf != '':\r
+ #\r
+ # Generate FD image if there's a FDF file found\r
+ #\r
+ LaunchCommand(Wa.BuildCommand + ["fds"], Wa.MakeFileDir)\r
#\r
# Create MAP file for all platform FVs after GenFds.\r
#\r
Parser.add_option("-Y", "--report-type", action="append", type="choice", choices=['PCD','LIBRARY','FLASH','DEPEX','BUILD_FLAGS','FIXED_ADDRESS', 'EXECUTION_ORDER'], dest="ReportType", default=[],\r
help="Flags that control the type of build report to generate. Must be one of: [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS, EXECUTION_ORDER]. "\\r
"To specify more than one flag, repeat this option on the command line and the default flag set is [PCD, LIBRARY, FLASH, DEPEX, BUILD_FLAGS, FIXED_ADDRESS]")\r
+ Parser.add_option("-F", "--flag", action="store", type="string", dest="Flag",\r
+ help="Specify the specific option to parse EDK UNI file. Must be one of: [-c, -s]. -c is for EDK framework UNI file, and -s is for EDK UEFI UNI file. "\\r
+ "This option can also be specified by setting *_*_*_BUILD_FLAGS in [BuildOptions] section of platform DSC. If they are both specified, this value "\\r
+ "will override the setting in [BuildOptions] section of platform DSC.")\r
\r
(Opt, Args)=Parser.parse_args()\r
return (Opt, Args)\r
if ErrorCode != 0:\r
EdkLogger.error("build", ErrorCode, ExtraData=ErrorInfo)\r
\r
+ if Option.Flag != None and Option.Flag not in ['-c', '-s']:\r
+ EdkLogger.error("build", OPTION_VALUE_INVALID, "UNI flag must be one of -c or -s")\r
+\r
MyBuild = Build(Target, Workspace, Option.PlatformFile, Option.ModuleFile,\r
Option.TargetArch, Option.ToolChain, Option.BuildTarget,\r
Option.FdfFile, Option.RomImage, Option.FvImage,\r
None, Option.SilentMode, Option.ThreadNumber,\r
Option.SkipAutoGen, Option.Reparse, Option.SkuId, \r
- Option.ReportFile, Option.ReportType)\r
+ Option.ReportFile, Option.ReportType, Option.Flag)\r
MyBuild.Launch()\r
#MyBuild.DumpBuildData()\r
except FatalError, X:\r
projects / mirror_edk2.git / blobdiff