Re: [U-Boot] Where can I find the git repostory for mx51evk
Terry, On 2/28/2010 8:48 PM, Lv Terry-R65388 wrote: > 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 Add initial support for Freescale > mx51evkboard.txt" > I sometimes have problems with Thunderbird whitespace-damaging patches in Windows, and find that stripping the '\r' carriage-return characters seems to work. My weapon of choice is 'dos2unix', but you could go old-school with 'tr' or even change the file type in vim. HTH, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Where can I find the git repostory for mx51evk
Lv Terry-R65388 wrote: > Hi Denk, > Hi Terry, > 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. Do not do it. Even if it for some strange seems working (it could be for an easy patch), you apply a patch different as the one sent to the ML. The correct step is to save the e-mail as it is. If your e-mail client does not support it, take another one. > 2. Use git am to apply the patch. > /home/r65388/uboot-imx/.git/rebase-apply/patch:72: trailing > whitespace. # This program is free software; you can redistribute it This is really caused by your client and tells you that the e-mail was not correctly saved. Regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
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: > > It seems that "git am" doesn't work for me. Well, I'm afraid there is little we can do to help you with that. Setting up a basic working tool chain is something you have to do yourself; we don't know your environment. If you don't succeed yourself, then ask another, more experienced engineer in your team for help, or some support guy. > 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. Maybe you should try and avoid working in a Windows based environment here. I have no way how many wonderful ways Outlook knows to mess up the messages it processes. > What's your git version? > We're using 1.6.0.4. We are using git versions 1.6.2.5 and 1.6.6 (i. e. what comes with recent Fedora distributions). > I don't know if it is the git version that cause the problem. The problems you report are not caused by git version differences. 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 Do not underestimate the value of print statements for debugging. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Where can I find the git repostory for mx51evk
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 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 Signed-off-by: Fred Fan -- 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 # # (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 Signed-off-by: Fred Fan -- 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
[U-Boot] Where can I find the git repostory for mx51evk
Hi Denx, I have cloned u-boot-imx and want to apply the patch "[U-Boot] [PATCH V4 11/11] Add initial support for Freescale mx51evk board" for a test. But the patch can't be appled. error: patch failed: MAINTAINERS:152 error: MAINTAINERS: patch does not apply How can I get the repostory for mx51evk? Thanks~~ Yours Terry General Business Information Freescale Internal Use Only Freescale Confidential Proprietary ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Where can I find the git repostory for mx51evk
Dear Stefano Babic, In message <4b87bc50.8000...@denx.de> you wrote: > > The patch was sent some times ago, based on the u-boot master branch at > the time it was sent. Of course, other boards went to the mainline in > the meantime, patching the MAINTAINERS file again - you have probably to > merge this file. There are no merge conflicts. git will happily apply your patch as is; I just verified this again. I used 'git-am' though, of course. 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 I mean, I . . . think to understand you, I just don't know what you are saying ...- Terry Pratchett, _Soul Music_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
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 Signed-off-by: Fred Fan -- 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
Re: [U-Boot] Where can I find the git repostory for mx51evk
Lv Terry-R65388 wrote: > Hi Denk, > Hi Terry, > 4. Try "git apply patch". I think the normal way to do is to use "git am" getting the whole e-mail, but this is not your problem now. > r65...@szx32-17[/home/r65388/uboot-imx]602% git apply patch > error: patch failed: MAINTAINERS:152 > error: MAINTAINERS: patch does not apply The patch was sent some times ago, based on the u-boot master branch at the time it was sent. Of course, other boards went to the mainline in the meantime, patching the MAINTAINERS file again - you have probably to merge this file. Regards, Stefano -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Where can I find the git repostory for mx51evk
Hi Denk, I have tried to apply the patch on mainline. 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. 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 Thanks~~ Yours Terry -Original Message- From: Wolfgang Denk [mailto:w...@denx.de] Sent: 2010年2月26日 18:09 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 cloned u-boot-imx and want to apply the patch "[U-Boot] Why did you do that? u-boot-imx is currently in a pretty poor state, as the new custodian has nor picked up work yet, so this repository is very old. > [PATCH V4 11/11] Add initial support for Freescale mx51evk board" for > a test. > > But the patch can't be appled. Patches submitted on the mailing list are supposed to be applied against mainline (master branch). Did you try that? 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 Ordnung ist die Lust der Vernunft, aber Unordnung die Wonne der Phantasie - Paul Claudel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
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 cloned u-boot-imx and want to apply the patch "[U-Boot] Why did you do that? u-boot-imx is currently in a pretty poor state, as the new custodian has nor picked up work yet, so this repository is very old. > [PATCH V4 11/11] Add initial support for Freescale mx51evk board" for a > test. > > But the patch can't be appled. Patches submitted on the mailing list are supposed to be applied against mainline (master branch). Did you try that? 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 Ordnung ist die Lust der Vernunft, aber Unordnung die Wonne der Phantasie - Paul Claudel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Where can I find the git repostory for mx51evk
Hi Denx, I have cloned u-boot-imx and want to apply the patch "[U-Boot] [PATCH V4 11/11] Add initial support for Freescale mx51evk board" for a test. But the patch can't be appled. error: patch failed: MAINTAINERS:152 error: MAINTAINERS: patch does not apply How can I get the repostory for mx51evk? Thanks~~ Yours Terry General Business Information Freescale Internal Use Only Freescale Confidential Proprietary ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
