[U-Boot] [PATCH 00/10] CLEANUP: Cleanup of board/ directory

[U-Boot] [PATCH 00/10] CLEANUP: Cleanup of board/ directory

[Marek Vasut]

This series fixes the warnings generated by new debug() macro implementation,
which will be merged after this series. This series fixes the problems before
the macro is reworked to avoid smooth transition. Most of the problems fixed by
this series are printf() formating related problems.

Marek Vasut (10):
  GCC4.6: Squash warning in mpc5121ads.c
  GCC4.6: Squash warnings in diu.c
  GCC4.6: Squash warnings in mpc8610hpcd.c
  GCC4.6: Squash warnings in tqm834x.c
  GCC4.6: Squash warning in cmd_pmc440.c
  GCC4.6: Squash warnings in pmc405de.c
  GCC4.6: Squash warnings in r360mpi/flash.c
  GCC4.6: Squash warnings in PPChameleonEVB/flash.c
  GCC4.6: Squash error in cpc45/pd67290.c
  GCC4.6: Add macros to mv_gen_reg.h

 board/Marvell/include/mv_gen_reg.h        |    8 ++++++++
 board/cpc45/pd67290.c                     |    6 +-----
 board/dave/PPChameleonEVB/flash.c         |    3 ++-
 board/esd/pmc405de/pmc405de.c             |    2 +-
 board/esd/pmc440/cmd_pmc440.c             |    2 +-
 board/freescale/mpc5121ads/mpc5121ads.c   |    4 ++--
 board/freescale/mpc8610hpcd/mpc8610hpcd.c |    4 ++--
 board/freescale/p1022ds/diu.c             |    2 +-
 board/r360mpi/flash.c                     |    4 ++--
 board/tqc/tqm834x/tqm834x.c               |    6 +++---
 10 files changed, 23 insertions(+), 18 deletions(-)

Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>

-- 
1.7.6.3

[U-Boot] [PATCH 01/10] GCC4.6: Squash warning in mpc5121ads.c

[Marek Vasut]

mpc5121ads.c: In function 'misc_init_r':
mpc5121ads.c:256: warning: format '%02lx' expects type 'long unsigned int', but
argument 2 has type 'int'
mpc5121ads.c:263: warning: format '%02lx' expects type 'long unsigned int', but
argument 2 has type 'int'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/freescale/mpc5121ads/mpc5121ads.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/freescale/mpc5121ads/mpc5121ads.c b/board/freescale/mpc5121ads/mpc5121ads.c
index b356a47..97eeab3 100644
--- a/board/freescale/mpc5121ads/mpc5121ads.c
+++ b/board/freescale/mpc5121ads/mpc5121ads.c
@@ -253,14 +253,14 @@ int misc_init_r(void)
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x08, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n", tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	tmp_val = 0x10;
 	i2c_write(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n", tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	return 0;
 }
-- 
1.7.6.3

[U-Boot] [PATCH 01/10] GCC4.6: Squash warning in mpc5121ads.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-2-git-send-email-marek.vasut@gmail.com> you wrote:
> mpc5121ads.c: In function 'misc_init_r':
> mpc5121ads.c:256: warning: format '%02lx' expects type 'long unsigned int', but
> argument 2 has type 'int'
> mpc5121ads.c:263: warning: format '%02lx' expects type 'long unsigned int', but
> argument 2 has type 'int'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/freescale/mpc5121ads/mpc5121ads.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 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
I have often regretted my speech, never my silence.

[U-Boot] [PATCH 02/10] GCC4.6: Squash warnings in diu.c

[Marek Vasut]

diu.c: In function 'diu_set_pixel_clock':
diu.c:77: warning: format '%lu' expects type 'long unsigned int', but argument 2
has type 'u32'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/freescale/p1022ds/diu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/freescale/p1022ds/diu.c b/board/freescale/p1022ds/diu.c
index cef81ce..d5428ea 100644
--- a/board/freescale/p1022ds/diu.c
+++ b/board/freescale/p1022ds/diu.c
@@ -74,7 +74,7 @@ void diu_set_pixel_clock(unsigned int pixclock)
 	temp = 1000000000 / pixclock;
 	temp *= 1000;
 	pixval = speed_ccb / temp;
-	debug("DIU pixval = %lu\n", pixval);
+	debug("DIU pixval = %u\n", pixval);
 
 	/* Modify PXCLK in GUTS CLKDVDR */
 	temp = in_be32(&gur->clkdvdr) & 0x2000FFFF;
