Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-6

Creator:  Stefan Reinauer <stepan@openbios.org>

fix dram initialization on island/aruma

Never trust the specs. :-) I messed the different
cpu numbering notations up before. This makes my
wrong 8x patch obsolete as well.

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1925 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/island/aruma/auto.c b/src/mainboard/island/aruma/auto.c
index 1c904bce4ad1f3300889fbeff0ef7eac1b9690de..d1899e934a599a2a982b9c62393ef9654982aed9 100644 (file)
--- a/src/mainboard/island/aruma/auto.c
+++ b/src/mainboard/island/aruma/auto.c
@@ -116,13 +116,14 @@ static void main(unsigned long bist)
                .channel1 = { (0xaa>>1)|CHAN0, (0xae>>1)|CHAN0, 0, 0 }
        },
        {       NODE_RAM(2),
-               .channel0 = { (0xa0>>1)|CHAN1, (0xa4>>1)|CHAN1, 0, 0 },
-               .channel1 = { (0xa2>>1)|CHAN1, (0xa6>>1)|CHAN1, 0, 0 }
-       },
-       {       NODE_RAM(3),
                .channel0 = { (0xa8>>1)|CHAN1, (0xac>>1)|CHAN1, 0, 0 },
                .channel1 = { (0xaa>>1)|CHAN1, (0xae>>1)|CHAN1, 0, 0 }
-       } };
+       },
+       {       NODE_RAM(3),
+               .channel0 = { (0xa0>>1)|CHAN1, (0xa4>>1)|CHAN1, 0, 0 },
+               .channel1 = { (0xa2>>1)|CHAN1, (0xa6>>1)|CHAN1, 0, 0 }
+       }
+       };
 
        int needs_reset;
 

diff --git a/src/mainboard/island/aruma/dram8x.diff b/src/mainboard/island/aruma/dram8x.diff
deleted file mode 100644 (file)
index e02c6b6..0000000
--- a/src/mainboard/island/aruma/dram8x.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/northbridge/amd/amdk8/raminit.c
-===================================================================
-RCS file: /cvsroot/freebios/freebios2/src/northbridge/amd/amdk8/raminit.c,v
-retrieving revision 1.26
-diff -u -r1.26 raminit.c
---- src/northbridge/amd/amdk8/raminit.c        14 Oct 2004 22:06:29 -0000      1.26
-+++ src/northbridge/amd/amdk8/raminit.c        26 Jan 2005 09:50:05 -0000
-@@ -1603,7 +1603,7 @@
-       dimm += DCL_x4DIMM_SHIFT;
-       dcl = pci_read_config32(ctrl->f2, DRAM_CONFIG_LOW);
-       dcl &= ~(1 << dimm);
--      if (value == 4) {
-+      if (value >= 4) {
-               dcl |= (1 << dimm);
-       }
-       pci_write_config32(ctrl->f2, DRAM_CONFIG_LOW, dcl);