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.
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:
f188896c2f1594fe749fdb99bbc8c54023cfab3a Wolfgang Denk [Thu, 17 Jan 2008 08:35:26 +0000] Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Here's what I'm doing:
david@chiron:~$ git clone git://www.denx.de/git/u-boot.git u-boot/ Initialized empty Git repository in /home/david/u-boot/.git/ remote: Generating pack... remote: Counting objects: 1299 remote: Done counting 51432 objects. remote: Deltifying 51432 objects... remote: 100% (51432/51432) done Indexing 51432 objects... remote: Total 51432 (delta 41342), reused 51070 (delta 41043) 100% (51432/51432) done Resolving 41342 deltas... 100% (41342/41342) done david@chiron:~$ cp mcf5275patch u-boot/ david@chiron:~$ cp m5275evbPatch u-boot/ david@chiron:~$ cd u-boot david@chiron:~/u-boot$ git-branch patched master david@chiron:~/u-boot$ git-branch * master patched david@chiron:~/u-boot$ git-checkout patched Switched to branch "patched" david@chiron:~/u-boot$ git-reset --hard f188896c2f1594fe749fdb99bbc8c54023cfab3a
HEAD is now at f188896... Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master david@chiron:~/u-boot$ git-apply --whitespace=strip mcf5275patch error: patch failed: cpu/mcf52x2/cpu.c:6 error: cpu/mcf52x2/cpu.c: patch does not apply error: patch failed: cpu/mcf52x2/cpu_init.c:10 error: cpu/mcf52x2/cpu_init.c: patch does not apply error: patch failed: cpu/mcf52x2/interrupts.c:59 error: cpu/mcf52x2/interrupts.c: patch does not apply error: patch failed: cpu/mcf52x2/speed.c:65 error: cpu/mcf52x2/speed.c: patch does not apply error: patch failed: cpu/mcf52x2/start.S:197 error: cpu/mcf52x2/start.S: patch does not apply error: patch failed: include/asm-m68k/immap.h:146 error: include/asm-m68k/immap.h: patch does not apply david@chiron:~/u-boot$ git-apply --whitespace=strip m5275evbPatch error: patch failed: MAKEALL:648 error: MAKEALL: patch does not apply error: patch failed: Makefile:1790 error: Makefile: patch does not apply
Trying to use the patch command, I get the following:
david@chiron:~/u-boot$ patch -p1 <m5275evbPatch patching file MAKEALL Hunk #1 FAILED at 648. 1 out of 1 hunk FAILED -- saving rejects to file MAKEALL.rej patching file Makefile Hunk #1 FAILED at 1790. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej patching file board/freescale/m5275evb/Makefile patching file board/freescale/m5275evb/config.mk patching file board/freescale/m5275evb/m5275evb.c patching file board/freescale/m5275evb/mii.c patching file board/freescale/m5275evb/u-boot.lds patching file include/configs/M5275EVB.h
david@chiron:~/u-boot$ patch -p1 <mcf5275patch patching file CREDITS patching file cpu/mcf52x2/config.mk patching file cpu/mcf52x2/cpu.c Hunk #1 FAILED at 6. Hunk #2 FAILED at 183. 2 out of 2 hunks FAILED -- saving rejects to file cpu/mcf52x2/cpu.c.rej patching file cpu/mcf52x2/cpu_init.c Hunk #1 FAILED at 10. Hunk #2 succeeded at 248 with fuzz 2. 1 out of 2 hunks FAILED -- saving rejects to file cpu/mcf52x2/cpu_init.c.rej patching file cpu/mcf52x2/interrupts.c Hunk #1 succeeded at 59 with fuzz 2. Hunk #2 FAILED at 81. 1 out of 2 hunks FAILED -- saving rejects to file cpu/mcf52x2/interrupts.c.rej patching file cpu/mcf52x2/speed.c Hunk #1 FAILED at 65. 1 out of 1 hunk FAILED -- saving rejects to file cpu/mcf52x2/speed.c.rej patching file cpu/mcf52x2/start.S Hunk #1 succeeded at 197 with fuzz 2. Hunk #2 succeeded at 405 with fuzz 2. patching file include/asm-m68k/immap.h Hunk #1 succeeded at 146 with fuzz 2. patching file include/asm-m68k/immap_5275.h patching file include/asm-m68k/m5275.h
Any ideas? -David