Updates to raminit.c correcting for new version of smbus_read_byte.

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1808 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Mark Wilkinson 2004-12-01 16:59:05 +00:00
parent e1bc97b078
commit 57b6786168
1 changed files with 7 additions and 6 deletions

View File

@ -193,7 +193,8 @@ spd_module_size(unsigned char slot)
/* we may run out of registers ... */ /* we may run out of registers ... */
unsigned int banks, rows, cols, reg; unsigned int banks, rows, cols, reg;
unsigned int value = 0; unsigned int value = 0;
unsigned int module = ((0x50 + slot) << 1) + 1; /* unsigned int module = ((0x50 + slot) << 1) + 1; */
unsigned int module = 0x50 + slot;
/* is the module there? if byte 2 is not 4, then we'll assume it /* is the module there? if byte 2 is not 4, then we'll assume it
* is useless. * is useless.
*/ */
@ -231,7 +232,8 @@ spd_module_size(unsigned char slot)
static int static int
spd_num_chips(unsigned char slot) spd_num_chips(unsigned char slot)
{ {
unsigned int module = ((0x50 + slot) << 1) + 1; /* unsigned int module = ((0x50 + slot) << 1) + 1; */
unsigned int module = 0x50 + slot;
unsigned int width; unsigned int width;
width = smbus_read_byte(module, 13); width = smbus_read_byte(module, 13);
@ -246,13 +248,13 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl)
unsigned char Trp = 1, Tras = 1, casl = 2, val; unsigned char Trp = 1, Tras = 1, casl = 2, val;
unsigned char timing = 0xe4; unsigned char timing = 0xe4;
/* read Trp */ /* read Trp */
val = smbus_read_byte(0xa0, 27); val = smbus_read_byte(0x50, 27);
if (val < 2*T133) if (val < 2*T133)
Trp = 1; Trp = 1;
val = smbus_read_byte(0xa0, 30); val = smbus_read_byte(0x50, 30);
if (val < 5*T133) if (val < 5*T133)
Tras = 0; Tras = 0;
val = smbus_read_byte(0xa0, 18); val = smbus_read_byte(0x50, 18);
if (val < 8) if (val < 8)
casl = 1; casl = 1;
if (val < 4) if (val < 4)
@ -392,5 +394,4 @@ static void sdram_enable(int controllers, const struct mem_controller *ctrl)
set_ma_mapping(north, slot, ma); set_ma_mapping(north, slot, ma);
} }
print_err("vt8601 done\r\n"); print_err("vt8601 done\r\n");
dumpnorth(north);
} }