Hi Denk, It seems that "git am" doesn't work for me.
The steps are: 1. Save the patch as txt file in outlook and copy to u-boot directory. 2. Use git am to apply the patch. r65...@szx32-17[/home/r65388/uboot-imx]686% git am -i -u --whitespace=strip ./"U-Boot PATCH V4 1111 Add initial support for Freescale mx51evkboard.txt" Commit Body is: -------------------------- [sba...@denx.de] Sent: 2010年2月5日星期五 22:14 To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V4 11/11] Add initial support for Freescale mx51evkboard The patch adds initial support for the Freescale mx51evk board. Network (FEC) and SD controller (fsl_esdhc) are supported. Signed-off-by: Stefano Babic <sba...@denx.de> Signed-off-by: Fred Fan <fanyef...@gmail.com> -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: [sba...@denx.de] /home/r65388/uboot-imx/.git/rebase-apply/patch:69: trailing whitespace. # Copyright (C) 2007, Guennadi Liakhovetski <l...@denx.de> # # (C) /home/r65388/uboot-imx/.git/rebase-apply/patch:72: trailing whitespace. # This program is free software; you can redistribute it and/or # /home/r65388/uboot-imx/.git/rebase-apply/patch:73: trailing whitespace. modify it under the terms of the GNU General Public License as # /home/r65388/uboot-imx/.git/rebase-apply/patch:74: trailing whitespace. published by the Free Software Foundation; either version 2 of # the /home/r65388/uboot-imx/.git/rebase-apply/patch:77: trailing whitespace. # This program is distributed in the hope that it will be useful, # but fatal: corrupt patch at line 145 Patch failed at 0001. When you have resolved this problem run "git am -i --resolved". If you would prefer to skip this patch, instead run "git am -i --skip". To restore the original branch and stop patching run "git am -i --abort". What's your git version? We're using 1.6.0.4. I don't know if it is the git version that cause the problem. Thanks~~ Yours Terry -----Original Message----- From: Wolfgang Denk [mailto:w...@denx.de] Sent: 2010年2月26日 20:33 To: Lv Terry-R65388 Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] Where can I find the git repostory for mx51evk Dear "Lv Terry-R65388", In message <1ae74f652ecb1440b73dd7c2c20842d1ac6...@zch01exm27.fsl.freescale.net> you wrote: > > I have tried to apply the patch on mainline. You must be doing something wrong, then. I re-tested it, it applies cleanly: -> git-am -3 -i -u --whitespace=strip ~/Mail/U-Boot/7647 Commit Body is: -------------------------- Add initial support for Freescale mx51evk board The patch adds initial support for the Freescale mx51evk board. Network (FEC) and SD controller (fsl_esdhc) are supported. Signed-off-by: Stefano Babic <sba...@denx.de> Signed-off-by: Fred Fan <fanyef...@gmail.com> -------------------------- Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y Applying: Add initial support for Freescale mx51evk board -> > The steps are: > > 1. Copy patch from > > http://article.gmane.org/gmane.comp.boot-loaders.u-boot/74754. > 2. Paste it to local text file patch. Eventually the patch gets mangled (white space corrupted) this way. > 3. Clone a new u-boot. > 4. Try "git apply patch". > > I encountered errors: > > r65...@szx32-17[/home/r65388/uboot-imx]602% git apply patch > error: patch failed: MAINTAINERS:152 > error: MAINTAINERS: patch does not apply Try using "git am", and avoid the copy & paste - save the page as text file instead. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "It was the Law of the Sea, they said. Civilization ends at the wa- terline. Beyond that, we all enter the food chain, and not always right at the top." - Hunter S. Thompson _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot