diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/ppc/mpc74xx/Config.lb | 2 | ||||
| -rw-r--r-- | src/cpu/ppc/ppc4xx/Config.lb | 1 | ||||
| -rw-r--r-- | src/cpu/ppc/ppc7xx/Config.lb | 2 | ||||
| -rw-r--r-- | src/cpu/simple_init/simple_cpu_init.c | 9 | ||||
| -rw-r--r-- | src/cpu/x86/lapic/lapic_cpu_init.c | 3 |
5 files changed, 12 insertions, 5 deletions
diff --git a/src/cpu/ppc/mpc74xx/Config.lb b/src/cpu/ppc/mpc74xx/Config.lb index f9d5b407d4..8665fa35c0 100644 --- a/src/cpu/ppc/mpc74xx/Config.lb +++ b/src/cpu/ppc/mpc74xx/Config.lb @@ -19,3 +19,5 @@ initinclude "FAMILY_INIT" cpu/ppc/mpc74xx/mpc74xx.inc object cache.S initobject cache.S +dir /cpu/simple_init + diff --git a/src/cpu/ppc/ppc4xx/Config.lb b/src/cpu/ppc/ppc4xx/Config.lb index e9e45c5aa3..353c25df2c 100644 --- a/src/cpu/ppc/ppc4xx/Config.lb +++ b/src/cpu/ppc/ppc4xx/Config.lb @@ -24,3 +24,4 @@ object mem.o object clock.o object cache.S +dir /cpu/simple_init diff --git a/src/cpu/ppc/ppc7xx/Config.lb b/src/cpu/ppc/ppc7xx/Config.lb index ec606552f1..dc2c025511 100644 --- a/src/cpu/ppc/ppc7xx/Config.lb +++ b/src/cpu/ppc/ppc7xx/Config.lb @@ -21,3 +21,5 @@ object clock.o object cache.S initobject clock.o initobject cache.S + +dir /cpu/simple_init diff --git a/src/cpu/simple_init/simple_cpu_init.c b/src/cpu/simple_init/simple_cpu_init.c index 02eb73f391..e0a80c6820 100644 --- a/src/cpu/simple_init/simple_cpu_init.c +++ b/src/cpu/simple_init/simple_cpu_init.c @@ -1,7 +1,7 @@ -#include <linux/console.h> +#include <console/console.h> #include <device/device.h> #include <device/path.h> -#include <device/cpu.h> +#include <cpu/cpu.h> #if CONFIG_SMP #error "This Configuration does not support SMP" @@ -16,10 +16,11 @@ void initialize_cpus(struct bus *cpu_bus) info = cpu_info(); /* Get the device path of the boot cpu */ - cpu_path.type = DEVICE_PATH_BOOT_CPU; + cpu_path.type = DEVICE_PATH_CPU; + cpu_path.u.cpu.id = 0; /* Find the device struct for the boot cpu */ - info->cpu = alloc_find_dev(bus, &cpu_path); + info->cpu = alloc_find_dev(cpu_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 5e7b7934c7..b477d1f0cc 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -301,7 +301,8 @@ void initialize_cpus(struct bus *cpu_bus) cpu_path.u.apic.apic_id = lapicid(); #else /* Get the device path of the boot cpu */ - cpu_path.type = DEVICE_PATH_DEFAULT_CPU; + cpu_path.type = DEVICE_PATH_CPU; + cpu_path.u.cpu.id = 0; #endif /* Find the device structure for the boot cpu */ |