Skip to contentSkip to conversation

lwmon5 dspic POST spezification

PATCH New Sascha Laue 2 participants 2 messages Apr 30, 2008

lore
Share & tools
lore

Sascha Laue

author
#0 lore raw

PATCH 1/1 lwmon5 dspic POST spezification

Hello Wolfgang,

I've found this merge-merge-error.

best regards
Sascha Laue

From: Sascha Laue <[email protected]>
Date: Wed, 30 Apr 2008 12:27:21 +0200
Subject: [PATCH] fix manual merge error in lwmon5 posttest.

Signed-off-by Sascha Laue <[email protected]>
---
 post/board/lwmon5/sysmon.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
post/board/lwmon5/sysmon.c +2 -2
index 793f670..23cb709 100644
@@ -132,7 +132,7 @@ static sysmon_table_t sysmon_table[] =
 
        {
        "+ 5 V", "V", &sysmon_dspic, NULL, NULL,
-       100, 1000, 0, 0xFFFF, 0xFFFF,
+       100, 1000, -0x8000, 0x7FFF, 0xFFFF,
        VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
        VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
        REG_VOLTAGE_5V,

@@ -140,7 +140,7 @@ static sysmon_table_t sysmon_table[] =
 
        {
        "+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,
-       100, 1000, 0, 0xFFFF, 0xFFFF,
+       100, 1000, -0x8000, 0x7FFF, 0xFFFF,
        VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
        VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
        REG_VOLTAGE_5V_STANDBY,

--
1.5.2.4

-------- Original-Nachricht --------

Quoted 32 lines

Datum: Mon, 28 Apr 2008 22:41:39 +0200
Von: Wolfgang Denk <[email protected]>
An: "Sascha Laue" <[email protected]>
CC: marcel.brasch at liebherr.com, u-boot-users at lists.sourceforge.net, mk at denx.de
Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezification

Quoted 10 lines · In message <[email protected]> you wrote:

sorry but it's the first time for me.
let's try again.

we modified the specification for the lwmon5 board dspic POST. Additionally I have add defines for the temperature- and voltagevalues.

Signed-off-by Sascha Laue <[email protected]>
---
 post/board/lwmon5/sysmon.c |   39

++++++++++++++++++++++++++++++---------

Quoted 1 line
 1 files changed, 30 insertions(+), 9 deletions(-)

Applied, 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 Committee, n.: A group of men who individually can do nothing but as
a group decide that nothing can be done. - Fred Allen

Applied
#1 lore raw

PATCH 1/1 lwmon5 dspic POST spezification

Quoted 7 lines · In message <[email protected]> you wrote:

Hello Wolfgang,

I've found this merge-merge-error.

best regards
Sascha Laue

Quoted 8 lines

From: Sascha Laue <[email protected]>
Date: Wed, 30 Apr 2008 12:27:21 +0200
Subject: [PATCH] fix manual merge error in lwmon5 posttest.

Signed-off-by Sascha Laue <[email protected]>
---
 post/board/lwmon5/sysmon.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Applied, manually - your patch is white-space corrupted and does not apply:

Applying lwmon5: fix manual merge error in POST
error: patch failed: post/board/lwmon5/sysmon.c:132
error: post/board/lwmon5/sysmon.c: patch does not apply Using index info to reconstruct a base tree...
error: patch failed: post/board/lwmon5/sysmon.c:132
error: post/board/lwmon5/sysmon.c: patch does not apply Did you hand edit your patch?
It does not apply to blobs recorded in its index. Cannot fall back to three-way merge.
Patch failed at 0001.

Best regards,

Wolfgang Denk

Signature · 5 lines
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
The human mind treats a new idea the way the body  treats  a  strange
protein - it rejects it.                                 - P. Medawar