-- 
1.7.6.3

[U-Boot] [PATCH 02/10] GCC4.6: Squash warnings in diu.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-3-git-send-email-marek.vasut@gmail.com> you wrote:
> diu.c: In function 'diu_set_pixel_clock':
> diu.c:77: warning: format '%lu' expects type 'long unsigned int', but argument 2
> has type 'u32'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/freescale/p1022ds/diu.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
"Don't try to outweird me, three-eyes. I get stranger things than you
free with my breakfast cereal."
           - Zaphod Beeblebrox in  "Hitchhiker's Guide to the Galaxy"

[U-Boot] [PATCH 03/10] GCC4.6: Squash warnings in mpc8610hpcd.c

[Marek Vasut]

mpc8610hpcd.c: In function 'misc_init_r':
mpc8610hpcd.c:79: warning: format '%02lx' expects type 'long unsigned int', but
argument 2 has type 'int'
mpc8610hpcd.c:86: warning: format '%02lx' expects type 'long unsigned int', but
argument 2 has type 'int'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/freescale/mpc8610hpcd/mpc8610hpcd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index 1854e27..5b3b560 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -76,14 +76,14 @@ int misc_init_r(void)
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x08, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n",tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	tmp_val = 0x10;
 	i2c_write(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
 	/* Verify if enabled */
 	tmp_val = 0;
 	i2c_read(0x38, 0x0A, 1, &tmp_val, sizeof(tmp_val));
-	debug("DVI Encoder Read: 0x%02lx\n",tmp_val);
+	debug("DVI Encoder Read: 0x%02x\n", tmp_val);
 
 	return 0;
 }
-- 
1.7.6.3

[U-Boot] [PATCH 03/10] GCC4.6: Squash warnings in mpc8610hpcd.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-4-git-send-email-marek.vasut@gmail.com> you wrote:
> mpc8610hpcd.c: In function 'misc_init_r':
> mpc8610hpcd.c:79: warning: format '%02lx' expects type 'long unsigned int', but
> argument 2 has type 'int'
> mpc8610hpcd.c:86: warning: format '%02lx' expects type 'long unsigned int', but
> argument 2 has type 'int'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/freescale/mpc8610hpcd/mpc8610hpcd.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 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
"More software projects have gone awry for lack of calendar time than
for all other causes combined."
                         - Fred Brooks, Jr., _The Mythical Man Month_

[U-Boot] [PATCH 04/10] GCC4.6: Squash warnings in tqm834x.c

[Marek Vasut]

tqm834x.c: In function 'initdram':
tqm834x.c:126: warning: format '%d' expects type 'int', but argument 3 has type
'long int'
tqm834x.c: In function 'set_cs_bounds':
tqm834x.c:336: warning: format '%08x' expects type 'unsigned int', but argument
2 has type 'long int'
tqm834x.c:336: warning: format '%08x' expects type 'unsigned int', but argument
3 has type 'long int'
tqm834x.c: In function 'set_cs_config':
tqm834x.c:354: warning: format '%08x' expects type 'unsigned int', but argument
2 has type 'long int'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/tqc/tqm834x/tqm834x.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/tqc/tqm834x/tqm834x.c b/board/tqc/tqm834x/tqm834x.c
index 260e392..7af8b4c 100644
--- a/board/tqc/tqm834x/tqm834x.c
+++ b/board/tqc/tqm834x/tqm834x.c
@@ -123,7 +123,7 @@ phys_size_t initdram (int board_type)
 			(long *)(CONFIG_SYS_DDR_BASE + size));
 		size += bank_size;
 
-		debug("DDR Bank%d size: %d MiB\n\n", cs, bank_size >> 20);
+		debug("DDR Bank%d size: %ld MiB\n\n", cs, bank_size >> 20);
 
 		/* exit if less than one bank */
 		if(size < DDR_MAX_SIZE_PER_CS) break;
