From 2a6402d490a2da818b7650ffe0330d3020e5b020 Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Wed, 19 Oct 2016 17:09:43 +0800 Subject: [PATCH] BaseTools: Fix the bug for OptionRom generation with different arch The GenFds tool uses the same output for the same module with the different arch, IA32 and X64 module will have the same output. The solution is add the arch info in the output directory. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/GenFds/OptionRom.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/OptionRom.py b/BaseTools/Source/Python/GenFds/OptionRom.py index 94f77f60e8..7886a7cfe7 100644 --- a/BaseTools/Source/Python/GenFds/OptionRom.py +++ b/BaseTools/Source/Python/GenFds/OptionRom.py @@ -1,7 +1,7 @@ ## @file # process OptionROM generation # -# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -67,7 +67,7 @@ class OPTIONROM (OptionRomClassObject): EfiFileList.extend(FilePathNameList) else: FileName = os.path.basename(FilePathNameList[0]) - TmpOutputDir = os.path.join(GenFdsGlobalVariable.FvDir, self.DriverName) + TmpOutputDir = os.path.join(GenFdsGlobalVariable.FvDir, self.DriverName, FfsFile.CurrentArch) if not os.path.exists(TmpOutputDir) : os.makedirs(TmpOutputDir) TmpOutputFile = os.path.join(TmpOutputDir, FileName+'.tmp') @@ -85,7 +85,7 @@ class OPTIONROM (OptionRomClassObject): FilePathName = FfsFile.GenFfs() if FfsFile.OverrideAttribs != None: FileName = os.path.basename(FilePathName) - TmpOutputDir = os.path.join(GenFdsGlobalVariable.FvDir, self.DriverName) + TmpOutputDir = os.path.join(GenFdsGlobalVariable.FvDir, self.DriverName, FfsFile.CurrentArch) if not os.path.exists(TmpOutputDir) : os.makedirs(TmpOutputDir) TmpOutputFile = os.path.join(TmpOutputDir, FileName+'.tmp') -- 2.39.2