leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4xx_ibm_ddr2_autocalib.c: Fix GCC 4.6 build warnings

Browse Source 
Fix:
4xx_ibm_ddr2_autocalib.c: In function 'get_membase':
4xx_ibm_ddr2_autocalib.c:157:8: warning: variable 'bxcf' set but not used [-Wunused-but-set-variable]
4xx_ibm_ddr2_autocalib.c: In function 'DQS_calibration_methodB':
4xx_ibm_ddr2_autocalib.c:722:8: warning: variable 'rffd' set but not used [-Wunused-but-set-variable]

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2011-11-15 08:02:11 +00:00 committed by Wolfgang Denk
parent fe91a65707
commit 8f6db4b7ab
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
View File

@ -154,18 +154,20 @@ u32 ddr_rdss_opt(ulong) __attribute__((weak, alias("__ddr_rdss_opt")));
static u32 *get_membase(int bxcr_num)
{
ulong bxcf;
u32 *membase;
#if defined(SDRAM_R0BAS)
/* BAS from Memory Queue rank reg. */
membase =
(u32 *)(SDRAM_RXBAS_SDBA_DECODE(mfdcr_any(SDRAM_R0BAS+bxcr_num)));
bxcf = 0; /* just to satisfy the compiler */
#else
/* BAS from SDRAM_MBxCF mem rank reg. */
mfsdram(SDRAM_MB0CF + (bxcr_num<<2), bxcf);
membase = (u32 *)((bxcf & 0xfff80000) << 3);
{
ulong bxcf;
/* BAS from SDRAM_MBxCF mem rank reg. */
mfsdram(SDRAM_MB0CF + (bxcr_num<<2), bxcf);
membase = (u32 *)((bxcf & 0xfff80000) << 3);
}
#endif
return membase;
@ -719,7 +721,9 @@ static u32 program_DQS_calibration_methodB(struct ddrautocal *ddrcal)
static u32 DQS_calibration_methodB(struct ddrautocal *cal)
{
ulong rfdc_reg;
#ifndef CONFIG_DDR_RFDC_FIXED
ulong rffd;
#endif
ulong rqdc_reg;
ulong rqfd;
@ -837,7 +841,6 @@ static u32 DQS_calibration_methodB(struct ddrautocal *cal)
mtsdram(SDRAM_RFDC, rfdc_reg | SDRAM_RFDC_RFFD_ENCODE(rffd_average));
#endif /* CONFIG_DDR_RFDC_FIXED */
rffd = rffd_average;
in_window = 0;
curr_win_min = curr_win_max = 0;