From a72526804846e44773174a7b4800168e889d831a Mon Sep 17 00:00:00 2001 From: lgao4 Date: Thu, 14 Oct 2010 06:30:37 +0000 Subject: [PATCH] Sync EDKII BaseTools to BaseTools project r2068. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10937 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/GenDepex.exe | Bin 615733 -> 615937 bytes BaseTools/Bin/Win32/GenFds.exe | Bin 1556038 -> 1557031 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/GenPatchPcdTable.exe | Bin 609730 -> 609934 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/Spd2Dec.exe | Bin 1389763 -> 1389967 bytes BaseTools/Bin/Win32/Split.exe | Bin 425984 -> 425984 bytes BaseTools/Bin/Win32/TianoCompress.exe | Bin 434176 -> 434176 bytes BaseTools/Bin/Win32/Trim.exe | Bin 680026 -> 680394 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 2635744 -> 2636737 bytes BaseTools/Source/Python/Common/Misc.py | 7 ++--- BaseTools/Source/Python/Trim/Trim.py | 25 +++++++++++++++--- .../Source/Python/Workspace/MetaFileParser.py | 19 ++++++++++++- 25 files changed, 43 insertions(+), 8 deletions(-) diff --git a/BaseTools/Bin/Win32/BootSectImage.exe b/BaseTools/Bin/Win32/BootSectImage.exe index c628a946dd6d7a646e3b15a39245d7c60df0ab44..7c4dc10481b0905c7e069c8ed5b7b84b7a231cee 100755 GIT binary patch delta 61 zcmZo@kZ5R-nDBr(d*ar{$E}YUTOTvEK4#wfnB^l_Z2R?xEWCRJl&dt3zjlvv*mt{j Q$`*OM72CheW#vf%0HcZ>-T(jq delta 61 zcmZo@kZ5R-nDBu4>YR;@k6RxzwmxQReayV|G0R7=*!JrWS$OvdczhRAiS69szI|SJ QrknScx7)wWW#vf%0K}{wrT_o{ diff --git a/BaseTools/Bin/Win32/EfiLdrImage.exe b/BaseTools/Bin/Win32/EfiLdrImage.exe index 2d42e0fff48223ea5f53e5b3376c92ed3ca5a61e..8b760e51f5dc9386249eb5fead058bbecdf73da4 100755 GIT binary patch delta 64 zcmZp8AldLha>4`VoQYc-AGbbcY<Nt$(<) U|7LNKs2_P^Y1@|=vBlT|01H(e$^ZZW delta 64 zcmZp8AldLha>4`VYjZX>K5l)?*!q~M^)YknW0tLtSw9AVgtuQ0WZnBfAU$M9){dQg UUR^$0V;A;z-<07ID|3IG5A diff --git a/BaseTools/Bin/Win32/EfiRom.exe b/BaseTools/Bin/Win32/EfiRom.exe index 9a1db5f3d03e079b199e0d8e6877bb4c9ce7ecd5..ab969edab3b6447809821226991cdf23fc649e5b 100755 GIT binary patch delta 64 zcmZozAles2BD*!r2N^)qwpXO^v>SszXS32(nXk@fEbfp1~27^Ggv Ud(67>#eQ{K@ZRlDir8dg0a=tGy#N3J diff --git a/BaseTools/Bin/Win32/GenBootSector.exe b/BaseTools/Bin/Win32/GenBootSector.exe index 4e68e769670f44df79313d45971ae693e0f9755f..0327a9ec34d625a9e4195d94856cd02bbb1ef1c3 100755 GIT binary patch delta 64 zcmZo@kZNd(2m?@b>3{tb6YX%-Y0WFkOhj Uf5y~SWxu+`BHOnZu=)4{0O*e$F8}}l delta 64 zcmZo@kZNd((i5FJx^RgSKxmVDs?@03FF63jhEB diff --git a/BaseTools/Bin/Win32/GenCrc32.exe b/BaseTools/Bin/Win32/GenCrc32.exe index 671e04ee6a112f41c18bf6ab3f7f0baf4e5d5bf4..799d0be54ecd52b6348f45da180c230dd90dd4d2 100755 GIT binary patch delta 64 zcmZo@kZNd%#z$@b>G0tVbUR#L780{XOR4 UIB85hOx(W4h%Lky06`BRs{20(Oz-@1lO+qTRAi8OAzy?{Io8$o^EiDvU#*fhg?K0NM z*koi`qTAq251B5(n8i5EWJ6X_|Cmc;3F1aH#>7NtVxlI7CB{D#Hm2v6%sSRr0Zvv z!>Q|8R}u@aXAtEqkfmE!^1-INR%}^zHq6-|u!g=>29QW+>+Y32vyHWLR$Gvx53bBM zXhn>%s8LG)!C=%tfpfr>m~aj_T~VM3S5zUbu6UugN-L3-a@g)a5P4Ydd|2;H)H@@6 z`pJ8a-QiGB4Y#XxT78v6ts}fcl}#Kfb&%pDr8fa4CxH$%!A)cn;w06N+zWZE)H5RY zDRFB7u@ZrVYWrxX+KWyy$i zC8AF))Z$qMjIfArDDVw8E4cWvIS)rnum~CWQW8w@jS7xV(%j_NhGcx)3?*<7{bo1< zo8v#2;RdIM6Ba0h9{kb*mFXc#4oi7m_U*+DR@gu_&syO<*or?}!Mo{@OdpmKlOjL3 zc0xuKQa0liJG`uPQhYo9Sqj`R!f<>j15N?d#6=b)0gU518+esbDmjA@8(g-G%a!R8 zB;=`-F&ZPDu)|{}S*4AwK}RUwgQ?lj4X5L=Y$%0Xw@mw`bV!kHHCd(|!*^aWWa{aE z?LsvNB9MFXTn>np-^02g~sbw|I(= z?8jB<(=xHtBgc8z;}KQ-RR@0L5!?8z2k&}B1%Ka%t|n2&F^IiQqMTniidV^t@LA4! z!;#Jb9CeE-kFxtB(ZxcXhT!aVkKYI@Us%;|usUrQtXHwndb3o`zOGtx7AvYVvRk zhx~M`^R@W7pP<{n!)3qN$@A~vbFI|0+k(+nT9#$U$yTb1&Erz5*ugWFu&9le-^TrI z;u(Ir8sBXbJCdvRnOQhe9PC-UmNx@*EA59+4bal$7`6uJM&~Zz#Q>d4{Ej~bMDe3b g&kGg}cLzg7y@%Us_9!O$4Y3k>{*D@0jlTF=!Z91YoD|B&fe>s zdydalU!18P-!begd8f!f+q71-|Js#`=vLG&ZsJ_a&ll@)Ja_nkb4!jasP_IgR?ZrHHXWr=l6zCXi68!;1P9 z9aMD47@zCH6&IOl0Wk}G%XJNl(^@$?b-LobRocl|HcWWPh4UZq64X7dn-Td!t3<*| zXY`d3c1rNJ)me%QLQR`0b89E*J4tb&!2G8l$nm@cbCvfqQ~>!xkx8EgJm~`w3D*r zO*EC#m{k5KmC7lpyp1QysK%m_fm6oOKf5*g+gJyFETcp8TE2ZVHIO@?vilT86{%r? z9L{)XfjqBAy(GaUOcG`ZO~N9fOIY(!uXwNde@_acN9^GrdeGe??&F^|;jJFw|V0%RD;Drpr z5z#^%=OWVFwNJ1VkPvMu9t#UQ-c3jsW7C*Sh$h~?foDd{n=-+l9Xc~8bWPK-f7`|45UP(#s907r876LXSG8V+x{KN*jD_M M5*3!3eL`yg07T9)_W%F@ diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe index 1df44e67143cec5e0c4d7abb12c2706e39e5c676..dc0cc346ba6182fc81d575562defb06ac8f51112 100755 GIT binary patch delta 4630 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 delta 3502 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 diff --git a/BaseTools/Bin/Win32/GenFfs.exe b/BaseTools/Bin/Win32/GenFfs.exe index 92a1c1540eeafe88de8e1a3a3a11882158945a78..46f56abbb1f65f0e84e84d1a6c8e0ccef2309f41 100755 GIT binary patch delta 64 zcmZozAl0xyYQh8Nf{9xjAGbbcY<)+gtuS+$olnxfd6@=oTKY5 Ux^=`w-O;$>n7sYYB{r2>06;q-ga7~l delta 64 zcmZozAltA&cESthJ99QRzHWWZ*!r5O^)++rYnH9ASzmqt32(ptk@f2Xfra;)q~taV UJ1kjh(`V;<4`V(urFeAGbbcY<Jk U-TNT?-~E1uhufDJvBlT|03gC2sQ>@~ delta 64 zcmZp8AldLha>4`Vdvi86K5l)?*!q~M^)YknW0tLtSw9AVgtuQ0WZnBfpqbHb)3M5* Uo~tsa%-Q|oLHqV4Mr<**0973!ssI20 diff --git a/BaseTools/Bin/Win32/GenPatchPcdTable.exe b/BaseTools/Bin/Win32/GenPatchPcdTable.exe index 1262bf6f06cbdf8e4d00e6ef6830b1455b5de73f..d404b476427dee92086923c5ac773d517a591801 100755 GIT binary patch delta 1002 zcmY+D+fP$j6vp@3^ennn@LIf7@Tdsd6napRA{s5AnV~JnDa0!ej!HnK2W*YPj2R~s z)CUoLU>PqFlS$^qc!`%2^b<(5tx7lO}pAw+}I)8nKg$?nXa%HIAxx8D~` z*?IP^yX2BF^;amM${?1(3~CReQ#eoT&lk=-0a+>b&Y>4UEDZ(3Ac*}^IMo9BXN#;) z`~qTckrKQXp9Fw6KbOpf81x53rxdB>^QmDW-rs6h>IC{X8ix+=%jRie9j)>T z)={e}3%XF1H8eNJ5~)r0DxT!8ox2ZazRg?T<}GjD%JfmP7{fm}>3yctX|~zzo5E(B z_79u9C2Z;y3`$2U#*urS# zDK9j8ddjo4Q`~K1w9|uPygS#_RsssZ0#hOsX;lFFc5@}z4X~5mF2c`n!+m4oJ%GpV z?@Mqf54tE+h7GWt(q-6H+QW9+8Gmap`v5C`4t5{o5F7&SBKBUO7Zx*$zz^p7WXmnRzkp5eN>)|k! zgz#rr>|O}rgw$y|Dlh~+bg}~LXQX+p!#K^Mdg*lq7VDYG3j71gXuJ|T79HVsKVyKw z{{%b7D#ln$=_qb9y0w1l_D68S2ZQdq)p!bEi~Fb=^8wD&KWnhVIIBm_kX3`%b>-h0 zT{)*KM6oEABRB1HU%iI3j?kOQmeYElL9c)ik3?F&Ty_oM&- delta 817 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 X)aCQ=`dIHB3)cE5$9ViY;%omOL^Ugx diff --git a/BaseTools/Bin/Win32/Split.exe b/BaseTools/Bin/Win32/Split.exe index 097824af6670e571f070aba67e3e3fc118087f1d..cd4b4aff6cbef677c1096e3dc734ed9cf788559d 100755 GIT binary patch delta 64 zcmZo@kZNd&FC;@b>44tf~(L{yNuqzC5?y Ubz%J5T!CxvQnt%Du|2T`02eqQGynhq delta 64 zcmZo@kZNd>QiOt6r03R$LZU6uP delta 64 zcmZoTAk}a{YQh8NCv!G7K5l)?*!q~M^)YknW0tLtSwA*_gtuRBWIg*pV3C=u3Hym6 U=S62VT+FA;VA{SViOt6r04^CG!vFvP diff --git a/BaseTools/Bin/Win32/Trim.exe b/BaseTools/Bin/Win32/Trim.exe index 4c6993bf3ba5cc8e3b5542a50b116c2bff9df20d..527bff8035213e46c50a4b7c5f50c6bdfb48edff 100755 GIT binary patch delta 2530 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 WCq5C>571;EzZBGk&SS$`D*89#jre>3 diff --git a/BaseTools/Bin/Win32/VfrCompile.exe b/BaseTools/Bin/Win32/VfrCompile.exe index cf31c305a006843da2dad7c658edd48e784d0a08..21e66b81c723a4fb56f38add30f924ba3140b29e 100755 GIT binary patch delta 105 zcmZoT;L&ivW5NsOzKL5KU$?$yY<ua7!Ly+2bcO#zd?nb<|`~n6yGG;Hz^l;j+)F0CcJf_T~ciO6-Qnm<^y7WAQsqu#Zge_ F9srE5FW3M8 diff --git a/BaseTools/Bin/Win32/VolInfo.exe b/BaseTools/Bin/Win32/VolInfo.exe index d7d30c45d6d3eaf0a42a7c369163f653d90a1c82..0f1bbc820a2de2f7c827fa03a2bb530466826da1 100755 GIT binary patch delta 72 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 QS@6OL?o#|h%`wvd1*E=do&W#< delta 4446 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 diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 311749285f..e2dc5a5e52 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -1172,14 +1172,15 @@ def ParseConsoleLog(Filename): # def CheckPcdDatum(Type, Value): if Type == "VOID*": - if not ((Value.startswith('L"') or Value.startswith('"') and Value.endswith('"')) + if not (((Value.startswith('L"') or Value.startswith('"')) and Value.endswith('"')) or (Value.startswith('{') and Value.endswith('}')) ): return False, "Invalid value [%s] of type [%s]; must be in the form of {...} for array"\ ", or \"...\" for string, or L\"...\" for unicode string" % (Value, Type) elif Type == 'BOOLEAN': - if Value not in ['TRUE', 'FALSE']: - return False, "Invalid value [%s] of type [%s]; must be TRUE or FALSE" % (Value, Type) + if Value not in ['TRUE', 'True', 'true', '0x1', '0x01', '1', 'FALSE', 'False', 'false', '0x0', '0x00', '0']: + return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\ + ", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type) elif type(Value) == type(""): try: Value = long(Value, 0) diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py index b3ad16715a..bfa2b7b590 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -41,7 +41,7 @@ gHexNumberPattern = re.compile("0[xX]([0-9a-fA-F]+)") ## Regular expression for matching "Include ()" in asl file gAslIncludePattern = re.compile("^(\s*)[iI]nclude\s*\(\"?([^\"\(\)]+)\"\)", re.MULTILINE) ## Regular expression for matching C style #include "XXX.asl" in asl file -gAslCIncludePattern = re.compile(r'^(\s*)#include\s*[<"]\s*([-\\/\w.]+)\s*[>"]', re.MULTILINE) +gAslCIncludePattern = re.compile(r'^(\s*)#include\s*[<"]\s*([-\\/\w.]+)\s*([>"])', re.MULTILINE) ## Regular expression for matching constant with 'ULL' and 'UL', 'LL', 'L' postfix gLongNumberPattern = re.compile("(0[xX][0-9a-fA-F]+|[0-9]+)U?LL", re.MULTILINE) ## Patterns used to convert EDK conventions to EDK2 ECP conventions @@ -273,12 +273,23 @@ def TrimPreprocessedVfr(Source, Target): # @param Source File to be read # @param Indent Spaces before the Include() statement # @param IncludePathList The list of external include file +# @param LocalSearchPath If LocalSearchPath is specified, this path will be searched +# first for the included file; otherwise, only the path specified +# in the IncludePathList will be searched. # -def DoInclude(Source, Indent='', IncludePathList=[]): +def DoInclude(Source, Indent='', IncludePathList=[], LocalSearchPath=None): NewFileContent = [] try: - for IncludePath in IncludePathList: + # + # Search LocalSearchPath first if it is specified. + # + if LocalSearchPath: + SearchPathList = [LocalSearchPath] + IncludePathList + else: + SearchPathList = IncludePathList + + for IncludePath in SearchPathList: IncludeFile = os.path.join(IncludePath, Source) if os.path.isfile(IncludeFile): F = open(IncludeFile, "r") @@ -298,15 +309,21 @@ def DoInclude(Source, Indent='', IncludePathList=[]): gIncludedAslFile.append(IncludeFile) for Line in F: + LocalSearchPath = None Result = gAslIncludePattern.findall(Line) if len(Result) == 0: Result = gAslCIncludePattern.findall(Line) if len(Result) == 0 or os.path.splitext(Result[0][1])[1].lower() not in [".asl", ".asi"]: NewFileContent.append("%s%s" % (Indent, Line)) continue + # + # We should first search the local directory if current file are using pattern #include "XXX" + # + if Result[0][2] == '"': + LocalSearchPath = os.path.dirname(IncludeFile) CurrentIndent = Indent + Result[0][0] IncludedFile = Result[0][1] - NewFileContent.extend(DoInclude(IncludedFile, CurrentIndent, IncludePathList)) + NewFileContent.extend(DoInclude(IncludedFile, CurrentIndent, IncludePathList, LocalSearchPath)) NewFileContent.append("\n") gIncludedAslFile.pop() diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py index 3c7d7fdf6a..2b25dc42ae 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -503,6 +503,13 @@ class InfParser(MetaFileParser): EdkLogger.error('Parser', FORMAT_INVALID, "No token space GUID or PCD name specified", ExtraData=self._CurrentLine + " (.)", File=self.MetaFile, Line=self._LineIndex+1) + # if value are 'True', 'true', 'TRUE' or 'False', 'false', 'FALSE', replace with integer 1 or 0. + if self._ValueList[2] != '': + InfPcdValueList = GetSplitValueList(TokenList[1], TAB_VALUE_SPLIT, 1) + if InfPcdValueList[0] in ['True', 'true', 'TRUE']: + self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '1', 1); + elif InfPcdValueList[0] in ['False', 'false', 'FALSE']: + self._ValueList[2] = TokenList[1].replace(InfPcdValueList[0], '0', 1); ## [depex] section parser def _DepexParser(self): @@ -929,7 +936,13 @@ class DscParser(MetaFileParser): EdkLogger.error('Parser', FORMAT_INVALID, "No PCD value given", ExtraData=self._CurrentLine + " (.|)", File=self.MetaFile, Line=self._LineIndex+1) - + # if value are 'True', 'true', 'TRUE' or 'False', 'false', 'FALSE', replace with integer 1 or 0. + DscPcdValueList = GetSplitValueList(TokenList[1], TAB_VALUE_SPLIT, 1) + if DscPcdValueList[0] in ['True', 'true', 'TRUE']: + self._ValueList[2] = TokenList[1].replace(DscPcdValueList[0], '1', 1); + elif DscPcdValueList[0] in ['False', 'false', 'FALSE']: + self._ValueList[2] = TokenList[1].replace(DscPcdValueList[0], '0', 1); + ## [components] section parser def _ComponentParser(self): if self._CurrentLine[-1] == '{': @@ -1226,6 +1239,10 @@ class DecParser(MetaFileParser): if not IsValid: EdkLogger.error('Parser', FORMAT_INVALID, Cause, ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex+1) + if ValueList[0] in ['True', 'true', 'TRUE']: + ValueList[0] = '1' + elif ValueList[0] in ['False', 'false', 'FALSE']: + ValueList[0] = '0' self._ValueList[2] = ValueList[0].strip() + '|' + ValueList[1].strip() + '|' + ValueList[2].strip() -- 2.30.2