From de3206a7bebce99f11e753164cc4d46357bba96a Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 22 Feb 2010 06:09:43 +0000 Subject: This is a general cleanup patch - drop include/part and move files to include/ - get rid lots of warnings - make resource allocator happy with w83627thg - trivial cbmem resume fix - fix payload and log level settings in abuild - fix kontron mptable for virtual wire mode - drop some dead includes and dead code. Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5136 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/cpu/cpu.h | 2 ++ src/include/cpu/x86/bist.h | 2 +- src/include/cpu/x86/lapic.h | 3 ++- src/include/cpu/x86/tsc.h | 3 --- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/include/cpu') diff --git a/src/include/cpu/cpu.h b/src/include/cpu/cpu.h index 053e319d17..b64fd3ce2c 100644 --- a/src/include/cpu/cpu.h +++ b/src/include/cpu/cpu.h @@ -17,6 +17,8 @@ void secondary_cpu_init(void); #if CONFIG_HAVE_SMI_HANDLER void smm_init(void); +void smm_lock(void); +void smm_setup_structures(void *gnvs, void *tcg, void *smi1); #endif #define __cpu_driver __attribute__ ((used,__section__(".rodata.cpu_driver"))) diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h index 21ea69e67b..c6cd7349fb 100644 --- a/src/include/cpu/x86/bist.h +++ b/src/include/cpu/x86/bist.h @@ -1,7 +1,7 @@ #ifndef CPU_X86_BIST_H #define CPU_X86_BIST_H -static void report_bist_failure(unsigned long bist) +static void report_bist_failure(u32 bist) { if (bist != 0) { #if CONFIG_USE_PRINTK_IN_CAR diff --git a/src/include/cpu/x86/lapic.h b/src/include/cpu/x86/lapic.h index 2b77177bbf..de99deebfe 100644 --- a/src/include/cpu/x86/lapic.h +++ b/src/include/cpu/x86/lapic.h @@ -60,12 +60,13 @@ static inline __attribute__((always_inline)) unsigned long lapicid(void) */ static inline __attribute__((always_inline)) void stop_this_cpu(void) { - /* Called by an AP when it is ready to halt and wait for a new task */ for(;;) { hlt(); } } +#else +void stop_this_cpu(void); #endif #if ! defined (__ROMCC__) && !defined(__PRE_RAM__) diff --git a/src/include/cpu/x86/tsc.h b/src/include/cpu/x86/tsc.h index 9370adfe00..9177d53818 100644 --- a/src/include/cpu/x86/tsc.h +++ b/src/include/cpu/x86/tsc.h @@ -24,9 +24,6 @@ static inline unsigned long long rdtscll(void) asm volatile ("rdtsc" : "=A" (val)); return val; } - -void init_timer(void); #endif - #endif /* CPU_X86_TSC_H */ -- cgit v1.2.3