From 6310ffd7810501dc51e978b87f50f81ff61720b1 Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 28 Jul 2010 03:07:30 +0000
Subject: [PATCH] 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
---
 BaseTools/Bin/Win32/BootSectImage.exe       | Bin 393216 -> 393216 bytes
 BaseTools/Bin/Win32/EfiLdrImage.exe         | Bin 421888 -> 421888 bytes
 BaseTools/Bin/Win32/EfiRom.exe              | Bin 446464 -> 446464 bytes
 BaseTools/Bin/Win32/GenBootSector.exe       | Bin 425984 -> 425984 bytes
 BaseTools/Bin/Win32/GenCrc32.exe            | Bin 425984 -> 425984 bytes
 BaseTools/Bin/Win32/GenFds.exe              | Bin 1473739 -> 1474967 bytes
 BaseTools/Bin/Win32/GenFfs.exe              | Bin 430080 -> 430080 bytes
 BaseTools/Bin/Win32/GenFv.exe               | Bin 479232 -> 479232 bytes
 BaseTools/Bin/Win32/GenFw.exe               | Bin 495616 -> 495616 bytes
 BaseTools/Bin/Win32/GenPage.exe             | Bin 421888 -> 421888 bytes
 BaseTools/Bin/Win32/GenSec.exe              | Bin 446464 -> 446464 bytes
 BaseTools/Bin/Win32/GenVtf.exe              | Bin 446464 -> 446464 bytes
 BaseTools/Bin/Win32/LzmaCompress.exe        | Bin 397312 -> 397312 bytes
 BaseTools/Bin/Win32/Split.exe               | Bin 425984 -> 425984 bytes
 BaseTools/Bin/Win32/TianoCompress.exe       | Bin 434176 -> 434176 bytes
 BaseTools/Bin/Win32/VfrCompile.exe          | Bin 1187840 -> 1187840 bytes
 BaseTools/Bin/Win32/VolInfo.exe             | Bin 471040 -> 471040 bytes
 BaseTools/Bin/Win32/build.exe               | Bin 2615464 -> 2616692 bytes
 BaseTools/Conf/tools_def.template           |   4 ++--
 BaseTools/Source/Python/GenFds/FdfParser.py |  25 ++++++++++++++++++++
 BaseTools/Source/Python/GenFds/Vtf.py       |   8 +++++++
 21 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe
index 244f0c5deff832d2ca9e0be2eb6aa4987caa9747..433d8de593f06dd22ecf2deeb0e605931931a535 100755
GIT binary patch
delta 61
zcmZo@kZ5R-nDBr(eUD$`<JQNFt&f>nA2V-#%<>T|w*C4;7T!Gq2377KV@;bK`<_gW
Pi8!>fbo-aNtUO5ojx-%`

delta 61
zcmZo@kZ5R-nDBu4d82FN<JQNFt&f>nA2V-#%<>T|w*C4;7T!GqixX$9EbhDL(`B)G
Q-qga)9oxUmW#vf%0JG5^$N&HU

diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe
index 3881789d32882464ebfb6023203cdb7289e397f6..ab8e438560c53cde50db425e03aa5a020b393946 100755
GIT binary patch
delta 64
zcmZp8AldLha>4`Vj6Hshk6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=kZWA1{Z&)O
Uzp=My;a=tGFSai+VvDf_0RKlGY5)KL

delta 64
zcmZp8AldLha>4`V7mcosk6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=ka(=&Enmy$
T)ucG3h-0p!==LQ>Y%#U~`1~An

diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe
index b3bde7eacdb947a24052ceffabae563f2c65f43a..7c2fd61ad55643733eeef12645e6ac8e90012be1 100755
GIT binary patch
delta 64
zcmZozAl<M)dcp_hj6HshpIbjOwti-6{mk6@nPux|)`t^7!rQM;Wc~X<;NQB1<`GS%
UK3l(TIJ`7{dG+=uMQk#$04jDNBme*a

delta 64
zcmZozAl<M)dcp_h7mcospIbjOwti-6{mk6@nPux|)`t^7!rQM;Wc~X<z~;azkz4wc
UJUSHlRxm$eY})>$h)pII02-Gb)&Kwi

diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe
index 061d5b68394c636e9c2bc80f0230236421497556..3e37a4fa7545136c6ffef62964c8c724e5be488c 100755
GIT binary patch
delta 64
zcmZo@kZNd<n(%@-dyik^>(<wdt*@C{Uo*G9X4(3h^=AM`c>D7}*1h)x6dzY;K2v$*
UzF15<_uPkfdfT@cu=)4{0P5Htp8x;=

delta 64
zcmZo@kZNd<n(%`8b)#$J>(<wdt*@C{Uo*G9X4(3h^=AM`c>D7}*1h)xHXbfw^wMN?
TYuT#0D|AYS#P%%)Y(D+~>r5S5

diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe
index 3896e63b210c893356f19bb8e4fc9a5dc82110fb..bd6ba314d24fcf616fee155568d97f4cd6a23dee 100755
GIT binary patch
delta 64
zcmZo@kZNd<n(%=+XOCaw=hn}Rt)H1%KQp&}X4(3g^<e-=c>DE0)}s#utPf6$6I*HF
UzhV1lpD%m3M7FOnVhiyF0PmF^VgLXD

delta 64
zcmZo@kZNd<n(%@7b)#$J=hn}Rt)H1%KQp&}X4(3g^<e-=c>DE0)}s#uj&$azo&LPT
TXHC|kq#j$xtnF)z*g|{(5)dC<

diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe
index 64e6673f72d01f65b29e73e087ba0ead3d5d092e..b4e55aed8b8750d06aee9d528323d99a75e4a09e 100755
GIT binary patch
delta 3712
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
D*a31H

