Sync EDKII BaseTools to BaseTools project r2000

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10706 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe
index 244f0c5deff832d2ca9e0be2eb6aa4987caa9747..433d8de593f06dd22ecf2deeb0e605931931a535 100755 (executable)
Binary files a/BaseTools/Bin/Win32/BootSectImage.exe and b/BaseTools/Bin/Win32/BootSectImage.exe differ

diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe
index 3881789d32882464ebfb6023203cdb7289e397f6..ab8e438560c53cde50db425e03aa5a020b393946 100755 (executable)
Binary files a/BaseTools/Bin/Win32/EfiLdrImage.exe and b/BaseTools/Bin/Win32/EfiLdrImage.exe differ

diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe
index b3bde7eacdb947a24052ceffabae563f2c65f43a..7c2fd61ad55643733eeef12645e6ac8e90012be1 100755 (executable)
Binary files a/BaseTools/Bin/Win32/EfiRom.exe and b/BaseTools/Bin/Win32/EfiRom.exe differ

diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe
index 061d5b68394c636e9c2bc80f0230236421497556..3e37a4fa7545136c6ffef62964c8c724e5be488c 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenBootSector.exe and b/BaseTools/Bin/Win32/GenBootSector.exe differ

diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe
index 3896e63b210c893356f19bb8e4fc9a5dc82110fb..bd6ba314d24fcf616fee155568d97f4cd6a23dee 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenCrc32.exe and b/BaseTools/Bin/Win32/GenCrc32.exe differ

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index 64e6673f72d01f65b29e73e087ba0ead3d5d092e..b4e55aed8b8750d06aee9d528323d99a75e4a09e 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ

diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe
index accb54930442a90b1705908d36bc0b8736699aae..914875176eaa2064775917570e4082d54d26b763 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFfs.exe and b/BaseTools/Bin/Win32/GenFfs.exe differ

diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe
index 92c2b2549b61f8c94b6cf17877b772c1a2ef6c81..fade8eee6a90bd73be3387278f8634fa9c183840 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFv.exe and b/BaseTools/Bin/Win32/GenFv.exe differ

diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
index 3ae5b6a9a6c835ca1842e496af6b358072b0ef82..0130d6396b65146c097848a8b251c940960b7dd1 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenFw.exe and b/BaseTools/Bin/Win32/GenFw.exe differ

diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe
index 6f707b277f4fd9eb4c98844f0c1e23249f464de8..5850eede9e7d6549dbf8ba5439382f19d8e62609 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenPage.exe and b/BaseTools/Bin/Win32/GenPage.exe differ

diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe
index a8a9927fe6153ed5bcb60a22ccad26d75ea77fd5..d3eb98e31df7255932839e6763908da1b86c968a 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenSec.exe and b/BaseTools/Bin/Win32/GenSec.exe differ

diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe
index 0f6889b32df08a0ac461a672581595551088fd77..98f677a765611e974d19c053f2f9531cb54faf05 100755 (executable)
Binary files a/BaseTools/Bin/Win32/GenVtf.exe and b/BaseTools/Bin/Win32/GenVtf.exe differ

diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe
index 640254ad0d5cbf6854bf098e84bb18c46ea19556..34f753c890d26fca37663e1feaf97243489b102b 100755 (executable)
Binary files a/BaseTools/Bin/Win32/LzmaCompress.exe and b/BaseTools/Bin/Win32/LzmaCompress.exe differ

diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe
index bccddc6a88a7473928a0102893a5b340bb226c7c..b73d3d1a39100fee22690792285f4a882cadc6e8 100755 (executable)
Binary files a/BaseTools/Bin/Win32/Split.exe and b/BaseTools/Bin/Win32/Split.exe differ

diff --git a/BaseTools/Bin/Win32/TianoCompress.exe b/BaseTools/Bin/Win32/TianoCompress.exe
index 6339837c15d68d28b29ec56f1895f8b44b5bcbfa..728af8b25f70bbfb7b6d1c9d9a8ec44e153ec211 100755 (executable)
Binary files a/BaseTools/Bin/Win32/TianoCompress.exe and b/BaseTools/Bin/Win32/TianoCompress.exe differ

diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe
index 375fd67c483d01eb5314b6942ce7745e0c1edb2d..7885c5656800f03a16a7ecb45729f3d21a435e6c 100755 (executable)
Binary files a/BaseTools/Bin/Win32/VfrCompile.exe and b/BaseTools/Bin/Win32/VfrCompile.exe differ

diff --git a/BaseTools/Bin/Win32/VolInfo.exe b/BaseTools/Bin/Win32/VolInfo.exe
index f35ed7d29d7bae92d3e60d43385687b8b738f96b..3a6b1e946f2458a005d91fb955c265533f61b3f8 100755 (executable)
Binary files a/BaseTools/Bin/Win32/VolInfo.exe and b/BaseTools/Bin/Win32/VolInfo.exe differ

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 5a8a65892a1930bcc462bf64680635b04c3a5cff..d73c4faeeea9d3c96152ee5a994ec5fd01482ae2 100755 (executable)
Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index fa0c48d6ea0160a470fefaca5f0a9b92c363b109..d776ab22d76493255ecdf9b921cb15d560c43206 100644 (file)
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -3125,7 +3125,7 @@ RELEASE_ICC11x86xASL_IPF_DLINK_FLAGS              = /NOLOGO /NODEFAULTLIB /LTCG
 *_MYTOOLS_IA32_ASLCC_PATH           = DEF(VS2008_BIN)\cl.exe\r
 *_MYTOOLS_IA32_ASLPP_PATH           = DEF(VS2008_BIN)\cl.exe\r
 *_MYTOOLS_IA32_ASLDLINK_PATH        = DEF(VS2008_BIN)\link.exe\r
-*_MYTOOLS_IA32_RC_PATH              = DEF(VS2008_BIN)\rc.exe\r
+*_MYTOOLS_IA32_RC_PATH              = DEF(WINSDK_BIN)\rc.exe\r
 \r
   DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r
@@ -3150,7 +3150,7 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_X64_ASLCC_PATH            = DEF(VS2008_BINX64)\cl.exe\r
 *_MYTOOLS_X64_ASLPP_PATH            = DEF(VS2008_BINX64)\cl.exe\r
 *_MYTOOLS_X64_ASLDLINK_PATH         = DEF(VS2008_BINX64)\link.exe\r
-*_MYTOOLS_X64_RC_PATH               = DEF(VS2008_BIN)\rc.exe\r
+*_MYTOOLS_X64_RC_PATH               = DEF(WINSDK_BIN)\rc.exe\r
 \r
   DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm\r
 RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF\r

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index c4358cf47913d4467a13f6891c915cc35429a82a..83b58bcd468dc332ad0ab500a7bae002776f04de 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -3532,6 +3532,11 @@ class FdfParser:
                 raise Warning("expected Reset file", self.FileName, self.CurrentLineNumber)\r
 \r
             VtfObj.ResetBin = self.__Token\r
+            if VtfObj.ResetBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+                #check for file path\r
+                ErrorCode, ErrorInfo = PathClass(NormPath(VtfObj.ResetBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+                if ErrorCode != 0:\r
+                    EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         while self.__GetComponentStatement(VtfObj):\r
             pass\r
@@ -3634,6 +3639,11 @@ class FdfParser:
             raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)\r
 \r
         CompStatementObj.CompBin = self.__Token\r
+        if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not self.__IsKeyword("COMP_SYM"):\r
             raise Warning("expected COMP_SYM", self.FileName, self.CurrentLineNumber)\r
@@ -3645,6 +3655,11 @@ class FdfParser:
             raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)\r
 \r
         CompStatementObj.CompSym = self.__Token\r
+        if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not self.__IsKeyword("COMP_SIZE"):\r
             raise Warning("expected COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
@@ -3722,6 +3737,11 @@ class FdfParser:
         if not self.__GetNextToken():\r
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
         ffsInf.InfFileName = self.__Token\r
+        if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if not ffsInf.InfFileName in self.Profile.InfList:\r
             self.Profile.InfList.append(ffsInf.InfFileName)\r
@@ -3814,6 +3834,11 @@ class FdfParser:
         if not self.__GetNextToken():\r
             raise Warning("expected File path", self.FileName, self.CurrentLineNumber)\r
         FfsFileObj.FileName = self.__Token\r
+        if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+            if ErrorCode != 0:\r
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
 \r
         if FfsFileObj.FileType == 'EFI':\r
             self.__GetOptRomOverrides(FfsFileObj)\r

diff --git a/BaseTools/Source/Python/GenFds/Vtf.py b/BaseTools/Source/Python/GenFds/Vtf.py
index 2bea9346cf438f8ba45220526ad0648de2e00d14..e7e36491db60fbe24f01de4fd734617c0502b13e 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Vtf.py
+++ b/BaseTools/Source/Python/GenFds/Vtf.py
@@ -67,6 +67,14 @@ class Vtf (VtfClassObject):
         FvList = self.GetFvList()\r
         self.BsfInfName = os.path.join(GenFdsGlobalVariable.FvDir, self.UiName + '.inf')\r
         BsfInf = open (self.BsfInfName, 'w+')\r
+        if self.ResetBin != None:\r
+            BsfInf.writelines ("[OPTIONS]" + T_CHAR_LF)\r
+            BsfInf.writelines ("IA32_RST_BIN"     + \\r
+                               " = "              + \\r
+                               GenFdsGlobalVariable.MacroExtend(GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.ResetBin)) + \\r
+                               T_CHAR_LF )\r
+            BsfInf.writelines (T_CHAR_LF )\r
+        \r
         BsfInf.writelines ("[COMPONENTS]" + T_CHAR_LF)\r
 \r
         for ComponentObj in self.ComponentStatementList :\r