[U-Boot] PATCH: Fix MPC8260 with ethernet on SCC
Wolfgang Denk
wd at denx.de
Wed Feb 11 22:23:24 CET 2009
Dear Heiko,
In message <4991D7C9.9010100 at denx.de> you wrote:
>
> This patch also breaks compiling the mgcoge :-(
...
> So, please when adding ksi's patch, add the following to:
>
> Signed-off-by: Heiko Schocher <hs at denx.de>
> ---
> include/configs/mgcoge.h | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
Sorry, doesn't apply:
error: patch failed: include/configs/mgcoge.h:67
error: include/configs/mgcoge.h: patch does not apply
fatal: sha1 information is lacking or useless
(include/configs/mgcoge.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.
[And please provide a usable Subject / commit message. Thanks.]
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
I really hate this damned machine It never does quite what I want
I wish that they would sell it. But only what I tell it.
More information about the U-Boot
mailing list