- First stab at running linuxbios without the old static device tree.

  Things are close but not quite there yet.


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

14 files changed, 15 insertions, 21 deletions

diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c
index e2c864f06a..c0915fc523 100644
--- a/src/cpu/amd/model_fxx/model_fxx_init.c
+++ b/src/cpu/amd/model_fxx/model_fxx_init.c
@@ -3,7 +3,6 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/device.h>
-#include <device/chip.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/src/cpu/amd/socket_940/chip.h b/src/cpu/amd/socket_940/chip.h
index 69002a27f1..7154dd1593 100644
--- a/src/cpu/amd/socket_940/chip.h
+++ b/src/cpu/amd/socket_940/chip.h
@@ -1,4 +1,4 @@
-extern struct chip_control cpu_amd_socket_940_control;
+extern struct chip_operations cpu_amd_socket_940_ops;
 
 struct cpu_amd_socket_940_config {
 };
diff --git a/src/cpu/amd/socket_940/socket_940.c b/src/cpu/amd/socket_940/socket_940.c
index 91bfc37ec8..d62834f4e7 100644
--- a/src/cpu/amd/socket_940/socket_940.c
+++ b/src/cpu/amd/socket_940/socket_940.c
@@ -1,7 +1,7 @@
-#include <device/chip.h>
+#include <device/device.h>
 #include "chip.h"
 
 
