diff mbox

[U-Boot,18/19] mip405.c: Fix GCC 4.6 build warnings

Message ID 1321380219-6986-1-git-send-email-sr@denx.de
State Accepted
Commit 4233fafe9e190fa57db6ca913978b02789bc98f7
Headers show

Commit Message

Stefan Roese Nov. 15, 2011, 6:03 p.m. UTC
Fix:
mip405.c: In function 'init_sdram':
mip405.c:250:4: warning: variable 'tctp_clocks' set but not used [-Wunused-but-set-variable]
mip405.c: In function 'initdram':
mip405.c:629:9: warning: variable 'ds' set but not used [-Wunused-but-set-variable]

Signed-off-by: Stefan Roese <sr@denx.de>
---
 board/mpl/mip405/mip405.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

Comments

Wolfgang Denk Nov. 16, 2011, 8:17 p.m. UTC | #1
Dear Stefan Roese,

In message <1321380219-6986-1-git-send-email-sr@denx.de> you wrote:
> Fix:
> mip405.c: In function 'init_sdram':
> mip405.c:250:4: warning: variable 'tctp_clocks' set but not used [-Wunused-but-set-variable]
> mip405.c: In function 'initdram':
> mip405.c:629:9: warning: variable 'ds' set but not used [-Wunused-but-set-variable]
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  board/mpl/mip405/mip405.c |   10 +++-------
>  1 files changed, 3 insertions(+), 7 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c
index e93d994..9d0db64 100644
--- a/board/mpl/mip405/mip405.c
+++ b/board/mpl/mip405/mip405.c
@@ -246,8 +246,7 @@  int init_sdram (void)
 	unsigned char	trp_clocks,
 			trcd_clocks,
 			tras_clocks,
-			trc_clocks,
-			tctp_clocks;
+			trc_clocks;
 	unsigned char	cal_val;
 	unsigned char	bc;
 	unsigned long	sdram_tim, sdram_bank;
@@ -345,7 +344,6 @@  int init_sdram (void)
 	trcd_clocks = sdram_table[i].trcd;	/* 20ns /7.5 ns (datain[29]) */
 	tras_clocks = sdram_table[i].tras;	/* 44ns /7.5 ns  (datain[30]) */
 	/* ctp = ((trp + tras) - trp - trcd) => tras - trcd */
-	tctp_clocks = sdram_table[i].tctp;	/* 44 - 20ns = 24ns */
 	/* trc_clocks is sum of trp_clocks + tras_clocks */
 	trc_clocks = trp_clocks + tras_clocks;
 	/* get SDRAM timing register */
@@ -626,10 +624,9 @@  phys_size_t initdram (int board_type)
 {
 
 	unsigned long bank_reg[4], tmp, bank_size;
-	int i, ds;
+	int i;
 	unsigned long TotalSize;
 
-	ds = 0;
 	/* since the DRAM controller is allready set up, calculate the size with the
 	   bank registers    */
 	mtdcr (SDRAM0_CFGADDR, SDRAM0_B0CR);
@@ -646,8 +643,7 @@  phys_size_t initdram (int board_type)
 			tmp = (bank_reg[i] >> 17) & 0x7;
 			bank_size = 4 << tmp;
 			TotalSize += bank_size;
-		} else
-			ds = 1;
+		}
 	}
 	mtdcr (SDRAM0_CFGADDR, SDRAM0_ECCCFG);
 	tmp = mfdcr (SDRAM0_CFGDATA);