@@ -333,7 +333,7 @@ static long int get_ddr_bank_size(short cs, long *base)
  */
 static void set_cs_bounds(short cs, long base, long size)
 {
-	debug("Setting bounds %08x, %08x for cs %d\n", base, size, cs);
+	debug("Setting bounds %08lx, %08lx for cs %d\n", base, size, cs);
 	if(size == 0){
 		im->ddr.csbnds[cs].csbnds = 0x00000000;
 	} else {
@@ -351,7 +351,7 @@ static void set_cs_bounds(short cs, long base, long size)
  */
 static void set_cs_config(short cs, long config)
 {
-	debug("Setting config %08x for cs %d\n", config, cs);
+	debug("Setting config %08lx for cs %d\n", config, cs);
 	im->ddr.cs_config[cs] = config;
 	SYNC;
 }
-- 
1.7.6.3

[U-Boot] [PATCH 04/10] GCC4.6: Squash warnings in tqm834x.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-5-git-send-email-marek.vasut@gmail.com> you wrote:
> tqm834x.c: In function 'initdram':
> tqm834x.c:126: warning: format '%d' expects type 'int', but argument 3 has type
> 'long int'
> tqm834x.c: In function 'set_cs_bounds':
> tqm834x.c:336: warning: format '%08x' expects type 'unsigned int', but argument
> 2 has type 'long int'
> tqm834x.c:336: warning: format '%08x' expects type 'unsigned int', but argument
> 3 has type 'long int'
> tqm834x.c: In function 'set_cs_config':
> tqm834x.c:354: warning: format '%08x' expects type 'unsigned int', but argument
> 2 has type 'long int'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/tqc/tqm834x/tqm834x.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 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
"If it ain't broke, don't fix it."                       - Bert Lantz

[U-Boot] [PATCH 05/10] GCC4.6: Squash warning in cmd_pmc440.c

[Marek Vasut]

cmd_pmc440.c: In function 'do_painit':
cmd_pmc440.c:371: warning: format '%08x' expects type 'unsigned int', but
argument 2 has type 'phys_size_t'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/esd/pmc440/cmd_pmc440.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index 200d7ee..0202876 100644
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -368,7 +368,7 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 */
 	param = base - (pram << 10);
 	printf("PARAM: @%08x\n", param);
-	debug("memsize=0x%08x, base=0x%08x\n", gd->bd->bi_memsize, base);
+	debug("memsize=0x%08x, base=0x%08x\n", (u32)gd->bd->bi_memsize, base);
 
 	/* clear entire PA ram */
 	memset((void*)param, 0, (pram << 10));
-- 
1.7.6.3

[U-Boot] [PATCH 05/10] GCC4.6: Squash warning in cmd_pmc440.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-6-git-send-email-marek.vasut@gmail.com> you wrote:
> cmd_pmc440.c: In function 'do_painit':
> cmd_pmc440.c:371: warning: format '%08x' expects type 'unsigned int', but
> argument 2 has type 'phys_size_t'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/esd/pmc440/cmd_pmc440.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
I have never understood the female capacity to avoid a direct  answer
to any question.
	-- Spock, "This Side of Paradise", stardate 3417.3

[U-Boot] [PATCH 06/10] GCC4.6: Squash warnings in pmc405de.c

[Marek Vasut]

pmc405de.c: In function 'do_painit':
pmc405de.c:444: warning: format '%08x' expects type 'unsigned int', but argument
2 has type 'phys_size_t'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/esd/pmc405de/pmc405de.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c
index c266ebe..a60809a 100644
--- a/board/esd/pmc405de/pmc405de.c
+++ b/board/esd/pmc405de/pmc405de.c
@@ -441,7 +441,7 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	 */
 	param = base - (pram << 10);
 	printf("PARAM: @%08x\n", param);
-	debug("memsize=0x%08x, base=0x%08x\n", gd->bd->bi_memsize, base);
+	debug("memsize=0x%08x, base=0x%08x\n", (u32)gd->bd->bi_memsize, base);
 
 	/* clear entire PA ram */
 	memset((void*)param, 0, (pram << 10));
-- 
1.7.6.3

[U-Boot] [PATCH 06/10] GCC4.6: Squash warnings in pmc405de.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-7-git-send-email-marek.vasut@gmail.com> you wrote:
> pmc405de.c: In function 'do_painit':
> pmc405de.c:444: warning: format '%08x' expects type 'unsigned int', but argument
> 2 has type 'phys_size_t'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/esd/pmc405de/pmc405de.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
"A little knowledge is a dangerous thing."                - Doug Gwyn

[U-Boot] [PATCH 07/10] GCC4.6: Squash warnings in r360mpi/flash.c

[Marek Vasut]

flash.c: In function 'flash_get_size':
flash.c:222: warning: format '%08lx' expects type 'long unsigned int', but
argument 3 has type 'int'
flash.c:238: warning: format '%08lx' expects type 'long unsigned int', but
argument 3 has type 'int'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/r360mpi/flash.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c
index 45cccf7..26ec11d 100644
--- a/board/r360mpi/flash.c
+++ b/board/r360mpi/flash.c
@@ -219,7 +219,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info)
 
 	value = addr[0];
 
-	debug ("Manuf. ID @ 0x%08lx: 0x%08lx\n", (ulong)addr, value);
+	debug("Manuf. ID @ 0x%08lx: 0x%08x\n", (ulong)addr, value);
 
 	switch (value) {
 	case (FPW) INTEL_MANUFACT:
@@ -235,7 +235,7 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info)
 
 	value = addr[1];			/* device ID        */
 
-	debug ("Device ID @ 0x%08lx: 0x%08lx\n", (ulong)(&addr[1]), value);
+	debug("Device ID @ 0x%08lx: 0x%08x\n", (ulong)(&addr[1]), value);
 
 	switch (value) {
 	case (FPW) INTEL_ID_28F320J3A:
-- 
1.7.6.3

[U-Boot] [PATCH 07/10] GCC4.6: Squash warnings in r360mpi/flash.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-8-git-send-email-marek.vasut@gmail.com> you wrote:
> flash.c: In function 'flash_get_size':
> flash.c:222: warning: format '%08lx' expects type 'long unsigned int', but
> argument 3 has type 'int'
> flash.c:238: warning: format '%08lx' expects type 'long unsigned int', but
> argument 3 has type 'int'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/r360mpi/flash.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 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
I distrust all systematisers, and avoid them. The will  to  a  system
shows a lack of honesty.
- Friedrich Wilhelm Nietzsche _G?tzen-D?mmerung [The Twilight of  the
Idols]_ ``Maxims and Missiles'' no. 26

[U-Boot] [PATCH 08/10] GCC4.6: Squash warnings in PPChameleonEVB/flash.c

[Marek Vasut]

flash.c: In function 'flash_init':
flash.c:54: warning: format '%08X' expects type 'unsigned int', but argument 4
has type 'struct flash_info_t *'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 board/dave/PPChameleonEVB/flash.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/board/dave/PPChameleonEVB/flash.c b/board/dave/PPChameleonEVB/flash.c
index 2e1a9ab..3d5b20d 100644
--- a/board/dave/PPChameleonEVB/flash.c
+++ b/board/dave/PPChameleonEVB/flash.c
@@ -51,7 +51,8 @@ unsigned long flash_init (void)
 	int size_val = 0;
 
 	debug("[%s, %d] Entering ...\n", __FUNCTION__, __LINE__);
-	debug("[%s, %d] flash_info = 0x%08X ...\n", __FUNCTION__, __LINE__, flash_info);
+	debug("[%s, %d] flash_info = 0x%p ...\n", __func__, __LINE__,
+						flash_info);
 
 	/* Init: no FLASHes known */
 	for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
-- 
1.7.6.3

[U-Boot] [PATCH 08/10] GCC4.6: Squash warnings in PPChameleonEVB/flash.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-9-git-send-email-marek.vasut@gmail.com> you wrote:
> flash.c: In function 'flash_init':
> flash.c:54: warning: format '%08X' expects type 'unsigned int', but argument 4
> has type 'struct flash_info_t *'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>  board/dave/PPChameleonEVB/flash.c |    3 ++-
>  1 files changed, 2 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
If you fail to plan, plan to fail.

[U-Boot] [PATCH 09/10] GCC4.6: Squash error in cpc45/pd67290.c

[Marek Vasut]

pd67290.c: In function 'cirrus_set_opts':
pd67290.c:282: error: 'buf' undeclared (first use in this function)
pd67290.c:282: error: (Each undeclared identifier is reported only once
pd67290.c:282: error: for each function it appears in.)

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/cpc45/pd67290.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c
index 0d8ef23..815e4ba 100644
--- a/board/cpc45/pd67290.c
+++ b/board/cpc45/pd67290.c
@@ -225,11 +225,7 @@ static u_int cirrus_set_opts (socket_info_t * s)
 {
 	cirrus_state_t *p = &s->c_state;
 	u_int mask = 0xffff;
-#if DEBUG
-	char buf[200];
-
-	memset (buf, 0, 200);
-#endif
+	char buf[200] = {0};
 
 	if (has_ring == -1)
 		has_ring = 1;
-- 
1.7.6.3

[U-Boot] [PATCH 09/10] GCC4.6: Squash error in cpc45/pd67290.c

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-10-git-send-email-marek.vasut@gmail.com> you wrote:
> pd67290.c: In function 'cirrus_set_opts':
> pd67290.c:282: error: 'buf' undeclared (first use in this function)
> pd67290.c:282: error: (Each undeclared identifier is reported only once
> pd67290.c:282: error: for each function it appears in.)
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/cpc45/pd67290.c |    6 +-----
>  1 files changed, 1 insertions(+), 5 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
Artificial Intelligence is the study of how to  make  real  computers
act like the ones in movies.

[U-Boot] [PATCH 10/10] GCC4.6: Add macros to mv_gen_reg.h

[Marek Vasut]

interrupts.c: In function 'interrupt_init_cpu':
interrupts.c:40: error: 'ETHERNET0_INTERRUPT_CAUSE_REGISTER' undeclared (first
use in this function)
interrupts.c:40: error: (Each undeclared identifier is reported only once
interrupts.c:40: error: for each function it appears in.)
interrupts.c:40: error: 'ETHERNET1_INTERRUPT_CAUSE_REGISTER' undeclared (first
use in this function)
interrupts.c:40: error: 'ETHERNET2_INTERRUPT_CAUSE_REGISTER' undeclared (first
use in this function)
interrupts.c:44: error: 'ETHERNET0_INTERRUPT_MASK_REGISTER' undeclared (first
use in this function)
interrupts.c:44: error: 'ETHERNET1_INTERRUPT_MASK_REGISTER' undeclared (first
use in this function)
interrupts.c:44: error: 'ETHERNET2_INTERRUPT_MASK_REGISTER' undeclared (first
use in this function)

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 board/Marvell/include/mv_gen_reg.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/board/Marvell/include/mv_gen_reg.h b/board/Marvell/include/mv_gen_reg.h
index 03fcd88..008185e 100644
--- a/board/Marvell/include/mv_gen_reg.h
+++ b/board/Marvell/include/mv_gen_reg.h
@@ -1864,6 +1864,14 @@
 #define ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(port)	   (0x3500 + (port<<10))
 #define ETH_DA_FILTER_UNICAST_TABLE_BASE(port)		(0x3600 + (port<<10))
 
+/* Compat with interrupts.c */
+#define ETHERNET0_INTERRUPT_CAUSE_REGISTER      ETH_INTERRUPT_CAUSE_REG(0)
+#define ETHERNET1_INTERRUPT_CAUSE_REGISTER      ETH_INTERRUPT_CAUSE_REG(1)
+#define ETHERNET2_INTERRUPT_CAUSE_REGISTER      ETH_INTERRUPT_CAUSE_REG(2)
+
+#define ETHERNET0_INTERRUPT_MASK_REGISTER       ETH_INTERRUPT_MASK_REG(0)
+#define ETHERNET1_INTERRUPT_MASK_REGISTER       ETH_INTERRUPT_MASK_REG(1)
+#define ETHERNET2_INTERRUPT_MASK_REGISTER       ETH_INTERRUPT_MASK_REG(2)
 
 /* Ethernet GT64260 */
 /*
-- 
1.7.6.3

[U-Boot] [PATCH 10/10] GCC4.6: Add macros to mv_gen_reg.h

[Wolfgang Denk]

Dear Marek Vasut,

In message <1319535510-20737-11-git-send-email-marek.vasut@gmail.com> you wrote:
> interrupts.c: In function 'interrupt_init_cpu':
> interrupts.c:40: error: 'ETHERNET0_INTERRUPT_CAUSE_REGISTER' undeclared (first
> use in this function)
> interrupts.c:40: error: (Each undeclared identifier is reported only once
> interrupts.c:40: error: for each function it appears in.)
> interrupts.c:40: error: 'ETHERNET1_INTERRUPT_CAUSE_REGISTER' undeclared (first
> use in this function)
> interrupts.c:40: error: 'ETHERNET2_INTERRUPT_CAUSE_REGISTER' undeclared (first
> use in this function)
> interrupts.c:44: error: 'ETHERNET0_INTERRUPT_MASK_REGISTER' undeclared (first
> use in this function)
> interrupts.c:44: error: 'ETHERNET1_INTERRUPT_MASK_REGISTER' undeclared (first
> use in this function)
> interrupts.c:44: error: 'ETHERNET2_INTERRUPT_MASK_REGISTER' undeclared (first
> use in this function)
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  board/Marvell/include/mv_gen_reg.h |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 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
In accord with UNIX philosophy, Perl gives you enough  rope  to  hang
yourself.              - L. Wall & R. L. Schwartz, _Programming Perl_