summaryrefslogtreecommitdiffstats
path: root/board/sixnet
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-10-13 16:45:02 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-10-13 16:45:02 +0200
commit77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch)
treee9563b2f28ea59062b90bb5712f141e8e9798aee /board/sixnet
parent17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff)
downloadtalos-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.gz
talos-obmc-uboot-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.zip
Cleanup for GCC-4.x
Diffstat (limited to 'board/sixnet')
-rw-r--r--board/sixnet/flash.c2
-rw-r--r--board/sixnet/sixnet.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/sixnet/flash.c b/board/sixnet/flash.c
index 4ab6c1bdc4..61d758085c 100644
--- a/board/sixnet/flash.c
+++ b/board/sixnet/flash.c
@@ -196,7 +196,7 @@ void flash_print_info (flash_info_t *info)
int i;
uchar *boottype;
uchar *bootletter;
- uchar *fmt;
+ char *fmt;
uchar botbootletter[] = "B";
uchar topbootletter[] = "T";
uchar botboottype[] = "bottom boot sector";
diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c
index c31ea539e2..867589f918 100644
--- a/board/sixnet/sixnet.c
+++ b/board/sixnet/sixnet.c
@@ -356,7 +356,7 @@ void nand_init(void)
static long ram_size(ulong *base, long maxsize)
{
volatile long *test_addr;
- volatile long *base_addr = base;
+ volatile ulong *base_addr = base;
ulong ofs; /* byte offset from base_addr */
ulong save; /* to make test non-destructive */
ulong save2; /* to make test non-destructive */
OpenPOWER on IntegriCloud