Patch set updated for coreboot: 1395308 Bootblock does not need a unique boot_cpu()

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/447

-gerrit

commit 13953087baa0032722a55216e02ddb568e3821a0
Author: Kyösti Mälkki 
Date:   Tue Nov 22 19:44:45 2011 +0200

Bootblock does not need a unique boot_cpu()

Detection of a CPU being a BSP CPU is not dependent of the existence
    of northbridge and/or southbridge init code in the bootblock.

Even if CONFIG_LOGICAL_CPUS==0, boot_cpu() can get executed on an AP
    CPU of a hyper-threading CPU and needs to return actual BSP bit from
    MSR.

Change-Id: I9187f954bb357ba1dbd459cfe11cc96cb7567968
    Signed-off-by: Kyösti Mälkki 
---
 src/arch/x86/include/bootblock_common.h |    5 -----
 src/cpu/x86/lapic/boot_cpu.c            |    5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/arch/x86/include/bootblock_common.h b/src/arch/x86/include/bootblock_common.h
index 4c4a092..bd19682 100644
--- a/src/arch/x86/include/bootblock_common.h
+++ b/src/arch/x86/include/bootblock_common.h
@@ -1,9 +1,4 @@
-#if CONFIG_LOGICAL_CPUS && \
- (defined(CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT) || defined(CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT))
 #include <cpu/x86/lapic/boot_cpu.c>
-#else
-#define boot_cpu(x) 1
-#endif

#ifdef CONFIG_BOOTBLOCK_CPU_INIT
 #include CONFIG_BOOTBLOCK_CPU_INIT
diff --git a/src/cpu/x86/lapic/boot_cpu.c b/src/cpu/x86/lapic/boot_cpu.c
index bca73e1..87418d0 100644
--- a/src/cpu/x86/lapic/boot_cpu.c
+++ b/src/cpu/x86/lapic/boot_cpu.c
@@ -1,5 +1,6 @@
 #include <cpu/x86/msr.h>

+#if CONFIG_SMP
 static int boot_cpu(void)
 {
    int bsp;
@@ -8,3 +9,7 @@ static int boot_cpu(void)
    bsp = !!(msr.lo & (1 << 8));
    return bsp;
 }
+#else
+#define boot_cpu(x) 1
+#endif
+