summaryrefslogtreecommitdiffstats
path: root/board/amirix
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-01-18 20:06:44 +0100
committerStefan Roese <sr@denx.de>2006-01-18 20:06:44 +0100
commit18c5e64c5b0f21f0824bf4f0a8ab0f942652ee7f (patch)
tree067552321aa96b1294757a4a8a39f329c1e64047 /board/amirix
parenta7b9fb9110e3c0be644b3e2c8f397f606138a710 (diff)
downloadblackbird-obmc-uboot-18c5e64c5b0f21f0824bf4f0a8ab0f942652ee7f.tar.gz
blackbird-obmc-uboot-18c5e64c5b0f21f0824bf4f0a8ab0f942652ee7f.zip
Fix various compiler warnings on ppc4xx builds (ELDK 4.0)
Patch by Stefan Roese, 18 Jan 2006
Diffstat (limited to 'board/amirix')
-rw-r--r--board/amirix/ap1000/ap1000.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/board/amirix/ap1000/ap1000.c b/board/amirix/ap1000/ap1000.c
index dd836ce221..7d11b29b59 100644
--- a/board/amirix/ap1000/ap1000.c
+++ b/board/amirix/ap1000/ap1000.c
@@ -36,8 +36,8 @@ int board_pre_init (void)
/** serial number and platform display at startup */
int checkboard (void)
{
- unsigned char *s = getenv ("serial#");
- unsigned char *e;
+ char *s = getenv ("serial#");
+ char *e;
/* After a loadace command, the SystemAce control register is left in a wonky state. */
/* this code did not work in board_pre_init */
@@ -135,13 +135,13 @@ int checkboard (void)
long int initdram (int board_type)
{
- unsigned char *s = getenv ("dramsize");
+ char *s = getenv ("dramsize");
if (s != NULL) {
if ((s[0] == '0') && ((s[1] == 'x') || (s[1] == 'X'))) {
s += 2;
}
- return simple_strtoul (s, NULL, 16);
+ return (long int)simple_strtoul (s, NULL, 16);
} else {
/* give all 64 MB */
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... ");
write_result =
- flash_write (sector_buffer, SW_BYTE_SECTOR_ADDR,
+ flash_write ((char *)sector_buffer, SW_BYTE_SECTOR_ADDR,
SW_BYTE_SECTOR_SIZE);
if (write_result != 0) {
flash_perror (write_result);
OpenPOWER on IntegriCloud