diff options
| author | Li-Ta Lo <ollie@lanl.gov> | 2006-03-17 20:11:38 +0000 |
|---|---|---|
| committer | Li-Ta Lo <ollie@lanl.gov> | 2006-03-17 20:11:38 +0000 |
| commit | 042f0430d3905786620b3e74ffb8d48ea551b20c (patch) | |
| tree | 5782f93631808b9c19adc4a457e527895cfe13f6 /src/mainboard | |
| parent | a5ce2341ec04f333297cef729892cf886710ea89 (diff) | |
| download | coreboot-042f0430d3905786620b3e74ffb8d48ea551b20c.tar.xz | |
resolving conflict with Ron's work
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2209 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/amd/rumba/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/amd/rumba/auto.c | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/mainboard/amd/rumba/Config.lb b/src/mainboard/amd/rumba/Config.lb index 556e3ccf14..f08593143f 100644 --- a/src/mainboard/amd/rumba/Config.lb +++ b/src/mainboard/amd/rumba/Config.lb @@ -62,11 +62,11 @@ end makerule ./auto.E depends "$(MAINBOARD)/auto.c option_table.h ./romcc" - action "./romcc -E -mcpu=i386 -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@" + action "./romcc -E -mcpu=p2 -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@" end makerule ./auto.inc depends "$(MAINBOARD)/auto.c option_table.h ./romcc" - action "./romcc -mcpu=i386 -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@" + action "./romcc -mcpu=p2 -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@" end ## diff --git a/src/mainboard/amd/rumba/auto.c b/src/mainboard/amd/rumba/auto.c index 744cba17d8..15b3606f0e 100644 --- a/src/mainboard/amd/rumba/auto.c +++ b/src/mainboard/amd/rumba/auto.c @@ -18,6 +18,12 @@ #include "southbridge/amd/cs5535/cs5535_early_smbus.c" #include "southbridge/amd/cs5535/cs5535_early_setup.c" + +static inline int spd_read_byte(unsigned device, unsigned address) +{ + return smbus_read_byte(device, address); +} + #include "northbridge/amd/gx2/raminit.h" static void sdram_set_spd_registers(const struct mem_controller *ctrl) { @@ -33,10 +39,9 @@ static void sdram_set_spd_registers(const struct mem_controller *ctrl) { msr = rdmsr(0x20000019); msr.hi = 0x18000108; msr.lo = 0x696332a3; - wrmsr(0x20000019, msr); - - + wrmsr(0x20000019, msr); } + #include "northbridge/amd/gx2/raminit.c" #include "sdram/generic_sdram.c" |