delta 2894
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
Mk*5B>Qs6NC2c5v(!T<mO

diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe
index accb54930442a90b1705908d36bc0b8736699aae..914875176eaa2064775917570e4082d54d26b763 100755
GIT binary patch
delta 64
zcmZozAl0xyYQh8N+&zAck6RxzwmxQReazhYm}To@){hAw;qBKGS@%8=@cyEF(D+)5
UdprAN(`Sn|P1?T1i7mz#0Q5*6+W-In

delta 64
zcmZozAl0xyYQh8NH;t~1k6RxzwmxQReazhYm}To@){hAw;qBKGS@%8=n0VEC51YQD
U&!+qn^GYAFsBd55#1`WV0RP<{U;qFB

diff --git a/BaseTools/Bin/Win32/GenFv.exe b/BaseTools/Bin/Win32/GenFv.exe
index 92c2b2549b61f8c94b6cf17877b772c1a2ef6c81..fade8eee6a90bd73be3387278f8634fa9c183840 100755
GIT binary patch
delta 64
zcmZozAltA&cESthygh!6uUlU;w!UU+ea+nZnq}*2)|VeZ!rQNZWc~U;;6QJW&=vb;
Uhn1o#W*+MOecSI`VpFLF02xyscK`qY

delta 64
zcmZozAltA&cESthca5%%uUlU;w!UU+ea+nZnq}*2)|VeZ!rQNZWc~U;phX}s;#}Va
UuYErnO=d{tL~p-yiA|*z06N$qApigX

diff --git a/BaseTools/Bin/Win32/GenFw.exe b/BaseTools/Bin/Win32/GenFw.exe
index 3ae5b6a9a6c835ca1842e496af6b358072b0ef82..0130d6396b65146c097848a8b251c940960b7dd1 100755
GIT binary patch
delta 67
zcmZozAlI-!Zo&iR!aaVCk6RxzwmxQReazhYn5FeG>(<9?jDjGU?au|-be{@r<0xfX
X=HlZr!E<ls<w{41?JD2d?#uuH0GJ($

delta 67
zcmZozAlI-!Zo&iRkBzR4k6RxzwmxQReazhYn5FeG>(<9?jDjGU?au|-be{@nG;1&|
X;63NJgl+EPYa32K+OG1Q?amAU9bO-5

diff --git a/BaseTools/Bin/Win32/GenPage.exe b/BaseTools/Bin/Win32/GenPage.exe
index 6f707b277f4fd9eb4c98844f0c1e23249f464de8..5850eede9e7d6549dbf8ba5439382f19d8e62609 100755
GIT binary patch
delta 64
zcmZp8AldLha>4`V!aaVCk6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=sGGjG?^gI`
Umqi*~{wv;E@oryY#1>-<02i4b4*&oF

delta 64
zcmZp8AldLha>4`VkBzR4k6RxzwmxQReazhYm}To@){g-o;qBK0S@%8=sJeJ%g(wrN
U^UnW2OfODWY2UuYh%Lqz04JIsng9R*

diff --git a/BaseTools/Bin/Win32/GenSec.exe b/BaseTools/Bin/Win32/GenSec.exe
index a8a9927fe6153ed5bcb60a22ccad26d75ea77fd5..d3eb98e31df7255932839e6763908da1b86c968a 100755
GIT binary patch
delta 64
zcmZozAl<M)dcp(dqCI|%k6RxzwmxQReazhYm}To@){hfF!rQM;WL^6}VDBW4CGM@$
UJm>5@RBPejaA5nCBDS1Z00XxlPyhe`

delta 64
zcmZozAl<M)dcp(dPmQjPk6RxzwmxQReazhYm}To@){hfF!rQM;WL^6}K>G9B#rjI-
U4vpJc6y#<uXxu)fh%F};00q7tZ~y=R

diff --git a/BaseTools/Bin/Win32/GenVtf.exe b/BaseTools/Bin/Win32/GenVtf.exe
index 0f6889b32df08a0ac461a672581595551088fd77..98f677a765611e974d19c053f2f9531cb54faf05 100755
GIT binary patch
delta 64
zcmZozAl<M)dcq6lqCI|%uUlU;w!UU+ea+nZnq}*2)|U%F!rQMeWbJ(@5P0nBZeEWS
U?)wWCaURc2y1u=nnXShM01ka0!2kdN

delta 64
zcmZozAl<M)dcq6lPmQjPuUlU;w!UU+ea+nZnq}*2)|U%F!rQMeWbJ(@u;xG0^a(kl
U9_^D=oyEhmoVS-Wv-S7@01q-AK>z>%

diff --git a/BaseTools/Bin/Win32/LzmaCompress.exe b/BaseTools/Bin/Win32/LzmaCompress.exe
index 640254ad0d5cbf6854bf098e84bb18c46ea19556..34f753c890d26fca37663e1feaf97243489b102b 100755
GIT binary patch
delta 64
zcmZozAknZuV!{LFvORu{k6RxzwmxQReazhYm}To@){hDx;qBKIS?6vPknvvUI%DN3
UhgI4izB_30X>4z~%vxgu0MzdtU;qFB

delta 64
zcmZozAknZuV!{LF?~SgFk6RxzwmxQReazhYm}To@){hDx;qBKIS?6vPxTe;jzU_&d
UPs7oU#J`QZOSZRMX05RS0RE~UtN;K2

diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe
index bccddc6a88a7473928a0102893a5b340bb226c7c..b73d3d1a39100fee22690792285f4a882cadc6e8 100755
GIT binary patch
delta 64
zcmZo@kZNd<n(%?Se2-t_=hn}Rt)H1%KQp&}X4(3g^<x4^c>D82R@Dar+-g@}?qNUX
Uww?dT#ecICR&JMZVtZl>0P^-9DF6Tf

delta 64
zcmZo@kZNd<n(%@7d!uXP=hn}Rt)H1%KQp&}X4(3g^<x4^c>D82R@Dar9!>uLpL=;b
T^yl*hnNQvIbGwWa+Y?&={SF?N

diff --git a/BaseTools/Bin/Win32/TianoCompress.exe b/BaseTools/Bin/Win32/TianoCompress.exe
index 6339837c15d68d28b29ec56f1895f8b44b5bcbfa..728af8b25f70bbfb7b6d1c9d9a8ec44e153ec211 100755
GIT binary patch
delta 64
zcmZoTAk}a{YQh8N@;!cyk6RxzwmxQReazhYm}To@){hM!;qBKOS<gNYh)j7Jar5>O
U$Ju%}_-Cr5-`~C^iOt6r02);v+yDRo

delta 64
zcmZoTAk}a{YQh8NAC0b!k6RxzwmxQReazhYm}To@){hM!;qBKOS<gNYP`6b-UfZJV
UwM}ZmhmYs4uH3#QiOt6r03GrmJ^%m!

diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe
index 375fd67c483d01eb5314b6942ce7745e0c1edb2d..7885c5656800f03a16a7ecb45729f3d21a435e6c 100755
GIT binary patch
delta 105
zcmZoT;L&ivW5NsO_C0=$uUlU;w!UU+ea+nZnx*wMYwK&a*4ON<uQ^&@bGE+bYJJVU
z^)*kVAxLezyAjWJcO%|fegQ#a*X3SkCVK2(QMw;tctpMZiX$%&^8qnG5DRR-;wY$d
F4*(pzE-L^4

delta 105
zcmZoT;L&ivW5Nq&wkFrc*R8J^TVFG^zGiNH&C>dswe>Yy>udJb*Bq^{Ia^<IwZ7)w
z`kE)w5Tv%<-H2zqyAf|Kzrct04!t4Wiq74~LXL<Y*&E+}#gP|?`GA-ohy}J^aTL_K
F2LSDnE}#Ga

diff --git a/BaseTools/Bin/Win32/VolInfo.exe b/BaseTools/Bin/Win32/VolInfo.exe
index f35ed7d29d7bae92d3e60d43385687b8b738f96b..3a6b1e946f2458a005d91fb955c265533f61b3f8 100755
GIT binary patch
delta 72
zcmZp8Ak*+bX2K2Tiamafw_9&Bw%%rHz0KTun`P^5R?deY;qA{KvMzlipdYt=B7a%F
c&pZ>IAL`$NPH&%cj;&FV(R{ny2ewD{00b=}CjbBd

delta 72
zcmV-O0Jr~u;2eP99FW)p_<==%+lAW!h1&v!+XIE$1hv}*3E>0yfkn6H;RU7a5a4Ik
eSmk>YK&=+v)Aeex1-G2e27w^~Ft;A?2I4<O-XsJ7

diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe
index 5a8a65892a1930bcc462bf64680635b04c3a5cff..d73c4faeeea9d3c96152ee5a994ec5fd01482ae2 100755
GIT binary patch
delta 3715
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
A1ONa4

