Chameleon Commit Details - 514 - Chameleon open source boot loader project.

Date:

2010-09-10 00:50:12 (13 years 7 months ago)

Author:

Azimutz

Commit:

514

Parents:

513

Message:

Fixing the other half of the paste error i mentioned on rev512... were was my head?? Adding typo fix from trunk, rev 513.

Changes:

M	/branches/azimutz/Chazi/i386/libsaio/dram_controllers.c
M	/branches/azimutz/Chazi/i386/libsaio/device_inject.c

File differences

-55
56 56
57 57
58 
58
59 59
60 60
61 61
+  /* Use the static "device-properties" boot config key contents if available,␊
   * otheriwse use the generated one.␊
   */  ␊
  if (!getValueForKey(kRenamePartitionKey, &val, &cnt, &bootInfo->bootConfig) && string)␊
  if (!getValueForKey(kDevicePropertiesKey, &val, &cnt, &bootInfo->bootConfig) && string)␊
  {␊
    val = (const char*)string;␊
    cnt = strlength * 2;␊
   /* Use the static "device-properties" boot config key contents if available,␊
    * otheriwse use the generated one.␊
    */  ␊
-  if (!getValueForKey(kRenamePartitionKey, &val, &cnt, &bootInfo->bootConfig) && string)␊
+  if (!getValueForKey(kDevicePropertiesKey, &val, &cnt, &bootInfo->bootConfig) && string)␊
   {␊
     val = (const char*)string;␊
     cnt = strlength * 2;␊

-474
475 475
476 476
477 
477
478 478
479 479
480 480
+␉Platform.RAM.CAS = (mc_channel_bank_timing >> 4) & 0x1F; ␊
␉␊
␉// RAS Active to precharge (tRAS)␊
␉Platform.RAM.TRP = mc_channel_bank_timing & 0xF;␊
␉Platform.RAM.RAS = mc_channel_bank_timing & 0xF;␊
␉␊
␉// Single , Dual or Triple Channels␊
␉if (mc_control == 1 || mc_control == 2 || mc_control == 4 )␊
 ␉Platform.RAM.CAS = (mc_channel_bank_timing >> 4) & 0x1F; ␊
 ␉␊
 ␉// RAS Active to precharge (tRAS)␊
-␉Platform.RAM.TRP = mc_channel_bank_timing & 0xF;␊
+␉Platform.RAM.RAS = mc_channel_bank_timing & 0xF;␊
 ␉␊
 ␉// Single , Dual or Triple Channels␊
 ␉if (mc_control == 1 || mc_control == 2 || mc_control == 4 )␊