diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 14:45:02 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-13 14:45:02 (GMT) |
commit | 77ddac9480d63a80b6bb76d7ee4dcc2d1070867e (patch) | |
tree | e9563b2f28ea59062b90bb5712f141e8e9798aee /board/tqm8xx | |
parent | 17a8b276ba2b3499b75cd60b0b5289dbbea7967b (diff) | |
download | u-boot-fsl-qoriq-77ddac9480d63a80b6bb76d7ee4dcc2d1070867e.tar.xz |
Cleanup for GCC-4.x
Diffstat (limited to 'board/tqm8xx')
-rw-r--r-- | board/tqm8xx/load_sernum_ethaddr.c | 4 | ||||
-rw-r--r-- | board/tqm8xx/tqm8xx.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/board/tqm8xx/load_sernum_ethaddr.c b/board/tqm8xx/load_sernum_ethaddr.c index 98baf7f..143f368 100644 --- a/board/tqm8xx/load_sernum_ethaddr.c +++ b/board/tqm8xx/load_sernum_ethaddr.c @@ -96,10 +96,10 @@ void load_sernum_ethaddr (void) /* set serial# and ethaddr if not yet defined */ if (getenv("serial#") == NULL) { - setenv ("serial#", serial); + setenv ((char *)"serial#", (char *)serial); } if (getenv("ethaddr") == NULL) { - setenv ("ethaddr", ethaddr); + setenv ((char *)"ethaddr", (char *)ethaddr); } } diff --git a/board/tqm8xx/tqm8xx.c b/board/tqm8xx/tqm8xx.c index a7a6f2a..017bdf9 100644 --- a/board/tqm8xx/tqm8xx.c +++ b/board/tqm8xx/tqm8xx.c @@ -106,7 +106,7 @@ int checkboard (void) { DECLARE_GLOBAL_DATA_PTR; - unsigned char *s = getenv ("serial#"); + char *s = getenv ("serial#"); puts ("Board: "); @@ -215,7 +215,7 @@ long int initdram (int board_type) * * try 8 column mode */ - size8 = dram_size (CFG_MAMR_8COL, (ulong *) SDRAM_BASE2_PRELIM, + size8 = dram_size (CFG_MAMR_8COL, SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); debug ("SDRAM Bank 0 in 8 column mode: %ld MB\n", size8 >> 20); @@ -224,7 +224,7 @@ long int initdram (int board_type) /* * try 9 column mode */ - size9 = dram_size (CFG_MAMR_9COL, (ulong *) SDRAM_BASE2_PRELIM, + size9 = dram_size (CFG_MAMR_9COL, SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE); debug ("SDRAM Bank 0 in 9 column mode: %ld MB\n", size9 >> 20); @@ -263,7 +263,7 @@ long int initdram (int board_type) * [9 column SDRAM may also be used in 8 column mode, * but then only half the real size will be used.] */ - size_b1 = dram_size (memctl->memc_mamr, (ulong *) SDRAM_BASE3_PRELIM, + size_b1 = dram_size (memctl->memc_mamr, (long int *)SDRAM_BASE3_PRELIM, SDRAM_MAX_SIZE); debug ("SDRAM Bank 1: %ld MB\n", size_b1 >> 20); } else { |