[U-Boot-Users] 1.3.3-rc2 - release status

[U-Boot-Users] 1.3.3-rc2 - release status

[Wolfgang Denk]

Hello,

U-Boot v1.3.3-rc2 has just been released.

PowerPC seems to be in a pretty good state now;  other  architectures
still  need a lot of testing / fixing. For example, on ARM we see the
following conflicts:

Configuring for kb9202 board...
start.S: Assembler messages:
start.S:205: Error: invalid constant -- `sub r0,r0,#(0x0200+128*1024)'
start.S:378: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
start.S:379: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
start.S:384: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
start.S:385: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
start.S:390: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
start.S:391: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
start.S:396: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
start.S:397: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
start.S:402: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
start.S:403: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
start.S:427: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
start.S:428: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
start.S:433: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
start.S:434: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
make[1]: *** [start.o] Error 1


Configuring for netstar board...
arm-linux-ld: cannot find -lgeneric
make[1]: *** [eeprom.srec] Error 1


Configuring for voiceblue board...
arm-linux-ld: cannot find -lgeneric
make[1]: *** [eeprom.srec] Error 1


Configuring for apollon board...
onenand_base.c:25: error: static declaration of 'memcpy' follows non-static declaration
/home/wd/git/u-boot/master/include/linux/string.h:70: error: previous declaration of 'memcpy' was here
make[1]: *** [onenand_base.o] Error 1


Configuring for adsvix board...
start.S:183:1: warning: "ICMR" redefined
In file included from start.S:33:
/home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition
start.S:187:1: warning: "RCSR" redefined
/home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:1602:1: warning: this is the location of the previous definition
start.S:191:1: warning: "OSMR3" redefined
/home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:869:1: warning: this is the location of the previous definition
start.S:192:1: warning: "OSCR" redefined
/home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:870:1: warning: this is the location of the previous definition
start.S:193:1: warning: "OWER" redefined
/home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:872:1: warning: this is the location of the previous definition
start.S:194:1: warning: "OIER" redefined
/home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:873:1: warning: this is the location of the previous definition
start.S:207:1: warning: "CCCR" redefined
/home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:1770:1: warning: this is the location of the previous definition
pcmcia.c:39:2: warning: #warning "Board will only supply 5V, wait for next HW spin for selectable power"
pxa_pcmcia.c: In function 'pcmcia_on':
pxa_pcmcia.c:39: warning: operation on 'i' may be undefined
cmd_ide.c: In function '__ide_outb':
cmd_ide.c:828: warning: implicit declaration of function 'outb'
cmd_ide.c: In function '__ide_inb':
cmd_ide.c:837: warning: implicit declaration of function 'inb'
common/libcommon.a(cmd_ide.o): In function `__ide_outb':
/home/wd/git/u-boot/master/common/cmd_ide.c:828: undefined reference to `outb'
common/libcommon.a(cmd_ide.o): In function `__ide_inb':
/home/wd/git/u-boot/master/common/cmd_ide.c:837: undefined reference to `inb'
make: *** [u-boot] Error 1


Configuring for actux4 board...
actux4.c: In function 'board_init':
actux4.c:83: warning: left shift count >= width of type
actux4.c:83: warning: left shift count >= width of type


Configuring for davinci_schmoogie board...
env_nand.c: In function 'saveenv':
env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type
env_nand.c: In function 'env_relocate_spec':
env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type



Board maintainers / custodians - please help!


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 programming was easy, they wouldn't need something as  complicated
as a human being to do it, now would they?
                       - L. Wall & R. L. Schwartz, _Programming Perl_

[U-Boot-Users] 1.3.3-rc2 - release status

[Matthias Fuchs]

Hi, 

I noticed some warnings when compiling recent U-Boot source for some 4xx boards 
with gcc 4.0.0 or 4.2.2. Perhaps somebody has a clue on how to get rid of these:

gcc -g -Wall -pedantic -idirafter /data/home/matthias/git/u-boot/u-boot/include -idirafter /data/home/matthias/git/u-boot/u-boot/include2 -idirafter /data/home/matthias/git/u-boot/u-boot/include -DTEXT_BASE=0xFFFA0000 -DUSE_HOSTCC -O -c -o md5.o md5.c
md5.c: In function ?MD5Update?:
md5.c:95: warning: implicit declaration of function ?memmove?
md5.c:95: warning: incompatible implicit declaration of built-in function ?memmove?
md5.c:98: warning: incompatible implicit declaration of built-in function ?memmove?
md5.c:107: warning: incompatible implicit declaration of built-in function ?memmove?
md5.c:116: warning: incompatible implicit declaration of built-in function ?memmove?
md5.c: In function ?MD5Final?:
md5.c:143: warning: implicit declaration of function ?memset?
md5.c:143: warning: incompatible implicit declaration of built-in function ?memset?
md5.c:151: warning: incompatible implicit declaration of built-in function ?memset?
md5.c:161: warning: incompatible implicit declaration of built-in function ?memmove?
md5.c:162: warning: incompatible implicit declaration of built-in function ?memset?
gcc -g -Wall -pedantic -idirafter /data/home/matthias/git/u-boot/u-boot/include -idirafter /data/home/matthias/git/u-boot/u-boot/include2 -idirafter /data/home/matthias/git/u-boot/u-boot/include -DTEXT_BASE=0xFFFA0000 -DUSE_HOSTCC -O -c -o sha1.o sha1.c
sha1.c: In function ?sha1_update?:
sha1.c:249: warning: implicit declaration of function ?memcpy?
sha1.c:249: warning: incompatible implicit declaration of built-in function ?memcpy?
sha1.c:263: warning: incompatible implicit declaration of built-in function ?memcpy?
sha1.c: In function ?sha1_hmac?:
sha1.c:360: warning: implicit declaration of function ?memset?
sha1.c:360: warning: incompatible implicit declaration of built-in function ?memset?


Matthias

On Tuesday 29 April 2008 23:49, Wolfgang Denk wrote:
> Hello,
> 
> U-Boot v1.3.3-rc2 has just been released.
> 
> PowerPC seems to be in a pretty good state now;  other  architectures
> still  need a lot of testing / fixing. For example, on ARM we see the
> following conflicts:
> 
> Configuring for kb9202 board...
> start.S: Assembler messages:
> start.S:205: Error: invalid constant -- `sub r0,r0,#(0x0200+128*1024)'
> start.S:378: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
> start.S:379: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
> start.S:384: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
> start.S:385: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
> start.S:390: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
> start.S:391: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
> start.S:396: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
> start.S:397: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
> start.S:402: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
> start.S:403: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
> start.S:427: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
> start.S:428: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
> start.S:433: Error: invalid constant -- `sub r13,r13,#((32*1024)+(0x0200+128*1024))'
> start.S:434: Error: invalid constant -- `sub r2,r2,#((32*1024)+(0x0200+128*1024))'
> make[1]: *** [start.o] Error 1
> 
> 
> Configuring for netstar board...
> arm-linux-ld: cannot find -lgeneric
> make[1]: *** [eeprom.srec] Error 1
> 
> 
> Configuring for voiceblue board...
> arm-linux-ld: cannot find -lgeneric
> make[1]: *** [eeprom.srec] Error 1
> 
> 
> Configuring for apollon board...
> onenand_base.c:25: error: static declaration of 'memcpy' follows non-static declaration
> /home/wd/git/u-boot/master/include/linux/string.h:70: error: previous declaration of 'memcpy' was here
> make[1]: *** [onenand_base.o] Error 1
> 
> 
> Configuring for adsvix board...
> start.S:183:1: warning: "ICMR" redefined
> In file included from start.S:33:
> /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition
> start.S:187:1: warning: "RCSR" redefined
> /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:1602:1: warning: this is the location of the previous definition
> start.S:191:1: warning: "OSMR3" redefined
> /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:869:1: warning: this is the location of the previous definition
> start.S:192:1: warning: "OSCR" redefined
> /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:870:1: warning: this is the location of the previous definition
> start.S:193:1: warning: "OWER" redefined
> /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:872:1: warning: this is the location of the previous definition
> start.S:194:1: warning: "OIER" redefined
> /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:873:1: warning: this is the location of the previous definition
> start.S:207:1: warning: "CCCR" redefined
> /home/wd/git/u-boot/master/include/asm/arch/pxa-regs.h:1770:1: warning: this is the location of the previous definition
> pcmcia.c:39:2: warning: #warning "Board will only supply 5V, wait for next HW spin for selectable power"
> pxa_pcmcia.c: In function 'pcmcia_on':
> pxa_pcmcia.c:39: warning: operation on 'i' may be undefined
> cmd_ide.c: In function '__ide_outb':
> cmd_ide.c:828: warning: implicit declaration of function 'outb'
> cmd_ide.c: In function '__ide_inb':
> cmd_ide.c:837: warning: implicit declaration of function 'inb'
> common/libcommon.a(cmd_ide.o): In function `__ide_outb':
> /home/wd/git/u-boot/master/common/cmd_ide.c:828: undefined reference to `outb'
> common/libcommon.a(cmd_ide.o): In function `__ide_inb':
> /home/wd/git/u-boot/master/common/cmd_ide.c:837: undefined reference to `inb'
> make: *** [u-boot] Error 1
> 
> 
> Configuring for actux4 board...
> actux4.c: In function 'board_init':
> actux4.c:83: warning: left shift count >= width of type
> actux4.c:83: warning: left shift count >= width of type
> 
> 
> Configuring for davinci_schmoogie board...
> env_nand.c: In function 'saveenv':
> env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type
> env_nand.c: In function 'env_relocate_spec':
> env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type
> 
> 
> 
> Board maintainers / custodians - please help!
> 
> 
> Best regards,
> 
> Wolfgang Denk
> 

