Hi Rob, On Wed, May 23, 2012 at 5:57 PM, Rob Herring <robherri...@gmail.com> wrote: > On 05/23/2012 05:11 PM, Joe Hershberger wrote: >> Hi Rob, >> >> On Wed, Mar 28, 2012 at 10:51 AM, Rob Herring <robherri...@gmail.com> wrote: >>> From: Rob Herring <rob.herr...@calxeda.com> >>> >>> Add a new command "sysboot" which parses syslinux menu files and boots >>> using kernel and initrd specified by menu files. The operation is similar >>> to "pxe boot" except local files on ext2 or fat filesystem are parsed. >>> >>> Signed-off-by: Rob Herring <rob.herr...@calxeda.com> >> >> I attempted to apply this patch but it failed. >> >> Applying: pxe: add support for parsing local syslinux files >> error: patch failed: common/cmd_pxe.c:322 >> error: common/cmd_pxe.c: patch does not apply >> fatal: sha1 information is lacking or useless (common/cmd_pxe.c). >> Repository lacks necessary blobs to fall back on 3-way merge. >> Cannot fall back to three-way merge. >> Patch failed at 0007. >> >> Please rebase the series and resend. > > I rebased to Wolfgang's current master without any conflicts, so I'm > puzzled why this failed for you. I was originally based on this commit > plus a few otherwise unrelated highbank fixes: > > commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2 > Merge: 636f77a 85c344e > Author: Wolfgang Denk <w...@denx.de> > Date: Fri Mar 23 21:59:16 2012 +0100 > > Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash > > * 'master' of git://git.denx.de/u-boot-cfi-flash: > cfi: fix the incomplete erased status check in buffer write > > What base were you applying these to?
I just tried again on u-boot.git/master... > git checkout origin/master Note: moving to "origin/master" which isn't a local branch If you want to create a new branch from this checkout, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b <new_branch_name> HEAD is now at b86a475... MAKEALL: Report boards with errors vs warnings > git am < bundle-2943.mbox Applying: menu: only timeout when menu is displayed Applying: pxe: support include files at top-level Applying: pxe: add support for label menu text Applying: pxe: support linux entries for labels Applying: pxe: support absolute paths Applying: pxe: parse initrd file from append string Applying: pxe: add support for parsing local syslinux files error: patch failed: common/cmd_pxe.c:322 error: common/cmd_pxe.c: patch does not apply Patch failed at 0007. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". I'm attempting to apply these patches in patchwork: http://patchwork.ozlabs.org/patch/149281/ http://patchwork.ozlabs.org/patch/149280/ http://patchwork.ozlabs.org/patch/149282/ http://patchwork.ozlabs.org/patch/149283/ http://patchwork.ozlabs.org/patch/149284/ http://patchwork.ozlabs.org/patch/149286/ http://patchwork.ozlabs.org/patch/149285/ in that order... is that incorrect? Thanks -Joe _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
