lwmon5 dspic POST spezification
PATCH 1/1 lwmon5 dspic POST spezification
Hi all,
we modified the specification for the lwmon5 board dspic POST. Additionally I have add defines for the temperature- and voltagevalues.
@@ -34,9 +34,10 @@
* The test passes when all the following voltages and temperatures
* are within allowed ranges:
*
- * Temperature -40 .. +85 C
- * +5V +4.75 .. +5.25 V
- * +5V standby +4.75 .. +5.25 V
+ * Temperature -40 .. +90 ?C
+ * Tempreature_Display -35 .. +85 ?C
+ * +5V +4.50 .. +5.50 V
+ * +5V standby +3.50 .. +5.50 V
*
* LCD backlight is not enabled if temperature values are not within
* allowed ranges (-30 .. + 80). The brightness of backlite can be
@@ -62,6 +63,21 @@
#define RELOC(x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off)
+#define REG_TEMPERATURE 0x12BC +#define REG_VOLTAGE_5V 0x12CA +#define REG_VOLTAGE_5V_STANDBY 0x12C6 + +#define TEMPERATURE_MIN (-40) /* ?C */ +#define TEMPERATURE_MAX (+90) /* ?C */ +#define TEMPERATURE_DISPLAY_MIN (-35) /* ?C */ +#define TEMPERATURE_DISPLAY_MAX (+85) /* ?C */ + +#define VOLTAGE_5V_MIN (+4500) /* mV */ +#define VOLTAGE_5V_MAX (+5500) /* mV */ + +#define VOLTAGE_5V_STANDBY_MIN (+3500) /* mV */ +#define VOLTAGE_5V_STANDBY_MAX (+5500) /* mV */
+
typedef struct sysmon_s sysmon_t;
typedef struct sysmon_table_s sysmon_table_t;
@@ -110,16 +126,22 @@
static sysmon_table_t sysmon_table[] =
{
{"Temperature", " C", &sysmon_dspic, NULL, sysmon_backlight_disable,
- 1, 1, -32768, 32767, 0xFFFF, 0x8000-40, 0x8000+85, 0,
- 0x8000-30, 0x8000+80, 0, 0x12BC},
+ 1, 1, -0x8000, 0x7FFF, 0xFFFF,
+ 0x8000 + TEMPERATURE_MIN , 0x8000 + TEMPERATURE_MAX , 0,
+ 0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 + TEMPERATURE_DISPLAY_MAX, 0,
+ REG_TEMPERATURE},
{"+ 5 V", "V", &sysmon_dspic, NULL, NULL,- 100, 1000, -0x8000, 0x7FFF, 0xFFFF, 0x8000+4750, 0x8000+5250, 0,
- 0x8000+4750, 0x8000+5250, 0, 0x12CA},
+ 100, 1000, -0x8000, 0x7FFF, 0xFFFF,
+ 0x8000 + VOLTAGE_5V_MIN , 0x8000 + VOLTAGE_5V_MAX, 0,
+ 0x8000 + VOLTAGE_5V_MIN , 0x8000 + VOLTAGE_5V_MAX, 0,
+ REG_VOLTAGE_5V},
{"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,- 100, 1000, -0x8000, 0x7FFF, 0xFFFF, 0x8000+4750, 0x8000+5250, 0,
- 0x8000+4750, 0x8000+5250, 0, 0x12C6},
+ 100, 1000, -0x8000, 0x7FFF, 0xFFFF,
+ 0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0,
+ 0x8000 + VOLTAGE_5V_STANDBY_MIN, 0x8000 + VOLTAGE_5V_STANDBY_MAX, 0,
+ REG_VOLTAGE_5V_STANDBY},
};
static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]);
PATCH 1/1 lwmon5 dspic POST spezification
Dear Sascha,
Review line 35
Quoted 9 lines · Sascha Laue
we modified the specification for the lwmon5 board dspic POST. Additionally I have add defines for the temperature- and voltagevalues.
Signed-of-by Sascha Laue <[email protected]>Signed-of-by Marcel Brasch <[email protected]>(quoted diff) +0
-0@@ -34,9 +34,10 @@ * The test passes when all the following voltages and temperatures * are within allowed ranges:
Ups. It seems you forgot to copy the patch header.
Best regards
Markus Klotzbuecher
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
PATCH 1/1 lwmon5 dspic POST spezification
Ups.
Best regards
Sascha Laue
post/board/lwmon5/sysmon.c +31 -9
@@ -34,9 +34,10 @@* The test passes when all the following voltages and temperatures * are within allowed ranges: * -* Temperature -40 .. +85 C -* +5V +4.75 .. +5.25 V -* +5V standby +4.75 .. +5.25 V +* Temperature -40 .. +90 ?C +* Tempreature_Display -35 .. +85 ?C +* +5V +4.50 .. +5.50 V +* +5V standby +3.50 .. +5.50 V * * LCD backlight is not enabled if temperature values are not within * allowed ranges (-30 .. + 80). The brightness of backlite can be
@@ -62,6 +63,21 @@#define RELOC (x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off) +#define REG_TEMPERATURE 0x12BC +#define REG_VOLTAGE_5V 0x12CA +#define REG_VOLTAGE_5V_STANDBY 0x12C6 + +#define TEMPERATURE_MIN (-40)/* ?C */ +#define TEMPERATURE_MAX (+90)/* ?C */ +#define TEMPERATURE_DISPLAY_MIN (-35)/* ?C */ +#define TEMPERATURE_DISPLAY_MAX (+85)/* ?C */ + +#define VOLTAGE_5V_MIN (+4500)/* mV */ +#define VOLTAGE_5V_MAX (+5500)/* mV */ + +#define VOLTAGE_5V_STANDBY_MIN (+3500)/* mV */ +#define VOLTAGE_5V_STANDBY_MAX (+5500)/* mV */ +typedef struct sysmon_s sysmon_t ;typedef struct sysmon_table_s sysmon_table_t ;
@@ -110,16 +126,22 @@static sysmon_table_t sysmon_table[] = { {"Temperature" ," C" , &sysmon_dspic,NULL , sysmon_backlight_disable, -1 ,1 ,-32768 ,32767 ,0xFFFF ,0x8000 -40 ,0x8000 +85 ,0 , -0x8000 -30 ,0x8000 +80 ,0 ,0x12BC }, +1 ,1 ,-0x8000 ,0x7FFF ,0xFFFF , +0x8000 +TEMPERATURE_MIN ,0x8000 +TEMPERATURE_MAX ,0 , +0x8000 +TEMPERATURE_DISPLAY_MIN ,0x8000 +TEMPERATURE_DISPLAY_MAX ,0 , +REG_TEMPERATURE }, {"+ 5 V" ,"V" , &sysmon_dspic,NULL ,NULL , -100 ,1000 ,-0x8000 ,0x7FFF ,0xFFFF ,0x8000 +4750 ,0x8000 +5250 ,0 , -0x8000 +4750 ,0x8000 +5250 ,0 ,0x12CA }, +100 ,1000 ,-0x8000 ,0x7FFF ,0xFFFF , +0x8000 +VOLTAGE_5V_MIN ,0x8000 +VOLTAGE_5V_MAX ,0 , +0x8000 +VOLTAGE_5V_MIN ,0x8000 +VOLTAGE_5V_MAX ,0 , +REG_VOLTAGE_5V }, {"+ 5 V standby" ,"V" , &sysmon_dspic,NULL ,NULL , -100 ,1000 ,-0x8000 ,0x7FFF ,0xFFFF ,0x8000 +4750 ,0x8000 +5250 ,0 , -0x8000 +4750 ,0x8000 +5250 ,0 ,0x12C6 }, +100 ,1000 ,-0x8000 ,0x7FFF ,0xFFFF , +0x8000 +VOLTAGE_5V_STANDBY_MIN ,0x8000 +VOLTAGE_5V_STANDBY_MAX ,0 , +0x8000 +VOLTAGE_5V_STANDBY_MIN ,0x8000 +VOLTAGE_5V_STANDBY_MAX ,0 , +REG_VOLTAGE_5V_STANDBY }, };static int sysmon_table_size =sizeof (sysmon_table) /sizeof (sysmon_table[0 ]);
-------- Original-Nachricht --------
Quoted 39 lines
Datum: Thu, 20 Mar 2008 13:00:26 +0100
Von: "Markus Klotzb?cher" <[email protected]>
An: "Sascha Laue" <[email protected]>
CC: u-boot-users at lists.sourceforge.net
Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezificationDear Sascha,
Review line 35
Quoted 9 lines · Sascha Laue
we modified the specification for the lwmon5 board dspic POST. Additionally I have add defines for the temperature- and voltagevalues.
Signed-of-by Sascha Laue <[email protected]>Signed-of-by Marcel Brasch <[email protected]>(quoted diff) +0
-0@@ -34,9 +34,10 @@ * The test passes when all the following voltages and temperatures * are within allowed ranges:Ups. It seems you forgot to copy the patch header.
Best regards
Markus Klotzbuecher
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
PATCH 1/1 lwmon5 dspic POST spezification
Quoted 8 lines · In message <[email protected]> you wrote:
Ups.
Best regards
Sascha Laue
diff -u -r -N
u-boot/post/board/lwmon5/sysmon.cu-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
Signature · 4 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 A failure will not appear until a unit has passed final inspection.
PATCH 1/1 lwmon5 dspic POST spezification
Hello Wolfgang,
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.
--- post/board/lwmon5/sysmon.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-)
post/board/lwmon5/sysmon.c +0 -0
--- a/post/board/lwmon5/sysmon.c
index 0cf1cf2..77e7ea2 100644
+++ b/post/board/lwmon5/sysmon.c
@@ -34,9 +34,9 @@
* The test passes when all the following voltages and temperatures
* are within allowed ranges:
*
- * Temperature -40 .. +85 C
- * +5V +4.75 .. +5.25 V
- * +5V standby +4.75 .. +5.25 V
+ * Temperature -40 .. +90 C
+ * +5V +4.50 .. +5.50 V
+ * +5V standby +3.50 .. +5.50 V
*
* LCD backlight is not enabled if temperature values are not within
* allowed ranges (-30 .. + 80). The brightness of backlite can be
@@ -62,6 +62,21 @@ extern int dspic_read(ushort reg, ushort *data);
#define RELOC(x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off)
+#define REG_TEMPERATURE 0x12BC
+#define REG_VOLTAGE_5V 0x12CA
+#define REG_VOLTAGE_5V_STANDBY 0x12C6
+
+#define TEMPERATURE_MIN (-40) /* C */ +#define TEMPERATURE_MAX (+90) /* C */ +#define TEMPERATURE_DISPLAY_MIN (-35) /* C */ +#define TEMPERATURE_DISPLAY_MAX (+85) /* C */ + +#define VOLTAGE_5V_MIN (+4500) /* mV */ +#define VOLTAGE_5V_MAX (+5500) /* mV */ + +#define VOLTAGE_5V_STANDBY_MIN (+3500) /* mV */ +#define VOLTAGE_5V_STANDBY_MAX (+5500) /* mV */
+
typedef struct sysmon_s sysmon_t;
typedef struct sysmon_table_s sysmon_table_t;
@@ -115,16 +130,22 @@ struct sysmon_table_s
static sysmon_table_t sysmon_table[] =
{
{"Temperature", " C", &sysmon_dspic_sgn, NULL, sysmon_backlight_disable,
- 1, 1, -32768, 32767, 0xFFFF, 0x8000-40, 0x8000+85, 0,
- 0x8000-30, 0x8000+80, 0, 0x12BC},
+ 1, 1, -32768, 32767, 0xFFFF,
+ 0x8000 + TEMPERATURE_MIN, 0x8000 + TEMPERATURE_MAX, 0,
+ 0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 + TEMPERATURE_DISPLAY_MAX, 0,
+ REG_TEMPERATURE },
{"+ 5 V", "V", &sysmon_dspic, NULL, NULL,- 100, 1000, 0, 0xFFFF, 0xFFFF, 4750, 5250, 0,
- 4750, 5250, 0, 0x12CA},
+ 100, 1000, 0, 0xFFFF, 0xFFFF,
+ VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
+ VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
+ REG_VOLTAGE_5V },
{"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,- 100, 1000, 0, 0xFFFF, 0xFFFF, 4750, 5250, 0,
- 4750, 5250, 0, 0x12C6},
+ 100, 1000, 0, 0xFFFF, 0xFFFF,
+ VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX 5250, 0,
+ VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
+ REG_VOLTAGE_5V_STANDBY },
};
static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]);
Signature · 6 lines
1.5.2.4 Best regards, Sascha Laue -------- Original-Nachricht --------
Quoted 54 lines
Datum: Wed, 26 Mar 2008 00:18:38 +0100
Von: Wolfgang Denk <[email protected]>
An: "Sascha Laue" <[email protected]>
CC: "Markus Klotzb?cher" <[email protected]>, saschalaue at gmx.net, u-boot-users at lists.sourceforge.net, marcel.brasch at liebherr.com
Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezificationQuoted 7 lines · In message <[email protected]> you wrote:
Ups.
Best regards
Sascha Laue
diff -u -r -N
u-boot/post/board/lwmon5/sysmon.cu-boot-mod/post/board/lwmon=
Quoted 1 line
5/sysmon.cSorry, but this patch does not apply:
Applying lwmon5: update dsPIC POST spezification
.dotest/patch:29: trailing whitespace.
#defineTEMPERATURE_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
Signature · 4 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 A failure will not appear until a unit has passed final inspection.
PATCH 1/1 lwmon5 dspic POST spezification
Hello Wolfgang,
sorry but it's the first time for me.
I'm so sorry but there is an error in my last mail, let's try again.
we modified the specification for the lwmon5 board dspic POST. Additionally I have add defines for the temperature- and voltagevalues.
--- post/board/lwmon5/sysmon.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-)
post/board/lwmon5/sysmon.c +0 -0
--- a/post/board/lwmon5/sysmon.c
index 0cf1cf2..77e7ea2 100644
+++ b/post/board/lwmon5/sysmon.c
@@ -34,9 +34,9 @@
* The test passes when all the following voltages and temperatures
* are within allowed ranges:
*
- * Temperature -40 .. +85 C
- * +5V +4.75 .. +5.25 V
- * +5V standby +4.75 .. +5.25 V
+ * Temperature -40 .. +90 C
+ * +5V +4.50 .. +5.50 V
+ * +5V standby +3.50 .. +5.50 V
*
* LCD backlight is not enabled if temperature values are not within
* allowed ranges (-30 .. + 80). The brightness of backlite can be
@@ -62,6 +62,21 @@ extern int dspic_read(ushort reg, ushort *data);
#define RELOC(x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off)
+#define REG_TEMPERATURE 0x12BC
+#define REG_VOLTAGE_5V 0x12CA
+#define REG_VOLTAGE_5V_STANDBY 0x12C6
+
+#define TEMPERATURE_MIN (-40) /* C */ +#define TEMPERATURE_MAX (+90) /* C */ +#define TEMPERATURE_DISPLAY_MIN (-35) /* C */ +#define TEMPERATURE_DISPLAY_MAX (+85) /* C */ + +#define VOLTAGE_5V_MIN (+4500) /* mV */ +#define VOLTAGE_5V_MAX (+5500) /* mV */ + +#define VOLTAGE_5V_STANDBY_MIN (+3500) /* mV */ +#define VOLTAGE_5V_STANDBY_MAX (+5500) /* mV */
+
typedef struct sysmon_s sysmon_t;
typedef struct sysmon_table_s sysmon_table_t;
@@ -115,16 +130,22 @@ struct sysmon_table_s
static sysmon_table_t sysmon_table[] =
{
{"Temperature", " C", &sysmon_dspic_sgn, NULL, sysmon_backlight_disable,
- 1, 1, -32768, 32767, 0xFFFF, 0x8000-40, 0x8000+85, 0,
- 0x8000-30, 0x8000+80, 0, 0x12BC},
+ 1, 1, -32768, 32767, 0xFFFF, + 0x8000 + TEMPERATURE_MIN, 0x8000 + TEMPERATURE_MAX, 0, + 0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 + TEMPERATURE_DISPLAY_MAX, 0, + REG_TEMPERATURE },
{"+ 5 V", "V", &sysmon_dspic, NULL, NULL,
- 100, 1000, 0, 0xFFFF, 0xFFFF, 4750, 5250, 0,
- 4750, 5250, 0, 0x12CA},
+ 100, 1000, 0, 0xFFFF, 0xFFFF,
+ VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
+ VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
+ REG_VOLTAGE_5V }, {"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,
- 100, 1000, 0, 0xFFFF, 0xFFFF, 4750, 5250, 0,
- 4750, 5250, 0, 0x12C6},
+ 100, 1000, 0, 0xFFFF, 0xFFFF,
+ VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
+ VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
+ REG_VOLTAGE_5V_STANDBY }, };
static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]);
Signature · 6 lines
1.5.2.4 Best regards, Sascha Laue -------- Original-Nachricht --------
Quoted 47 lines
Datum: Wed, 26 Mar 2008 00:18:38 +0100
Von: Wolfgang Denk <[email protected]>
An: "Sascha Laue" <[email protected]>
CC: "Markus Klotzb?cher" <[email protected]>, saschalaue at gmx.net, u-boot-users at lists.sourceforge.net, marcel.brasch at liebherr.com
Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezificationQuoted 7 lines · In message <[email protected]> you wrote:
Ups.
Best regards
Sascha Laue
diff -u -r -N
u-boot/post/board/lwmon5/sysmon.cu-boot-mod/post/board/lwmon=
Quoted 1 line
5/sysmon.cSorry, but this patch does not apply:
Applying lwmon5: update dsPIC POST spezification
.dotest/patch:29: trailing whitespace.
#defineTEMPERATURE_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,
Quoted 7 lines
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.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
-------- Original-Nachricht --------
Quoted 162 lines
Datum: Tue, 01 Apr 2008 09:56:46 +0200
Von: "Sascha Laue" <[email protected]>
An: Wolfgang Denk <[email protected]>
CC: u-boot-users at lists.sourceforge.net, marcel.brasch at liebherr.com, mk at denx.de
Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezificationHello Wolfgang,
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 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-)post/board/lwmon5/sysmon.c +0
-1--- a/post/board/lwmon5/sysmon.cindex 0cf1cf2..77e7ea2 100644
+++b/post/board/lwmon5/sysmon.cpost/board/lwmon5/sysmon.c +30
-9@@ -34,9 +34,9 @@* The test passes when all the following voltages and temperatures * are within allowed ranges: * -* Temperature -40 .. +85 C -* +5V +4.75 .. +5.25 V -* +5V standby +4.75 .. +5.25 V +* Temperature -40 .. +90 C +* +5V +4.50 .. +5.50 V +* +5V standby +3.50 .. +5.50 V * * LCD backlight is not enabled if temperature values are not within * allowed ranges (-30 .. + 80). The brightness of backlite can be @@ -62,6 +62,21 @@ extern int dspic_read(ushort reg, ushort *data);#define RELOC (x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off) +#define REG_TEMPERATURE 0x12BC +#define REG_VOLTAGE_5V 0x12CA +#define REG_VOLTAGE_5V_STANDBY 0x12C6 + +#define TEMPERATURE_MIN (-40)/* C */ +#define TEMPERATURE_MAX (+90)/* C */ +#define TEMPERATURE_DISPLAY_MIN (-35)/* C */ +#define TEMPERATURE_DISPLAY_MAX (+85)/* C */ + +#define VOLTAGE_5V_MIN (+4500)/* mV */ +#define VOLTAGE_5V_MAX (+5500)/* mV */ + +#define VOLTAGE_5V_STANDBY_MIN (+3500)/* mV */ +#define VOLTAGE_5V_STANDBY_MAX (+5500)/* mV */ +typedef struct sysmon_s sysmon_t ;typedef struct sysmon_table_s sysmon_table_t ;@@ -115,16 +130,22 @@ struct sysmon_table_sstatic sysmon_table_t sysmon_table[] = { {"Temperature" ," C" , &sysmon_dspic_sgn,NULL , sysmon_backlight_disable, -1 ,1 ,-32768 ,32767 ,0xFFFF ,0x8000 -40 ,0x8000 +85 ,0 , -0x8000 -30 ,0x8000 +80 ,0 ,0x12BC }, +1 ,1 ,-32768 ,32767 ,0xFFFF , +0x8000 +TEMPERATURE_MIN ,0x8000 +TEMPERATURE_MAX ,0 , +0x8000 +TEMPERATURE_DISPLAY_MIN ,0x8000 +TEMPERATURE_DISPLAY_MAX ,0 , +REG_TEMPERATURE }, {"+ 5 V" ,"V" , &sysmon_dspic,NULL ,NULL , -100 ,1000 ,0 ,0xFFFF ,0xFFFF ,4750 ,5250 ,0 , -4750 ,5250 ,0 ,0x12CA }, +100 ,1000 ,0 ,0xFFFF ,0xFFFF , +VOLTAGE_5V_MIN ,VOLTAGE_5V_MAX ,0 , +VOLTAGE_5V_MIN ,VOLTAGE_5V_MAX ,0 , +REG_VOLTAGE_5V }, {"+ 5 V standby" ,"V" , &sysmon_dspic,NULL ,NULL , -100 ,1000 ,0 ,0xFFFF ,0xFFFF ,4750 ,5250 ,0 , -4750 ,5250 ,0 ,0x12C6 }, +100 ,1000 ,0 ,0xFFFF ,0xFFFF , + VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX 5250, 0, +VOLTAGE_5V_STANDBY_MIN ,VOLTAGE_5V_STANDBY_MAX ,0 , +REG_VOLTAGE_5V_STANDBY }, }; static int sysmon_table_size = sizeof(sysmon_table) /
sizeof(sysmon_table[0]);Signature · 6 lines
1.5.2.4 Best regards, Sascha Laue -------- Original-Nachricht --------Quoted 4 lines
Datum: Wed, 26 Mar 2008 00:18:38 +0100
Von: Wolfgang Denk <[email protected]>
An: "Sascha Laue" <[email protected]>
CC: "Markus Klotzb?cher" <[email protected]>, saschalaue at gmx.net,u-boot-users at lists.sourceforge.net, marcel.brasch at liebherr.com
Quoted 36 lines
Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezification
Quoted 7 lines · In message <[email protected]> you wrote:
Ups.
Best regards
Sascha Laue
diff -u -r -N
u-boot/post/board/lwmon5/sysmon.cu-boot-mod/post/board/lwmon=
Quoted 1 line
5/sysmon.cSorry, but this patch does not apply:
Applying lwmon5: update dsPIC POST spezification
.dotest/patch:29: trailing whitespace.
#defineTEMPERATURE_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.Quoted 14 lines
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
Signature · 4 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 A failure will not appear until a unit has passed final inspection.-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
U-Boot-Users at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/u-boot-users
Wolfgang Denk
AppliedPATCH 1/1 lwmon5 dspic POST spezification
In reply to Sascha LaueQuoted 11 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 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-)
Applied, thanks.
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 Committee, n.: A group of men who individually can do nothing but as a group decide that nothing can be done. - Fred Allen