[U-Boot-Users] 1.3.3-rc2 - release status

[Wolfgang Denk]

In message <200804300936.47258.matthias.fuchs@esd-electronics.com> you wrote:
> 
> I noticed some warnings when compiling recent U-Boot source for some 4xx bo> ards 
> with gcc 4.0.0 or 4.2.2. Perhaps somebody has a clue on how to get rid of t> hese:

That's your host GCC. WHich distro is this?

I didn't see such warnigns yet...

> gcc -g -Wall -pedantic -idirafter /data/home/matthias/git/u-boot/u-boot/inc> lude -idirafter /data/home/matthias/git/u-boot/u-boot/include2 -idirafter /> data/home/matthias/git/u-boot/u-boot/include -DTEXT_BASE=0xFFFA0000 -DUSE> _HOSTCC -O -c -o md5.o md5.c
> md5.c: In function ???MD5Update???:
> md5.c:95: warning: implicit declaration of function ???memmove??> ?
> md5.c:95: warning: incompatible implicit declaration of built-in function > ???memmove???
> md5.c:98: warning: incompatible implicit declaration of built-in function > ???memmove???
> md5.c:107: warning: incompatible implicit declaration of built-in function > ???memmove???
> md5.c:116: warning: incompatible implicit declaration of built-in function > ???memmove???

