It builds!

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

2 files changed, 10 insertions, 22 deletions

diff --git a/src/mainboard/via/epia/Config.lb b/src/mainboard/via/epia/Config.lb
index 6d30820105..c4527cec17 100644
--- a/src/mainboard/via/epia/Config.lb
+++ b/src/mainboard/via/epia/Config.lb
@@ -14,6 +14,7 @@ uses PAYLOAD_SIZE
 uses _ROMBASE
 uses XIP_ROM_SIZE
 uses XIP_ROM_BASE
+uses HAVE_MP_TABLE
 
 ## ROM_SIZE is the size of boot ROM that this board will use.
 default ROM_SIZE  524288
@@ -28,6 +29,11 @@ default ROM_SIZE  524288
 option HAVE_FALLBACK_BOOT=1
 
 ##
+## no MP table
+##
+option HAVE_MP_TABLE=0
+
+##
 ## Build code to reset the motherboard from linuxBIOS
 ##
 option HAVE_HARD_RESET=1
@@ -37,12 +43,7 @@ option HAVE_HARD_RESET=1
 ##
 option HAVE_PIRQ_TABLE=1
 option IRQ_SLOT_COUNT=7
-
-##
-## Build code to export an x86 MP table
-## Useful for specifying IRQ routing values
-##
-option HAVE_MP_TABLE=1
+object irq_tables.o
 
 ##
 ## Build code to export a CMOS option table
@@ -50,18 +51,6 @@ option HAVE_MP_TABLE=1
 option HAVE_OPTION_TABLE=1
 
 ##
-## Build code for SMP support
-## Only worry about 2 micro processors
-##
-option CONFIG_SMP=1
-option CONFIG_MAX_CPUS=2
-
-##
-## Build code to setup a generic IOAPIC
-##
-option CONFIG_IOAPIC=1
-
-##
 ## Clean up the motherboard id strings
 ##
 option MAINBOARD_PART_NUMBER="HDAMA"
@@ -238,7 +227,7 @@ northbridge via/vt8601 "vt8601"
 	end
 end
 
-cpu p5 "cpu0"
+cpu p6 "cpu0"
 	
 end
 
diff --git a/src/mainboard/via/epia/mainboard.c b/src/mainboard/via/epia/mainboard.c
index 6790aaca1b..554c0d3336 100644
--- a/src/mainboard/via/epia/mainboard.c
+++ b/src/mainboard/via/epia/mainboard.c
@@ -7,7 +7,6 @@
 
 #include <arch/io.h>
 #include <device/chip.h>
-#include "../../../northbridge/amd/amdk8/northbridge.h"
 #include "chip.h"
 
 
@@ -16,7 +15,7 @@ static struct device_operations mainboard_operations = {
 	.set_resources    = root_dev_set_resources,
 	.enable_resources = enable_childrens_resources,
 	.init             = 0,
-	.scan_bus         = vt8_scan_root_bus,
+	.scan_bus         = pci_scan_bridge,
 	.enable           = 0,
 };
 
@@ -32,6 +31,6 @@ static void enumerate(struct chip *chip)
 }
 struct chip_control mainboard_via_epia_control = {
 	.enumerate = enumerate, 
-	.name      = "Arima HDAMA mainboard ",
+	.name      = "VIA EPIA mainboard ",
 };