[U-Boot] [PATCH 2/3] standalone: convert to kbuild style
Wolfgang Denk
wd at denx.de
Fri Sep 4 23:07:53 CEST 2009
Dear Mike Frysinger,
In message <1252033969-28357-2-git-send-email-vapier at gentoo.org> you wrote:
> Clean up the arch/cpu/board/config checks as well as redundant setting of
> srec/bin variables by using the kbuild VAR-$(...) style.
>
> Signed-off-by: Mike Frysinger <vapier at gentoo.org>
> ---
> examples/standalone/Makefile | 96 ++++++++++++-----------------------------
> 1 files changed, 28 insertions(+), 68 deletions(-)
This does not apply any more. Please rebase and repost. Thanks in
advance.
Applying: standalone: convert to kbuild style
error: patch failed: examples/standalone/Makefile:23
error: examples/standalone/Makefile: patch does not apply
fatal: sha1 information is lacking or useless (examples/standalone/Makefile).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.
When you have resolved this problem run "git am -i -3 --resolved".
If you would prefer to skip this patch, instead run "git am -i -3 --skip".
To restore the original branch and stop patching run "git am -i -3 --abort".
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"To take a significant step forward, you must make a series of finite
improvements." - Donald J. Atwood, General Motors
More information about the U-Boot
mailing list