delta 2816
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
F{U0mw9^C){

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index fa0c48d6ea..d776ab22d7 100644
--- 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
 *_MYTOOLS_IA32_ASLPP_PATH           = DEF(VS2008_BIN)\cl.exe
 *_MYTOOLS_IA32_ASLDLINK_PATH        = DEF(VS2008_BIN)\link.exe
-*_MYTOOLS_IA32_RC_PATH              = DEF(VS2008_BIN)\rc.exe
+*_MYTOOLS_IA32_RC_PATH              = DEF(WINSDK_BIN)\rc.exe
 
   DEBUG_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_MYTOOLS_IA32_CC_FLAGS            = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
@@ -3150,7 +3150,7 @@ RELEASE_MYTOOLS_IA32_DLINK_FLAGS         = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /O
 *_MYTOOLS_X64_ASLCC_PATH            = DEF(VS2008_BINX64)\cl.exe
 *_MYTOOLS_X64_ASLPP_PATH            = DEF(VS2008_BINX64)\cl.exe
 *_MYTOOLS_X64_ASLDLINK_PATH         = DEF(VS2008_BINX64)\link.exe
-*_MYTOOLS_X64_RC_PATH               = DEF(VS2008_BIN)\rc.exe
+*_MYTOOLS_X64_RC_PATH               = DEF(WINSDK_BIN)\rc.exe
 
   DEBUG_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF /Zi /Gm
 RELEASE_MYTOOLS_X64_CC_FLAGS             = /nologo /c /WX /GS- /W4 /Gs32768 /Gy /D UNICODE /O1ib2 /GL /FIAutoGen.h /EHs-c- /GR- /GF
diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index c4358cf479..83b58bcd46 100644
--- 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)
 
             VtfObj.ResetBin = self.__Token
+            if VtfObj.ResetBin.replace('$(WORKSPACE)', '').find('$') == -1:
+                #check for file path
+                ErrorCode, ErrorInfo = PathClass(NormPath(VtfObj.ResetBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+                if ErrorCode != 0:
+                    EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         while self.__GetComponentStatement(VtfObj):
             pass
@@ -3634,6 +3639,11 @@ class FdfParser:
             raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)
 
         CompStatementObj.CompBin = self.__Token
+        if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if not self.__IsKeyword("COMP_SYM"):
             raise Warning("expected COMP_SYM", self.FileName, self.CurrentLineNumber)
@@ -3645,6 +3655,11 @@ class FdfParser:
             raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)
 
         CompStatementObj.CompSym = self.__Token
+        if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if not self.__IsKeyword("COMP_SIZE"):
             raise Warning("expected COMP_SIZE", self.FileName, self.CurrentLineNumber)
@@ -3722,6 +3737,11 @@ class FdfParser:
         if not self.__GetNextToken():
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)
         ffsInf.InfFileName = self.__Token
+        if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if not ffsInf.InfFileName in self.Profile.InfList:
             self.Profile.InfList.append(ffsInf.InfFileName)
@@ -3814,6 +3834,11 @@ class FdfParser:
         if not self.__GetNextToken():
             raise Warning("expected File path", self.FileName, self.CurrentLineNumber)
         FfsFileObj.FileName = self.__Token
+        if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:
+            #check for file path
+            ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()
+            if ErrorCode != 0:
+                EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
 
         if FfsFileObj.FileType == 'EFI':
             self.__GetOptRomOverrides(FfsFileObj)
diff --git a/BaseTools/Source/Python/GenFds/Vtf.py b/BaseTools/Source/Python/GenFds/Vtf.py
index 2bea9346cf..e7e36491db 100644
--- a/BaseTools/Source/Python/GenFds/Vtf.py
+++ b/BaseTools/Source/Python/GenFds/Vtf.py
@@ -67,6 +67,14 @@ class Vtf (VtfClassObject):
         FvList = self.GetFvList()
         self.BsfInfName = os.path.join(GenFdsGlobalVariable.FvDir, self.UiName + '.inf')
         BsfInf = open (self.BsfInfName, 'w+')
+        if self.ResetBin != None:
+            BsfInf.writelines ("[OPTIONS]" + T_CHAR_LF)
+            BsfInf.writelines ("IA32_RST_BIN"     + \
+                               " = "              + \
+                               GenFdsGlobalVariable.MacroExtend(GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.ResetBin)) + \
+                               T_CHAR_LF )
+            BsfInf.writelines (T_CHAR_LF )
+        
         BsfInf.writelines ("[COMPONENTS]" + T_CHAR_LF)
 
         for ComponentObj in self.ComponentStatementList :
-- 
2.39.2