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