3 files changed, 12 insertions, 27 deletions
diff --git a/src/mainboard/technologic/ts5300/Config.lb b/src/mainboard/technologic/ts5300/Config.lb
index 4168465611..d0ff85f1df 100644
--- a/src/mainboard/technologic/ts5300/Config.lb
+++ b/src/mainboard/technologic/ts5300/Config.lb
@@ -210,22 +210,13 @@ mainboardinit ./auto.inc
 dir /pc80
 config chip.h
 
-northbridge amd/sc520 "elan_nb"
-	southbridge amd/sc520 "elan_sb"
+chip northbridge/amd/sc520
+	chip southbridge amd/sc520
 		register "enable_usb" = "0"
 		register "enable_native_ide" = "1"
 		register "enable_com_ports" = "1"
 		register "enable_keyboard" = "0"
 		register "enable_nvram" = "1"
 	end
+	chip cpu/amd/sc520
 end
-
-cpu p6 "cpu0"
-	
-end
-
-##
-## Include the old serial code for those few places that still need it.
-##
-mainboardinit pc80/serial.inc
-mainboardinit arch/i386/lib/console.inc
diff --git a/src/mainboard/technologic/ts5300/chip.h b/src/mainboard/technologic/ts5300/chip.h
index 77530593b5..a57e508e11 100644
--- a/src/mainboard/technologic/ts5300/chip.h
+++ b/src/mainboard/technologic/ts5300/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_control mainboard_technologic_ts5300_control;
+extern struct chip_operations mainboard_technologic_ts5300_control;
 
 struct mainboard_technologic_ts5300_config {
 	int nothing;
diff --git a/src/mainboard/technologic/ts5300/mainboard.c b/src/mainboard/technologic/ts5300/mainboard.c
index 88cf9861c4..38b6a4ca82 100644
--- a/src/mainboard/technologic/ts5300/mainboard.c
+++ b/src/mainboard/technologic/ts5300/mainboard.c
@@ -20,24 +20,18 @@ mainboard_scan_bus(device_t root, int maxbus)
 static struct device_operations mainboard_operations = {
 	.read_resources   = root_dev_read_resources,
 	.set_resources    = root_dev_set_resources,
-	.enable_resources = enable_childrens_resources,
-	.init             = 0,
+	.enable_resources = root_dev_enable_resources,
+	.init             = root_dev_init,
 	.scan_bus         = mainboard_scan_bus,
-	.enable           = 0,
 };
 
-static void enumerate(struct chip *chip)
+static void enable_dev(device_t dev)
 {
-	struct chip *child;
-	dev_root.ops = &mainboard_operations;
-	chip->dev = &dev_root;
-	chip->bus = 0;
-	for(child = chip->children; child; child = child->next) {
-		child->bus = &dev_root.link[0];
-	}
+	dev->ops = &mainbaord_operations;
 }
-struct chip_control mainboard_technologic_ts5300_control = {
-	.enumerate = enumerate, 
-	.name      = "Technologic Systems TS5300 mainboard ",
+
+struct chip_operations mainboard_technologic_ts5300_control = {
+	.enable_dev = enable_dev, 
+	.name       = "Technologic Systems TS5300 mainboard ",
 };