I smell some header file incompatibitilies -  eventually  this  is  a
distro issue.

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 fractal is by definition a set for which the Hausdorff Besicovitch
dimension strictly exceeds the topological dimension."
- Mandelbrot, _The Fractal Geometry of Nature_

[U-Boot-Users] 1.3.3-rc2 - release status

[Matthias Fuchs]

On Wednesday 30 April 2008 09:49:20 Wolfgang Denk wrote:
> In message <200804300936.47258.matthias.fuchs@esd-electronics.com> you 
wrote:
> > I noticed some warnings when compiling recent U-Boot source for some 4xx
> > bo> ards with gcc 4.0.0 or 4.2.2. Perhaps somebody has a clue on how to
> > get rid of t> hese:
>
> That's your host GCC. WHich distro is this?
Yes you are right. 

It's Debian Etch.

matthias at debby:~$ gcc -v
Using built-in specs.
Target: i486-linux-gnu
Configured 
with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --with-tune=i686 --enable-checking=release 
i486-linux-gnu
Thread model: posix
gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21

Matthias

>
> I didn't see such warnigns yet...
>
> > gcc -g -Wall -pedantic -idirafter
> > /data/home/matthias/git/u-boot/u-boot/inc> lude -idirafter
> > /data/home/matthias/git/u-boot/u-boot/include2 -idirafter />
> > data/home/matthias/git/u-boot/u-boot/include -DTEXT_BASE=0xFFFA0000
> > -DUSE> _HOSTCC -O -c -o md5.o md5.c md5.c: In function ???MD5Update???:
> > md5.c:95: warning: implicit declaration of function ???memmove??> ?
> > md5.c:95: warning: incompatible implicit declaration of built-in function
> > > ???memmove??? md5.c:98: warning: incompatible implicit declaration of
> > built-in function > ???memmove??? md5.c:107: warning: incompatible
> > implicit declaration of built-in function > ???memmove??? md5.c:116:
> > warning: incompatible implicit declaration of built-in function >
> > ???memmove???
>
> I smell some header file incompatibitilies -  eventually  this  is  a
> distro issue.
>
> Best regards,
>
> Wolfgang Denk

[U-Boot-Users] [PATCH] env_nand: fix incompatible pointer type on nand_{read, write}

