drop use of MAX_PHYSICAL_CPUS and MAX_CPUS where not needed

Change-Id: Idf875ddec417e627f1e72a6d834860e7fd324a50
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/760
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 2e2bb0632c3883fbea87315964089aa96d047bbc..ed9940c4acf1b2c78145dee7b88a3ae79f08b3b3 100644 (file)
--- 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 0ecec4753d6276dcee26bfd015ec58856c9f4aad..060720c8985cde731a66f72432872e2cf8b7c241 100644 (file)
--- 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