issue 41 - fix up motherboard compilation. There's always hope.

1201_ht_bus0_dev0_fidvid_mb.diff part 1



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

4 files changed, 14 insertions, 10 deletions

diff --git a/src/mainboard/agami/aruma/Options.lb b/src/mainboard/agami/aruma/Options.lb
index 9fab69b82a..967b314428 100644
--- a/src/mainboard/agami/aruma/Options.lb
+++ b/src/mainboard/agami/aruma/Options.lb
@@ -52,6 +52,11 @@ uses CONFIG_PCI_ROM_RUN
 
 uses CONFIG_USE_INIT
 
+uses ENABLE_APIC_EXT_ID
+uses APIC_ID_OFFSET
+uses LIFT_BSP_APIC_ID
+
+
 ###
 ### Build options
 ###
@@ -112,6 +117,10 @@ default CONFIG_MAX_CPUS=4
 default CONFIG_MAX_PHYSICAL_CPUS=4
 #default ALLOW_HT_OVERCLOCKING=1
 
+default ENABLE_APIC_EXT_ID=0
+default APIC_ID_OFFSET=0x10
+default LIFT_BSP_APIC_ID=0
+
 ##
 ## Build code to setup a generic IOAPIC
 ##
diff --git a/src/mainboard/agami/aruma/auto.c b/src/mainboard/agami/aruma/auto.c
index a522174932..48f83faadf 100644
--- a/src/mainboard/agami/aruma/auto.c
+++ b/src/mainboard/agami/aruma/auto.c
@@ -1,6 +1,4 @@
 #define ASSEMBLY 1
-#define ENABLE_APIC_EXT_ID 1
-#define APIC_ID_OFFSET 0x10
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
@@ -20,12 +18,10 @@
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
-#include "northbridge/amd/amdk8/incoherent_ht.c"
-#include "northbridge/amd/amdk8/cpu_rev.c"
+#include <cpu/amd/model_fxx_rev.h>
 #include "superio/winbond/w83627hf/w83627hf_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
-#include "cpu/amd/dualcore/dualcore.c"
 
 #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
 
@@ -93,6 +89,8 @@ static inline int spd_read_byte(unsigned device, unsigned address)
 
 #include "northbridge/amd/amdk8/raminit.c"
 #include "northbridge/amd/amdk8/coherent_ht.c"
+#include "northbridge/amd/amdk8/incoherent_ht.c"
+#include "cpu/amd/dualcore/dualcore.c"
 #include "sdram/generic_sdram.c"
 #include "resourcemap.c"
 
diff --git a/src/mainboard/agami/aruma/cmos.layout b/src/mainboard/agami/aruma/cmos.layout
index d0b05a9876..c1f3d75316 100644
--- a/src/mainboard/agami/aruma/cmos.layout
+++ b/src/mainboard/agami/aruma/cmos.layout
@@ -32,6 +32,7 @@ entries
 395          1       e       1        hw_scrubber
 396          1       e       1        interleave_chip_selects
 397          2       e       8        max_mem_clock
+399	     1	     e	     2	      dual_core
 400          1       e       1        power_on_after_fail
 412          4       e       6        debug_level
 416          4       e       7        boot_first
@@ -42,10 +43,6 @@ entries
 440          4       e       9        slow_cpu
 444          1       e       1        nmi
 445          1       e       1        iommu
-# These two can be used to control link speeds. byte 56
-449          1       e       1        amdk8_1GHz
-450          1       e       1        amd8131_800MHz
-#
 728        256       h       0        user_data
 984         16       h       0        check_sum
 # Reserve the extended AMD configuration registers
diff --git a/src/mainboard/agami/aruma/mainboard.c b/src/mainboard/agami/aruma/mainboard.c
index 8670939330..3a4a42e906 100644
--- a/src/mainboard/agami/aruma/mainboard.c
+++ b/src/mainboard/agami/aruma/mainboard.c
@@ -10,7 +10,7 @@
 
 #include <arch/io.h>
 #include "../../../northbridge/amd/amdk8/northbridge.h"
-#include "../../../northbridge/amd/amdk8/cpu_rev.c"
+#include <cpu/amd/model_fxx_rev.h>
 #include "chip.h"
 
 #include "pc80/mc146818rtc.h"