[Jean-Christophe PLAGNIOL-VILLARD]

env_nand.c: In function 'saveenv':
env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type
env_nand.c: In function 'env_relocate_spec':
env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/common/env_nand.c b/common/env_nand.c
index 0dddddf..d8874a6 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -188,7 +188,7 @@ int saveenv(void)
 #else /* ! CFG_ENV_OFFSET_REDUND */
 int saveenv(void)
 {
-	ulong total;
+	size_t total;
 	int ret = 0;
 
 	puts ("Erasing Nand...");
@@ -268,12 +268,12 @@ void env_relocate_spec (void)
 void env_relocate_spec (void)
 {
 #if !defined(ENV_IS_EMBEDDED)
-	ulong total;
+	size_t total;
 	int ret;
 
 	total = CFG_ENV_SIZE;
 	ret = nand_read(&nand_info[0], CFG_ENV_OFFSET, &total, (u_char*)env_ptr);
-  	if (ret || total != CFG_ENV_SIZE)
+	if (ret || total != CFG_ENV_SIZE)
 		return use_default();
 
 	if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
-- 
1.5.4.5

[U-Boot-Users] [PATCH] cmd_nand: fix warning: str2long ncompatible pointer type

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 1a3c1df..37eb41b 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -110,7 +110,7 @@ arg_off_size(int argc, char *argv[], nand_info_t *nand, ulong *off, size_t *size
 			}
 			*off = part->offset;
 			if (argc >= 2) {
-				if (!(str2long(argv[1], size))) {
+				if (!(str2long(argv[1], (ulong *)size))) {
 					printf("'%s' is not a number\n", argv[1]);
 					return -1;
 				}
-- 
1.5.4.5

[U-Boot-Users] [PATCH] cmd_nand: fix warning: str2long ncompatible pointer type

[Wolfgang Denk]

In message <1209587897-25440-1-git-send-email-plagnioj@jcrosoft.com> you wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> 
> diff --git a/common/cmd_nand.c b/common/cmd_nand.c

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
There are bugs and then there are bugs.  And then there are bugs.
                                                    - Karl Lehenbauer

[U-Boot-Users] [PATCH 0/1] pxa: fix pcmcia operation on 'i' may be undefined

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/drivers/pcmcia/pxa_pcmcia.c b/drivers/pcmcia/pxa_pcmcia.c
index 6020e46..7b02050 100644
--- a/drivers/pcmcia/pxa_pcmcia.c
+++ b/drivers/pcmcia/pxa_pcmcia.c
@@ -24,7 +24,8 @@ int pcmcia_on (void)
 
 		0, 0
 	};
-	int i, rc;
+	int rc;
+	int i = 0;
 
 #ifdef CONFIG_EXADRON1
 	int cardDetect;
@@ -34,9 +35,10 @@ int pcmcia_on (void)
 
 	debug ("%s\n", __FUNCTION__);
 
-	i = 0;
-	while (reg_arr[i])
-		*((volatile unsigned int *) reg_arr[i++]) |= reg_arr[i++];
+	while (reg_arr[i]) {
+		(*(volatile unsigned int *) reg_arr[i]) |= reg_arr[i + 1];
+		i += 2;
+	}
 	udelay (1000);
 
 	debug ("%s: programmed mem controller \n", __FUNCTION__);
@@ -44,7 +46,7 @@ int pcmcia_on (void)
 #ifdef CONFIG_EXADRON1
 
 /*define useful BCR masks */
-#define BCR_CF_INIT_VAL  		    0x00007230
+#define BCR_CF_INIT_VAL			    0x00007230
 #define BCR_CF_PWRON_BUSOFF_RESETOFF_VAL    0x00007231
 #define BCR_CF_PWRON_BUSOFF_RESETON_VAL     0x00007233
 #define BCR_CF_PWRON_BUSON_RESETON_VAL      0x00007213
-- 
1.5.4.5

[U-Boot-Users] [PATCH 1/1] pxa: fix previous definition on cpu init

[Jean-Christophe PLAGNIOL-VILLARD]

start.S:183:1: warning: "ICMR" redefined
In file included from start.S:33:
/home/j/u-boot-at91/include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition
start.S:187:1: warning: "RCSR" redefined
/home/j/u-boot-at91/include/asm/arch/pxa-regs.h:1602:1: warning: this is the location of the previous definition
start.S:191:1: warning: "OSMR3" redefined
/home/j/u-boot-at91/include/asm/arch/pxa-regs.h:869:1: warning: this is the location of the previous definition
start.S:192:1: warning: "OSCR" redefined
/home/j/u-boot-at91/include/asm/arch/pxa-regs.h:870:1: warning: this is the location of the previous definition
start.S:193:1: warning: "OWER" redefined
/home/j/u-boot-at91/include/asm/arch/pxa-regs.h:872:1: warning: this is the location of the previous definition
start.S:194:1: warning: "OIER" redefined
/home/j/u-boot-at91/include/asm/arch/pxa-regs.h:873:1: warning: this is the location of the previous definition
start.S:207:1: warning: "CCCR" redefined
/home/j/u-boot-at91/include/asm/arch/pxa-regs.h:1770:1: warning: this is the location of the previous definition

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
index 31f408d..1cdb709 100644
--- a/cpu/pxa/start.S
+++ b/cpu/pxa/start.S
@@ -166,17 +166,13 @@ _start_armboot: .word start_armboot
 /*									    */
 /****************************************************************************/
 /* mk at tbd: Fix this! */
-#if defined(CONFIG_PXA250) || defined(CONFIG_CPU_MONAHANS)
+#undef RCSR
 #undef ICMR
 #undef OSMR3
 #undef OSCR
 #undef OWER
 #undef OIER
-#endif /* CONFIG_PXA250 || CONFIG_CPU_MONAHANS */
-#ifdef CONFIG_PXA250
-#undef RCSR
 #undef CCCR
-#endif /* CONFIG_PXA250 */
 
 /* Interrupt-Controller base address					    */
 IC_BASE:	   .word	   0x40d00000
-- 
1.5.4.5

[U-Boot-Users] [PATCH 1/1] pxa: fix previous definition on cpu init

[Wolfgang Denk]

In message <1209600824-12950-2-git-send-email-plagnioj@jcrosoft.com> you wrote:
> start.S:183:1: warning: "ICMR" redefined
> In file included from start.S:33:
> /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:935:1: warning: this is the location of the previous definition
> start.S:187:1: warning: "RCSR" redefined
> /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:1602:1: warning: this is the location of the previous definition
> start.S:191:1: warning: "OSMR3" redefined
> /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:869:1: warning: this is the location of the previous definition
> start.S:192:1: warning: "OSCR" redefined
> /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:870:1: warning: this is the location of the previous definition
> start.S:193:1: warning: "OWER" redefined
> /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:872:1: warning: this is the location of the previous definition
> start.S:194:1: warning: "OIER" redefined
> /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:873:1: warning: this is the location of the previous definition
> start.S:207:1: warning: "CCCR" redefined
> /home/j/u-boot-at91/include/asm/arch/pxa-regs.h:1770:1: warning: this is the location of the previous definition
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> 
> diff --git a/cpu/pxa/start.S b/cpu/pxa/start.S
> index 31f408d..1cdb709 100644
> --- a/cpu/pxa/start.S
> +++ b/cpu/pxa/start.S

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
Nearly everyone is in favor of going  to  heaven  but  too  many  are
hoping  they'll  live  long  enough  to see an easing of the entrance
requirements. Never appeal to a man's "better nature." he  might  not
have one.

[U-Boot-Users] [PATCH 0/1] pxa: fix pcmcia operation on 'i' may be undefined

[Wolfgang Denk]

In message <1209600824-12950-1-git-send-email-plagnioj@jcrosoft.com> you wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> 
> diff --git a/drivers/pcmcia/pxa_pcmcia.c b/drivers/pcmcia/pxa_pcmcia.c
> index 6020e46..7b02050 100644
> --- a/drivers/pcmcia/pxa_pcmcia.c
> +++ b/drivers/pcmcia/pxa_pcmcia.c

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
"God is a comedian playing to an audience too afraid to laugh."
- Voltaire

[U-Boot-Users] [PATCH] env_nand: fix incompatible pointer type on nand_{read, write}

[Wolfgang Denk]

In message <1209587348-15402-1-git-send-email-plagnioj@jcrosoft.com> you wrote:
> env_nand.c: In function 'saveenv':
> env_nand.c:200: warning: passing argument 3 of 'nand_write' from incompatible pointer type
> env_nand.c: In function 'env_relocate_spec':
> env_nand.c:275: warning: passing argument 3 of 'nand_read' from incompatible pointer type
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

That was already fixed before.

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
CAUTION:  The Mass of This Product Contains the Energy Equivalent  of
85 Million Tons of TNT per Net Ounce of Weight.