[U-Boot-Users] [PATCH] lwmon5 dspic POST spezification
Wolfgang Denk
wd at denx.de
Wed Mar 26 00:18:38 CET 2008
In message <20080320120557.182790 at gmx.net> you wrote:
> Ups.
>
> Best regards
>
> Sascha Laue
>
> diff -u -r -N u-boot/post/board/lwmon5/sysmon.c u-boot-mod/post/board/lwmon=
> 5/sysmon.c
Sorry, but this patch does not apply:
Applying lwmon5: update dsPIC POST spezification
.dotest/patch:29: trailing whitespace.
#define TEMPERATURE_DISPLAY_MAX (+85) /* °C */
.dotest/patch:46: trailing whitespace.
1, 1, -0x8000, 0x7FFF, 0xFFFF,
.dotest/patch:48: trailing whitespace.
0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 +
TEMPERATURE_DISPLAY_MAX, 0,
.dotest/patch:54: trailing whitespace.
100, 1000, -0x8000, 0x7FFF, 0xFFFF,
.dotest/patch:56: trailing whitespace.
0x8000 + VOLTAGE_5V_MIN , 0x8000 + VOLTAGE_5V_MAX, 0,
error: patch failed: post/board/lwmon5/sysmon.c:110
error: post/board/lwmon5/sysmon.c: patch does not apply
fatal: sha1 information is lacking or useless
(post/board/lwmon5/sysmon.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.
Please cleanup the code (whitespace issues), and use git-format-patch
and git-send-email to post a clean, usable patch.
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
A failure will not appear until a unit has passed final inspection.
More information about the U-Boot
mailing list