[U-Boot] [PATCH 0/4] cosmetic

[U-Boot] [PATCH 0/4] cosmetic

[Michael Jones]

Here are some minor changes I've been collecting. Most of it is
purely cosmetic, but there are some printf and help output changes, too.

Michael Jones (4):
  cosmetic
  altera: fix printf typo
  cmd_mac: cleanup help
  cmd_mac: fix help for 'mac read'

 README                             |    6 +++---
 arch/arm/include/asm/global_data.h |    2 +-
 common/cmd_eeprom.c                |    2 +-
 common/cmd_i2c.c                   |    4 ++--
 common/cmd_mac.c                   |    4 ++--
 drivers/fpga/altera.c              |    2 +-
 drivers/i2c/omap24xx_i2c.c         |    2 +-
 include/altera.h                   |   10 +++++-----
 8 files changed, 16 insertions(+), 16 deletions(-)

-- 
1.7.5.4


MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

[U-Boot] [PATCH 1/4] cosmetic

[Michael Jones]

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
---
 README                             |    6 +++---
 arch/arm/include/asm/global_data.h |    2 +-
 common/cmd_eeprom.c                |    2 +-
 common/cmd_i2c.c                   |    4 ++--
 drivers/i2c/omap24xx_i2c.c         |    2 +-
 include/altera.h                   |   10 +++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 446966d..38428cc 100644
--- a/README
+++ b/README
@@ -1693,12 +1693,12 @@ The following options need to be configured:
 		=>
 
 		If you now switch to the new I2C Bus 3 with "i2c dev 3"
-		u-boot sends First the Commando to the mux at 70 to enable
-		channel 6, and then the Commando to the mux at 71 to enable
+		u-boot first sends the command to the mux at 70 to enable
+		channel 6, and then the command to the mux at 71 to enable
 		the channel 4.
 
 		After that, you can use the "normal" i2c commands as
-		usual, to communicate with your I2C devices behind
+		usual to communicate with your I2C devices behind
 		the 2 muxes.
 
 		This option is actually implemented for the bitbanging
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index ef9959e..7439a88 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -24,7 +24,7 @@
 #ifndef	__ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
 /*
- * The following data structure is placed in some memory wich is
+ * The following data structure is placed in some memory which is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
  * some locked parts of the data cache) to allow for a minimum set of
  * global variables during system initialization (until we have set
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 9f4b22c..e911377 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -250,7 +250,7 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn
 
 		/*
 		 * For a FRAM device there is no limit on the number of the
-		 * bytes that can be ccessed with the single read or write
+		 * bytes that can be accessed with the single read or write
 		 * operation.
 		 */
 #if !defined(CONFIG_SYS_I2C_FRAM)
diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index d913e13..3ea75f7 100644
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -1397,8 +1397,8 @@ static int i2c_mux_get_busid (void)
 	return tmp;
 }
 
-/* Analyses a Muxstring and sends immediately the
-   Commands to the Muxes. Runs from Flash.
+/* Analyses a Muxstring and immediately sends the
+   commands to the muxes. Runs from flash.
  */
 int i2c_mux_ident_muxstring_f (uchar *buf)
 {
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 71251d8..966ffc4 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -399,7 +399,7 @@ static void wait_for_bb (void)
 	int timeout = I2C_TIMEOUT;
 	u16 stat;
 
-	writew(0xFFFF, &i2c_base->stat);	 /* clear current interruts...*/
+	writew(0xFFFF, &i2c_base->stat);	/* clear current interrupts...*/
 	while ((stat = readw (&i2c_base->stat) & I2C_STAT_BB) && timeout--) {
 		writew (stat, &i2c_base->stat);
 		udelay(1000);
diff --git a/include/altera.h b/include/altera.h
index bc21ddf..f28a6a8 100644
--- a/include/altera.h
+++ b/include/altera.h
@@ -51,18 +51,18 @@ typedef enum {				/* typedef Altera_iface */
 	passive_parallel_asynchronous,	/* parallel data */
 	passive_serial_asynchronous,	/* serial data w/ internal clock (not used)	*/
 	altera_jtag_mode,		/* jtag/tap serial (not used ) */
-	fast_passive_parallel,	/* fast passive parallel (FPP) */
+	fast_passive_parallel,		/* fast passive parallel (FPP) */
 	fast_passive_parallel_security,	/* fast passive parallel with security (FPPS) */
 	max_altera_iface_type		/* insert all new types before this */
 } Altera_iface;				/* end, typedef Altera_iface */
 
 typedef enum {			/* typedef Altera_Family */
-    min_altera_type,		/* insert all new types after this */
-    Altera_ACEX1K,		/* ACEX1K Family */
-    Altera_CYC2,		/* CYCLONII Family */
+	min_altera_type,	/* insert all new types after this */
+	Altera_ACEX1K,		/* ACEX1K Family */
+	Altera_CYC2,		/* CYCLONII Family */
 	Altera_StratixII,	/* StratixII Familiy */
 /* Add new models here */
-    max_altera_type		/* insert all new types before this */
+	max_altera_type		/* insert all new types before this */
 } Altera_Family;		/* end, typedef Altera_Family */
 
 typedef struct {		/* typedef Altera_desc */
-- 
1.7.5.4


MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

[U-Boot] [PATCH 1/4] cosmetic

[Detlev Zundel]

Hi Michael,

> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>

Acked-by: Detlev Zundel <dzu@denx.de>

Cheers
  Detlev

-- 
There are two hard things in computer science: cache invalidation,
naming things, and off-by-one errors.
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH 2/4] altera: fix printf typo

[Michael Jones]

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
---
 drivers/fpga/altera.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index 650f2ec..103d81c 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -60,7 +60,7 @@ int altera_load( Altera_desc *desc, void *buf, size_t bsize )
 					__FUNCTION__);
 			ret_val = ACEX1K_load (desc, buf, bsize);
 #elif defined(CONFIG_FPGA_CYCLON2)
-			PRINTF ("%s: Launching the CYCLON II Loader...\n",
+			PRINTF ("%s: Launching the CYCLONE II Loader...\n",
 					__FUNCTION__);
 			ret_val = CYC2_load (desc, buf, bsize);
 #else
-- 
1.7.5.4


MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

[U-Boot] [PATCH 2/4] altera: fix printf typo

[Detlev Zundel]

Michael Jones <michael.jones@matrix-vision.de> writes:

> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>

Acked-by: Detlev Zundel <dzu@denx.de>

-- 
Windows Vista? And what a vista! All you see as you look around your
garden is a 60foot high brick wall -- Crosbie Fitch.
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH 2/4] altera: fix printf typo

[Wolfgang Denk]

Dear Michael Jones,

In message <1310717371-1677-3-git-send-email-michael.jones@matrix-vision.de> you wrote:
> 
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
> ---
>  drivers/fpga/altera.c |    2 +-
>  1 files changed, 1 insertions(+), 1 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
What about WRITING it first and rationalizing it afterwords?  :-)
                       - Larry Wall in <8162@jpl-devvax.JPL.NASA.GOV>

