[U-Boot] [PATCH 7/7] pxe: add support for parsing local syslinux files

[Joe Hershberger]

Hi Rob,

On Wed, Mar 28, 2012 at 10:51 AM, Rob Herring <robherring2 at gmail.com> wrote:
> From: Rob Herring <rob.herring at 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.herring at 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.

Thanks,
-Joe