diff options
| author | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-10-19 17:09:43 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-11-02 09:47:41 +0800 |
| commit | 2a6402d490a2da818b7650ffe0330d3020e5b020 (patch) | |
| tree | 0af46b300fff023829ed919636eca88a6791bdba | |
| parent | 1c8ca9a012ce19a1096625ef9e810036e8346827 (diff) | |
| download | edk2-2a6402d490a2da818b7650ffe0330d3020e5b020.tar.gz edk2-2a6402d490a2da818b7650ffe0330d3020e5b020.tar.bz2 edk2-2a6402d490a2da818b7650ffe0330d3020e5b020.zip | |
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 <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
| -rw-r--r-- | BaseTools/Source/Python/GenFds/OptionRom.py | 6 |
1 files 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.<BR>
+# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
#
# 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')
|