[U-Boot] [PATCH 3/4] cmd_mac: cleanup help

[Michael Jones]

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
---
 common/cmd_mac.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common/cmd_mac.c b/common/cmd_mac.c
index 1884c2a..0f924b7 100644
--- a/common/cmd_mac.c
+++ b/common/cmd_mac.c
@@ -30,7 +30,7 @@ U_BOOT_CMD(
 	mac, 3, 1,  do_mac,
 	"display and program the system ID and MAC addresses in EEPROM",
 	"[read|save|id|num|errata|date|ports|0|1|2|3|4|5|6|7]\n"
-	"read\n"
+	"mac read\n"
 	"    - show content of EEPROM\n"
 	"mac save\n"
 	"    - save to the EEPROM\n"
-- 
1.7.5.4


MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

[U-Boot] [PATCH 3/4] cmd_mac: cleanup help

[Detlev Zundel]

Michael Jones <michael.jones@matrix-vision.de> writes:

> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>

Acked-by: Detlev Zundel <dzu@denx.de>

-- 
It's bad  civic hygiene to build  technologies that could  someday be used to
facilitate a police state.  No matter what the eavesdroppers and censors say,
these systems put us all at greater risk. Communications systems that have no
inherent  eavesdropping capabilities are more  secure than systems with those
capabilities built in.                                      -- Bruce Schneier
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH 3/4] cmd_mac: cleanup help

[Wolfgang Denk]

Dear Michael Jones,

In message <1310717371-1677-4-git-send-email-michael.jones@matrix-vision.de> you wrote:
> 
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
> ---
>  common/cmd_mac.c |    2 +-
>  1 files changed, 1 insertions(+), 1 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
The night sky over the planet Krikkit is the least interesting  sight
in the entire Universe.
                 - Douglas Adams _Life, the Universe, and Everything_

[U-Boot] [PATCH 4/4] cmd_mac: fix help for 'mac read'

[Michael Jones]

In the only implementation of 'mac read', it doesn't display the
contents of the eeprom as the help indicated unless compiled with
DEBUG. It only re-reads the contents of the EEPROM into memory.
Displaying the contents of the EEPROM is done by passing no
arguments to 'mac'.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
---
 common/cmd_mac.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common/cmd_mac.c b/common/cmd_mac.c
index 0f924b7..fcc2867 100644
--- a/common/cmd_mac.c
+++ b/common/cmd_mac.c
@@ -31,7 +31,7 @@ U_BOOT_CMD(
 	"display and program the system ID and MAC addresses in EEPROM",
 	"[read|save|id|num|errata|date|ports|0|1|2|3|4|5|6|7]\n"
 	"mac read\n"
-	"    - show content of EEPROM\n"
+	"    - read EEPROM content into memory\n"
 	"mac save\n"
 	"    - save to the EEPROM\n"
 	"mac id\n"
-- 
1.7.5.4


MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

[U-Boot] [PATCH 4/4] cmd_mac: fix help for 'mac read'

[Detlev Zundel]

Michael Jones <michael.jones@matrix-vision.de> writes:

> In the only implementation of 'mac read', it doesn't display the
> contents of the eeprom as the help indicated unless compiled with
> DEBUG. It only re-reads the contents of the EEPROM into memory.
> Displaying the contents of the EEPROM is done by passing no
> arguments to 'mac'.
>
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>

Acked-by: Detlev Zundel <dzu@denx.de>

-- 
Der Kluge tue gleich anfangs, was der Dumme erst am Ende.
                                    --- Baltasar Gracian
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH 4/4] cmd_mac: fix help for 'mac read'

