Thanks for your responses, guys. I've tried both of your methods, and both give me similar errors. In the m5275evb patch, everything works except MAKEALL and Makefile. In the mcf5275 patch, there are a lot more errors.
<br><br>I should note that I couldn't find the exact
commit TsiChung mentions... the number you cite is missing a 6.... but I
assume that was a type and we're talking about the same one: I found and am using:<br><br>f188896c2f1594fe749fdb99bbc8c54023cfab3a Wolfgang Denk [Thu, 17 Jan 2008 08:35:26 +0000] <br>Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
<br><br>Here's what I'm doing:
<br><br>david@chiron:~$ git clone git://www.denx.de/git/u-boot.git u-boot/<br>Initialized empty Git repository in /home/david/u-boot/.git/<br>remote: Generating pack...<br>remote: Counting objects: 1299<br>remote: Done counting 51432 objects.
<br>remote: Deltifying 51432 objects...<br>remote: 100% (51432/51432) done<br>Indexing 51432 objects...<br>remote: Total 51432 (delta 41342), reused 51070 (delta 41043)<br> 100% (51432/51432) done<br>Resolving 41342 deltas...
<br> 100% (41342/41342) done<br>david@chiron:~$ cp mcf5275patch u-boot/<br>david@chiron:~$ cp m5275evbPatch u-boot/<br>david@chiron:~$ cd u-boot<br>david@chiron:~/u-boot$ git-branch patched master<br>david@chiron:~/u-boot$ git-branch
<br>* master<br> patched<br>david@chiron:~/u-boot$ git-checkout patched<br>Switched to branch "patched"<br>david@chiron:~/u-boot$ git-reset --hard f188896c2f1594fe749fdb99bbc8c54023cfab3a<br> <br>HEAD is now at f188896... Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
<br>david@chiron:~/u-boot$ git-apply --whitespace=strip mcf5275patch<br>error: patch failed: cpu/mcf52x2/cpu.c:6<br>error: cpu/mcf52x2/cpu.c: patch does not apply<br>error: patch failed: cpu/mcf52x2/cpu_init.c:10<br>error: cpu/mcf52x2/cpu_init.c: patch does not apply
<br>error: patch failed: cpu/mcf52x2/interrupts.c:59<br>error: cpu/mcf52x2/interrupts.c: patch does not apply<br>error: patch failed: cpu/mcf52x2/speed.c:65<br>error: cpu/mcf52x2/speed.c: patch does not apply<br>error: patch failed: cpu/mcf52x2/start.S:197
<br>error: cpu/mcf52x2/start.S: patch does not apply<br>error: patch failed: include/asm-m68k/immap.h:146<br>error: include/asm-m68k/immap.h: patch does not apply<br>david@chiron:~/u-boot$ git-apply --whitespace=strip m5275evbPatch
<br>error: patch failed: MAKEALL:648<br>error: MAKEALL: patch does not apply<br>error: patch failed: Makefile:1790<br>error: Makefile: patch does not apply<br><br><br>Trying to use the patch command, I get the following:<br>
<br>david@chiron:~/u-boot$ patch -p1 <m5275evbPatch <br>patching file MAKEALL<br>Hunk #1 FAILED at 648.<br>1 out of 1 hunk FAILED -- saving rejects to file MAKEALL.rej<br>patching file Makefile<br>Hunk #1 FAILED at 1790.
<br>1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej<br>patching file board/freescale/m5275evb/Makefile<br>patching file board/freescale/m5275evb/config.mk<br>patching file board/freescale/m5275evb/m5275evb.c
<br>patching file board/freescale/m5275evb/mii.c<br>patching file board/freescale/m5275evb/u-boot.lds<br>patching file include/configs/M5275EVB.h<br><br>david@chiron:~/u-boot$ patch -p1 <mcf5275patch <br>patching file CREDITS
<br>patching file cpu/mcf52x2/config.mk<br>patching file cpu/mcf52x2/cpu.c<br>Hunk #1 FAILED at 6.<br>Hunk #2 FAILED at 183.<br>2 out of 2 hunks FAILED -- saving rejects to file cpu/mcf52x2/cpu.c.rej<br>patching file cpu/mcf52x2/cpu_init.c
<br>Hunk #1 FAILED at 10.<br>Hunk #2 succeeded at 248 with fuzz 2.<br>1 out of 2 hunks FAILED -- saving rejects to file cpu/mcf52x2/cpu_init.c.rej<br>patching file cpu/mcf52x2/interrupts.c<br>Hunk #1 succeeded at 59 with fuzz 2.
<br>Hunk #2 FAILED at 81.<br>1 out of 2 hunks FAILED -- saving rejects to file cpu/mcf52x2/interrupts.c.rej<br>patching file cpu/mcf52x2/speed.c<br>Hunk #1 FAILED at 65.<br>1 out of 1 hunk FAILED -- saving rejects to file cpu/mcf52x2/speed.c.rej
<br>patching file cpu/mcf52x2/start.S<br>Hunk #1 succeeded at 197 with fuzz 2.<br>Hunk #2 succeeded at 405 with fuzz 2.<br>patching file include/asm-m68k/immap.h<br>Hunk #1 succeeded at 146 with fuzz 2.<br>patching file include/asm-m68k/immap_5275.h
<br>patching file include/asm-m68k/m5275.h<br><br>Any ideas?<br>-David<br><br>