diff options
author | Myles Watson <mylesgw@gmail.com> | 2009-10-30 02:08:07 +0000 |
---|---|---|
committer | Myles Watson <mylesgw@gmail.com> | 2009-10-30 02:08:07 +0000 |
commit | 7943fe61df9e72721a8ceddb0120e4826552d5f9 (patch) | |
tree | 21073df83a4ff79a90ddb6fc8ed534a5ccde11aa /src/cpu | |
parent | 8f6354b6d3d00a7041f3c770569e797da74acd04 (diff) | |
download | coreboot-staging-7943fe61df9e72721a8ceddb0120e4826552d5f9.zip coreboot-staging-7943fe61df9e72721a8ceddb0120e4826552d5f9.tar.gz |
Remove some warnings from the tyan s2895.
Declare superio functions to be static and remove duplicates.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4890 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/amd/model_10xxx/processor_name.c | 1 | ||||
-rw-r--r-- | src/cpu/amd/model_fxx/model_fxx_init.c | 6 | ||||
-rw-r--r-- | src/cpu/amd/model_fxx/processor_name.c | 34 | ||||
-rw-r--r-- | src/cpu/x86/lapic/lapic_cpu_init.c | 10 |
4 files changed, 5 insertions, 46 deletions
diff --git a/src/cpu/amd/model_10xxx/processor_name.c b/src/cpu/amd/model_10xxx/processor_name.c index 5429aae..65f9776 100644 --- a/src/cpu/amd/model_10xxx/processor_name.c +++ b/src/cpu/amd/model_10xxx/processor_name.c @@ -29,6 +29,7 @@ #include <string.h> #include <cpu/x86/msr.h> #include <cpu/cpu.h> +#include <cpu/amd/model_10xxx_rev.h> extern void wrmsr_amd(u32 index, msr_t msr); diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index 5051dfd..2d72618 100644 --- a/src/cpu/amd/model_fxx/model_fxx_init.c +++ b/src/cpu/amd/model_fxx/model_fxx_init.c @@ -30,6 +30,7 @@ #include <cpu/amd/model_fxx_msr.h> +#if CONFIG_WAIT_BEFORE_CPUS_INIT void cpus_ready_for_init(void) { #if CONFIG_MEM_TRAIN_SEQ == 1 @@ -38,7 +39,7 @@ void cpus_ready_for_init(void) wait_all_core0_mem_trained(sysinfox); #endif } - +#endif #if CONFIG_K8_REV_F_SUPPORT == 0 int is_e0_later_in_bsp(int nodeid) @@ -463,13 +464,12 @@ static inline void k8_errata(void) } extern void model_fxx_update_microcode(unsigned cpu_deviceid); -int init_processor_name(void); #if CONFIG_USBDEBUG_DIRECT static unsigned ehci_debug_addr; #endif -void model_fxx_init(device_t dev) +static void model_fxx_init(device_t dev) { unsigned long i; msr_t msr; diff --git a/src/cpu/amd/model_fxx/processor_name.c b/src/cpu/amd/model_fxx/processor_name.c index 9f7a84d..ce276ff 100644 --- a/src/cpu/amd/model_fxx/processor_name.c +++ b/src/cpu/amd/model_fxx/processor_name.c @@ -35,6 +35,7 @@ #include <console/console.h> #include <string.h> #include <cpu/x86/msr.h> +#include <cpu/amd/model_fxx_rev.h> /* The maximum length of CPU names is 48 bytes, including the final NULL byte. * If you change these names your BIOS will _NOT_ pass the AMD validation and @@ -110,39 +111,6 @@ static inline void wrmsr_amd(unsigned index, msr_t msr) ); } -static inline unsigned int cpuid_eax(unsigned int op) -{ - unsigned int eax; - - __asm__("cpuid" - : "=a" (eax) - : "0" (op) - : "ebx", "ecx", "edx"); - return eax; -} - -static inline unsigned int cpuid_ebx(unsigned int op) -{ - unsigned int eax, ebx; - - __asm__("cpuid" - : "=a" (eax), "=b" (ebx) - : "0" (op) - : "ecx", "edx" ); - return ebx; -} - -static inline unsigned int cpuid_ecx(unsigned int op) -{ - unsigned int eax, ecx; - - __asm__("cpuid" - : "=a" (eax), "=c" (ecx) - : "0" (op) - : "ebx", "edx" ); - return ecx; -} - static inline void strcpy(char *dst, const char *src) { while (*src) *dst++ = *src++; diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index 4bf5468..b27fb2c 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -448,16 +448,6 @@ static void wait_other_cpus_stop(struct bus *cpu_bus) #define initialize_other_cpus(root) do {} while(0) #endif /* CONFIG_SMP */ -#if CONFIG_WAIT_BEFORE_CPUS_INIT==0 - #define cpus_ready_for_init() do {} while(0) -#else - void cpus_ready_for_init(void); -#endif - -#if CONFIG_HAVE_SMI_HANDLER -void smm_init(void); -#endif - void initialize_cpus(struct bus *cpu_bus) { struct device_path cpu_path; |