[Michael Jones]

Hi Detlev,

On 07/15/2011 05:17 PM, Detlev Zundel wrote:
> 
> Michael Jones <michael.jones@matrix-vision.de> writes:
> 
>> In the only implementation of 'mac read', it doesn't display the
>> contents of the eeprom as the help indicated unless compiled with
>> DEBUG. It only re-reads the contents of the EEPROM into memory.
>> Displaying the contents of the EEPROM is done by passing no
>> arguments to 'mac'.
>>
>> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
> 
> Acked-by: Detlev Zundel <dzu@denx.de>
> 

Thanks for the ack. Do you know when I can expect these to get merged in?

MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

[U-Boot] [PATCH 4/4] cmd_mac: fix help for 'mac read'

[Detlev Zundel]

Hi Michael,

> Hi Detlev,
>
> On 07/15/2011 05:17 PM, Detlev Zundel wrote:
>> 
>> Michael Jones <michael.jones@matrix-vision.de> writes:
>> 
>>> In the only implementation of 'mac read', it doesn't display the
>>> contents of the eeprom as the help indicated unless compiled with
>>> DEBUG. It only re-reads the contents of the EEPROM into memory.
>>> Displaying the contents of the EEPROM is done by passing no
>>> arguments to 'mac'.
>>>
>>> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
>> 
>> Acked-by: Detlev Zundel <dzu@denx.de>
>> 
>
> Thanks for the ack. Do you know when I can expect these to get merged in?

As we currently lack a network maintainer, these patches fall into the
"and all the rest category" picked up sequentially by Wolfgang.  I
expect that to happen Real Soon (tm) now.  

On the other hand, please do not forget that we _intentionally_ allow
for some time to pass before the patches are merged in order to allow
for review on the mailing list and to prevent potentially
merge/revert/change/merge cycles.

Cheers
  Detlev

-- 
The management question  ...  is not  _whether_  to build a pilot system
and throw it away.  You _will_ do that.  The only question is whether to
plan  in advance  to build  a throwaway,  or  to promise  to deliver the
throwaway to customers.          - Fred Brooks, "The Mythical Man Month"
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de

[U-Boot] [PATCH 4/4] cmd_mac: fix help for 'mac read'

[Michael Jones]

Hi Detlev,

Thanks for the reply.

On 07/27/2011 03:54 PM, Detlev Zundel wrote:
> 
> Hi Michael,
> 
>> Hi Detlev,
>>
>> On 07/15/2011 05:17 PM, Detlev Zundel wrote:
>>>
>>> Michael Jones <michael.jones@matrix-vision.de> writes:
>>>
>>>> In the only implementation of 'mac read', it doesn't display the
>>>> contents of the eeprom as the help indicated unless compiled with
>>>> DEBUG. It only re-reads the contents of the EEPROM into memory.
>>>> Displaying the contents of the EEPROM is done by passing no
>>>> arguments to 'mac'.
>>>>
>>>> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
>>>
>>> Acked-by: Detlev Zundel <dzu@denx.de>
>>>
>>
>> Thanks for the ack. Do you know when I can expect these to get merged in?
> 
> As we currently lack a network maintainer, these patches fall into the
> "and all the rest category" picked up sequentially by Wolfgang.  I
> expect that to happen Real Soon (tm) now.

That's exactly what I wanted to know- it seemed there wasn't a custodian
whom I needed to cc:, and I didn't know who would end up merging them.

> 
> On the other hand, please do not forget that we _intentionally_ allow
> for some time to pass before the patches are merged in order to allow
> for review on the mailing list and to prevent potentially
> merge/revert/change/merge cycles.

Sure, and that makes sense. I just wanted to get a feel for what kind of
time scale that was in general. Obviously these are not important patches.

> 
> Cheers
>   Detlev
> 

thanks,
Michael

MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner, Erhard Meier

[U-Boot] [PATCH 4/4] cmd_mac: fix help for 'mac read'

[Wolfgang Denk]

Dear Michael Jones,

In message <1310717371-1677-5-git-send-email-michael.jones@matrix-vision.de> you wrote:
> In the only implementation of 'mac read', it doesn't display the
> contents of the eeprom as the help indicated unless compiled with
> DEBUG. It only re-reads the contents of the EEPROM into memory.
> Displaying the contents of the EEPROM is done by passing no
> arguments to 'mac'.
> 
> Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
> ---
>  common/cmd_mac.c |    2 +-
>  1 files changed, 1 insertions(+), 1 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
Der Irrtum wiederholt sich immerfort in der Tat.  Deshalb mu? man das
Wahre unerm?dlich in Worten wiederholen.                     - Goethe