David,
Matthew's patch is based of commit f18889c2f1... Jan 17 09:35:26 2008 +0100
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master. When
you cloned the latest as today, there are dozen of patches since then, so the
patches show errors when you applied.
First, you create a new branch based of master if you use the main stream
branch. git-branch newbranch master. Change your branch to newbranch.
git-checkout newbranch. Reset to the commit mentioned above. git-reset --hard
f18889c2f1... Update the two patches from Matthew (Make sure no unwrap text and
unix file format) git-apply --whitespace=strip patch. Use git-add to apply all
the new files just added, then temporary create a commit git-commit (Otherwise,
rebase won't work). To merge with updated u-boot. git-rebase master newbranch.
There maybe other methods to apply the patch, but this is the method I used so
far.
Hope this help.
Regards,
TsiChung
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