-struct chip_control cpu_amd_socket_940_control = {
+struct chip_operations cpu_amd_socket_940_ops = {
 	.name = "socket 940",
 };
diff --git a/src/cpu/intel/model_6xx/model_6xx_init.c b/src/cpu/intel/model_6xx/model_6xx_init.c
index 95be3b701c..43baf6e346 100644
--- a/src/cpu/intel/model_6xx/model_6xx_init.c
+++ b/src/cpu/intel/model_6xx/model_6xx_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/chip.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/src/cpu/intel/model_f0x/model_f0x_init.c b/src/cpu/intel/model_f0x/model_f0x_init.c
index ef64688625..55504a1049 100644
--- a/src/cpu/intel/model_f0x/model_f0x_init.c
+++ b/src/cpu/intel/model_f0x/model_f0x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/chip.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/src/cpu/intel/model_f1x/model_f1x_init.c b/src/cpu/intel/model_f1x/model_f1x_init.c
index 4045345d35..53cee4fe68 100644
--- a/src/cpu/intel/model_f1x/model_f1x_init.c
+++ b/src/cpu/intel/model_f1x/model_f1x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/chip.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/src/cpu/intel/model_f2x/model_f2x_init.c b/src/cpu/intel/model_f2x/model_f2x_init.c
index ecc454c974..db8dc184e3 100644
--- a/src/cpu/intel/model_f2x/model_f2x_init.c
+++ b/src/cpu/intel/model_f2x/model_f2x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/chip.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/src/cpu/intel/model_f3x/model_f3x_init.c b/src/cpu/intel/model_f3x/model_f3x_init.c
index ce5705b081..a89e7d1782 100644
--- a/src/cpu/intel/model_f3x/model_f3x_init.c
+++ b/src/cpu/intel/model_f3x/model_f3x_init.c
@@ -1,6 +1,5 @@
 #include <console/console.h>
 #include <device/device.h>
-#include <device/chip.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <string.h>
diff --git a/src/cpu/intel/slot_2/slot_2.c b/src/cpu/intel/slot_2/slot_2.c
index f47767b016..2d4fb9373c 100644
--- a/src/cpu/intel/slot_2/slot_2.c
+++ b/src/cpu/intel/slot_2/slot_2.c
@@ -1,4 +1,4 @@
-#include <device/chip.h>
+#include <device/device.h>
 #include "chip.h"
 
 
diff --git a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
index 73265eab1f..8d736bbc79 100644
--- a/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
+++ b/src/cpu/intel/socket_mPGA603/socket_mPGA603_400Mhz.c
@@ -1,4 +1,4 @@
-#include <device/chip.h>
+#include <device/device.h>
 #include "chip.h"
 
 
diff --git a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
index fd5dbe41d5..6dc325ce0b 100644
--- a/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
+++ b/src/cpu/intel/socket_mPGA604_533Mhz/socket_mPGA604_533Mhz.c
@@ -1,4 +1,4 @@
-#include <device/chip.h>
+#include <device/device.h>
 #include "chip.h"
 
 
diff --git a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c b/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c
index c638a93874..3d82276d05 100644
--- a/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c
+++ b/src/cpu/intel/socket_mPGA604_800Mhz/socket_mPGA604_800Mhz.c
@@ -1,4 +1,4 @@
-#include <device/chip.h>
+#include <device/device.h>
 #include "chip.h"
 
 
diff --git a/src/cpu/simple_init/simple_cpu_init.c b/src/cpu/simple_init/simple_cpu_init.c
index 39b5832971..02eb73f391 100644
--- a/src/cpu/simple_init/simple_cpu_init.c
+++ b/src/cpu/simple_init/simple_cpu_init.c
@@ -7,7 +7,7 @@
 #error "This Configuration does not support SMP"
 #endif
 
-void initialize_cpus(device_t root)
+void initialize_cpus(struct bus *cpu_bus)
 {
 	struct device_path cpu_path;
 	struct cpu_info *info;
@@ -19,7 +19,7 @@ void initialize_cpus(device_t root)
 	cpu_path.type = DEVICE_PATH_BOOT_CPU;
 
 	/* Find the device struct for the boot cpu */
-	info->cpu = alloc_find_dev(root->link[1], &cpu_path);
+	info->cpu = alloc_find_dev(bus, &cpu_path);
 	
 	/* Initialize the bootstrap processor */
 	cpu_initialize();
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 963b1cf729..db0cecbd06 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -234,12 +234,12 @@ void secondary_cpu_init(void)
 	stop_this_cpu();
 }
 
-static void initialize_other_cpus(device_t root)
+static void initialize_other_cpus(struct bus *cpu_bus)
 {
 	int old_active_count, active_count;
 	device_t cpu;
 	/* Loop through the cpus once getting them started */
-	for(cpu = root->link[1].children; cpu ; cpu = cpu->sibling) {
+	for(cpu = cpu_bus->children; cpu ; cpu = cpu->sibling) {
 		if (cpu->path.type != DEVICE_PATH_APIC) {
 			continue;
 		}
@@ -267,7 +267,7 @@ static void initialize_other_cpus(device_t root)
 		udelay(10);
 		active_count = atomic_read(&active_cpus);
 	}
-	for(cpu = root->link[1].children; cpu; cpu = cpu->sibling) {
+	for(cpu = cpu_bus->children; cpu; cpu = cpu->sibling) {
 		if (cpu->path.type != DEVICE_PATH_APIC) {
 			continue;
 		}
@@ -284,7 +284,7 @@ static void initialize_other_cpus(device_t root)
 #define initialize_other_cpus(root) do {} while(0)
 #endif /* CONFIG_SMP */
 
-void initialize_cpus(device_t root)
+void initialize_cpus(struct bus *cpu_bus)
 {
 	struct device_path cpu_path;
 	struct cpu_info *info;
@@ -305,12 +305,12 @@ void initialize_cpus(device_t root)
 #endif
 	
 	/* Find the device structure for the boot cpu */
-	info->cpu = alloc_find_dev(&root->link[1], &cpu_path);
+	info->cpu = alloc_find_dev(cpu_bus, &cpu_path);
 	
 	/* Initialize the bootstrap processor */
 	cpu_initialize();
 
 	/* Now initialize the rest of the cpus */
-	initialize_other_cpus(root);
+	initialize_other_cpus(cpu_bus);
 }