minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-08-22 05:06:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCC4.6: Squash warnings in 44x_spd_ddr.c

Browse Source 
44x_spd_ddr.c: In function 'program_tr0':
44x_spd_ddr.c:823: warning: format '%x' expects type 'unsigned int', but
argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_tr1':
44x_spd_ddr.c:1054: warning: format '%x' expects type 'unsigned int', but
argument 2 has type 'long unsigned int'
44x_spd_ddr.c: In function 'program_bxcr':
44x_spd_ddr.c:1127: warning: format '%d' expects type 'int', but argument 2 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 2 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 3 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 4 has
type 'long unsigned int'
44x_spd_ddr.c:1196: warning: format '%d' expects type 'int', but argument 5 has
type 'long unsigned int'
44x_spd_ddr.c:1242: warning: format '%d' expects type 'int', but argument 2 has
type 'long unsigned int'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Marek Vasut 2011-10-21 14:17:12 +00:00 committed by Wolfgang Denk
parent ae484ba1fa
commit 73dc3075ef
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c
View File

@ -820,7 +820,7 @@ static void program_tr0(unsigned long *dimm_populated,
break; break;
} }
debug("tr0: %x\n", tr0); debug("tr0: %lx\n", tr0);
mtsdram(SDRAM0_TR0, tr0); mtsdram(SDRAM0_TR0, tr0);
} }
@ -1051,7 +1051,7 @@ static void program_tr1(void)
} }
tr1 |= SDRAM_TR1_RDCT_ENCODE(rdclt_average); tr1 |= SDRAM_TR1_RDCT_ENCODE(rdclt_average);
debug("tr1: %x\n", tr1); debug("tr1: %lx\n", tr1);
/* /*
* program SDRAM Timing Register 1 TR1 * program SDRAM Timing Register 1 TR1
@ -1124,7 +1124,7 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
num_col_addr = spd_read(iic0_dimm_addr[dimm_num], 4); num_col_addr = spd_read(iic0_dimm_addr[dimm_num], 4);
num_banks = spd_read(iic0_dimm_addr[dimm_num], 5); num_banks = spd_read(iic0_dimm_addr[dimm_num], 5);
bank_size_id = spd_read(iic0_dimm_addr[dimm_num], 31); bank_size_id = spd_read(iic0_dimm_addr[dimm_num], 31);
debug("DIMM%d: row=%d col=%d banks=%d\n", dimm_num, debug("DIMM%ld: row=%d col=%d banks=%d\n", dimm_num,
num_row_addr, num_col_addr, num_banks); num_row_addr, num_col_addr, num_banks);
/* /*
@ -1193,9 +1193,11 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
bank_parms[ctrl_bank_num[dimm_num]+i].bank_size_bytes = bank_parms[ctrl_bank_num[dimm_num]+i].bank_size_bytes =
(4 << 20) * bank_size_id; (4 << 20) * bank_size_id;
bank_parms[ctrl_bank_num[dimm_num]+i].cr = cr; bank_parms[ctrl_bank_num[dimm_num]+i].cr = cr;
debug("DIMM%d-bank %d (SDRAM0_B%dCR): bank_size_bytes=%d\n", debug("DIMM%ld-bank %ld (SDRAM0_B%ldCR): "
dimm_num, i, ctrl_bank_num[dimm_num]+i, "bank_size_bytes=%ld\n",
bank_parms[ctrl_bank_num[dimm_num]+i].bank_size_bytes); dimm_num, i,
ctrl_bank_num[dimm_num] + i,
bank_parms[ctrl_bank_num[dimm_num] + i].bank_size_bytes);
} }
} }
} }
@ -1239,7 +1241,8 @@ static unsigned long program_bxcr(unsigned long *dimm_populated,
bank_parms[sorted_bank_num[bx_cr_num]].cr; bank_parms[sorted_bank_num[bx_cr_num]].cr;
mtdcr(SDRAM0_CFGDATA, temp); mtdcr(SDRAM0_CFGDATA, temp);
bank_base_addr += bank_parms[sorted_bank_num[bx_cr_num]].bank_size_bytes; bank_base_addr += bank_parms[sorted_bank_num[bx_cr_num]].bank_size_bytes;
debug("SDRAM0_B%dCR=0x%08lx\n", sorted_bank_num[bx_cr_num], temp); debug("SDRAM0_B%ldCR=0x%08lx\n",
sorted_bank_num[bx_cr_num], temp);
} }
} }