summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c6
-rw-r--r--src/cpu/x86/pae/Makefile.inc2
2 files changed, 1 insertions, 7 deletions
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 2e2bb0632c..ed9940c4ac 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -384,9 +384,7 @@ void secondary_cpu_init(void)
{
atomic_inc(&active_cpus);
#if CONFIG_SERIAL_CPU_INIT == 1
- #if CONFIG_MAX_CPUS>2
spin_lock(&start_cpu_lock);
- #endif
#endif
#ifdef __SSE3__
@@ -401,9 +399,7 @@ void secondary_cpu_init(void)
#endif
cpu_initialize();
#if CONFIG_SERIAL_CPU_INIT == 1
- #if CONFIG_MAX_CPUS>2
spin_unlock(&start_cpu_lock);
- #endif
#endif
atomic_dec(&active_cpus);
@@ -440,9 +436,7 @@ static void start_other_cpus(struct bus *cpu_bus, device_t bsp_cpu)
cpu->path.apic.apic_id);
}
#if CONFIG_SERIAL_CPU_INIT == 1
- #if CONFIG_MAX_CPUS>2
udelay(10);
- #endif
#endif
}
diff --git a/src/cpu/x86/pae/Makefile.inc b/src/cpu/x86/pae/Makefile.inc
index 0ecec4753d..060720c898 100644
--- a/src/cpu/x86/pae/Makefile.inc
+++ b/src/cpu/x86/pae/Makefile.inc
@@ -1 +1 @@
-ramstage-y += pgtbl.c
+ramstage-$(CONFIG_CPU_AMD_MODEL_FXX) += pgtbl.c