summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@openbios.org>2003-11-04 11:57:10 +0000
committerStefan Reinauer <stepan@openbios.org>2003-11-04 11:57:10 +0000
commit469bd43194f40481645b2b59ba2b16b05e9ab245 (patch)
tree321e85fc1d938a8ba1d2a067c7a0381ae1bfe250 /src
parentab5ab6e55618d67106580bf1869558e7d1a36133 (diff)
downloadcoreboot-469bd43194f40481645b2b59ba2b16b05e9ab245.tar.xz
make quartet compile.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1250 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/amd/quartet/Config.lb6
-rw-r--r--src/mainboard/amd/quartet/auto.c28
2 files changed, 18 insertions, 16 deletions
diff --git a/src/mainboard/amd/quartet/Config.lb b/src/mainboard/amd/quartet/Config.lb
index cbcb340fe2..36704b62a0 100644
--- a/src/mainboard/amd/quartet/Config.lb
+++ b/src/mainboard/amd/quartet/Config.lb
@@ -230,7 +230,7 @@ northbridge amd/amdk8 "mc0"
pci 0:18.2
pci 0:18.3
southbridge amd/amd8111 "amd8111" link 2
- pci 0:0.0 on
+ pci 0:0.0
pci 0:1.0 on
pci 0:1.1 on
pci 0:1.2 on
@@ -266,13 +266,13 @@ northbridge amd/amdk8 "mc1"
pci 0:19.1
pci 0:19.2
pci 0:19.3
- southbridge amd/amd8131 "amd8131" link 1
+ southbridge amd/amd8131 "amd8131_0" link 1
pci 0:0.0
pci 0:0.1
pci 0:1.0
pci 0:1.1
end
- southbridge amd/amd8131 "amd8131" link 1
+ southbridge amd/amd8131 "amd8131_1" link 1
pci 0:0.0
pci 0:0.1
pci 0:1.0
diff --git a/src/mainboard/amd/quartet/auto.c b/src/mainboard/amd/quartet/auto.c
index d7507fd12d..1f158d967a 100644
--- a/src/mainboard/amd/quartet/auto.c
+++ b/src/mainboard/amd/quartet/auto.c
@@ -1,6 +1,6 @@
#define ASSEMBLY 1
-#define MAXIMUM_CONSOLE_LOGLEVEL 9
-#define DEFAULT_CONSOLE_LOGLEVEL 9
+// #define MAXIMUM_CONSOLE_LOGLEVEL 9
+// #define DEFAULT_CONSOLE_LOGLEVEL 9
#include <stdint.h>
#include <device/pci_def.h>
@@ -100,16 +100,18 @@ static unsigned int generate_row(uint8_t node, uint8_t row, uint8_t maxnodes)
return ret;
}
-static inline int spd_read_byte(unsigned device, unsigned address)
+
+static inline void activate_spd_rom(const struct mem_controller *ctrl)
{
#define SMBUS_HUB 0x30
- unsigned hub = device >> 8;
-
- device &= 0xff;
- smbus_write_byte(SMBUS_HUB, 0x01, 1<<hub);
- smbus_write_byte(SMBUS_HUB, 0x03, 0);
+ unsigned device=(ctrl->channel0[0])>>8;
+ smbus_write_byte(SMBUS_HUB | (0x01<<8), device);
+ smbus_write_byte(SMBUS_HUB | (0x03<<8), 0);
+}
- return smbus_read_byte(device, address);
+static inline int spd_read_byte(unsigned device, unsigned address)
+{
+ return smbus_read_byte(device & 0xff, address);
}
/* no specific code here. this should go away completely */
@@ -181,10 +183,10 @@ static void pc87360_enable_serial(void)
pnp_set_iobase0(SIO_BASE, 0x3f8);
}
-#define RC0 (0<<8)
-#define RC1 (1<<8)
-#define RC2 (2<<8)
-#define RC3 (3<<8)
+#define RC0 ((1<<0)<<8)
+#define RC1 ((1<<1)<<8)
+#define RC2 ((1<<2)<<8)
+#define RC3 ((1<<3)<<8)
#define DIMM0 0xa0
#define DIMM1 0xa2