GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-05 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix various compiler warnings on ppc4xx builds (ELDK 4.0)

Browse source 
Patch by Stefan Roese, 18 Jan 2006
This commit is contained in:
Stefan Roese 2006-01-18 20:06:44 +01:00
parent a7b9fb9110
commit 18c5e64c5b
7 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix various compiler warnings on ppc4xx builds (ELDK 4.0)
Patch by Stefan Roese, 18 Jan 2006
* Add VGA support (CT69000) to CPCI750 board. * Add VGA support (CT69000) to CPCI750 board.
Insert missing __le32_to_cpu() for filesize in ext2fs_read_file(). Insert missing __le32_to_cpu() for filesize in ext2fs_read_file().
Patch by Reinhard Arlt, 30 Dec 2005 Patch by Reinhard Arlt, 30 Dec 2005

10
board/amirix/ap1000/ap1000.c
View file

@ -36,8 +36,8 @@ int board_pre_init (void)
/** serial number and platform display at startup */ /** serial number and platform display at startup */
int checkboard (void) int checkboard (void)
{ {
unsigned char *s = getenv ("serial#"); char *s = getenv ("serial#");
unsigned char *e; char *e;
/* After a loadace command, the SystemAce control register is left in a wonky state. */ /* After a loadace command, the SystemAce control register is left in a wonky state. */
/* this code did not work in board_pre_init */ /* this code did not work in board_pre_init */
@ -135,13 +135,13 @@ int checkboard (void)
long int initdram (int board_type) long int initdram (int board_type)
{ {
unsigned char *s = getenv ("dramsize"); char *s = getenv ("dramsize");
if (s != NULL) { if (s != NULL) {
if ((s[0] == '0') && ((s[1] == 'x') || (s[1] == 'X'))) { if ((s[0] == '0') && ((s[1] == 'x') || (s[1] == 'X'))) {
s += 2; s += 2;
} }
return simple_strtoul (s, NULL, 16); return (long int)simple_strtoul (s, NULL, 16);
} else { } else {
/* give all 64 MB */ /* give all 64 MB */
return 64 * 1024 * 1024; return 64 * 1024 * 1024;
@ -293,7 +293,7 @@ int do_swconfigbyte (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
printf ("Writing to Flash... "); printf ("Writing to Flash... ");
write_result = write_result =
flash_write (sector_buffer, SW_BYTE_SECTOR_ADDR, flash_write ((char *)sector_buffer, SW_BYTE_SECTOR_ADDR,
SW_BYTE_SECTOR_SIZE); SW_BYTE_SECTOR_SIZE);
if (write_result != 0) { if (write_result != 0) {
flash_perror (write_result); flash_perror (write_result);

2
board/esd/cms700/cms700.c
View file

@ -114,7 +114,7 @@ int misc_init_r (void)
int checkboard (void) int checkboard (void)
{ {
unsigned char str[64]; char str[64];
int flashcnt; int flashcnt;
int delay; int delay;
volatile unsigned char *led_reg = (unsigned char *)((ulong)CFG_PLD_BASE + 0x1000); volatile unsigned char *led_reg = (unsigned char *)((ulong)CFG_PLD_BASE + 0x1000);

2
board/esd/common/auto_update.c
View file

@ -283,7 +283,7 @@ int au_do_update(int i, long sz)
*/ */
if (au_image[i].type != AU_NAND) { if (au_image[i].type != AU_NAND) {
debug ("flash_write(%p, %lx %x)\n", addr, start, nbytes); debug ("flash_write(%p, %lx %x)\n", addr, start, nbytes);
rc = flash_write((uchar *)addr, start, nbytes); rc = flash_write((char *)addr, start, nbytes);
} else { } else {
#if (CONFIG_COMMANDS & CFG_CMD_NAND) #if (CONFIG_COMMANDS & CFG_CMD_NAND)
debug ("nand_rw(%p, %lx %x)\n", addr, start, nbytes); debug ("nand_rw(%p, %lx %x)\n", addr, start, nbytes);

2
board/esd/hh405/hh405.c
View file

@ -590,7 +590,7 @@ int checkboard (void)
{ {
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
unsigned char str[64]; char str[64];
int i = getenv_r ("serial#", str, sizeof(str)); int i = getenv_r ("serial#", str, sizeof(str));
puts ("Board: "); puts ("Board: ");

2
board/esd/vom405/vom405.c
View file

@ -97,7 +97,7 @@ int misc_init_r (void)
int checkboard (void) int checkboard (void)
{ {
unsigned char str[64]; char str[64];
int i = getenv_r ("serial#", str, sizeof(str)); int i = getenv_r ("serial#", str, sizeof(str));
int flashcnt; int flashcnt;
int delay; int delay;

2
board/xilinx/xilinx_enet/emac_adapter.c
View file

@ -148,7 +148,7 @@ eth_rx(void)
RecvFrameLength = PKTSIZE; RecvFrameLength = PKTSIZE;
Result = XEmac_PollRecv(&Emac, (u8 *) etherrxbuff, &RecvFrameLength); Result = XEmac_PollRecv(&Emac, (u8 *) etherrxbuff, &RecvFrameLength);
if (Result == XST_SUCCESS) { if (Result == XST_SUCCESS) {
NetReceive((uchar)etherrxbuff, RecvFrameLength); NetReceive((uchar *)etherrxbuff, RecvFrameLength);
return (1); return (1);
} else { } else {
return (0); return (0);