From 7943fe61df9e72721a8ceddb0120e4826552d5f9 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Fri, 30 Oct 2009 02:08:07 +0000 Subject: Remove some warnings from the tyan s2895. Declare superio functions to be static and remove duplicates. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4890 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/model_fxx/model_fxx_init.c | 6 +++--- src/cpu/amd/model_fxx/processor_name.c | 34 +--------------------------------- 2 files changed, 4 insertions(+), 36 deletions(-) (limited to 'src/cpu/amd/model_fxx') diff --git a/src/cpu/amd/model_fxx/model_fxx_init.c b/src/cpu/amd/model_fxx/model_fxx_init.c index 5051dfd7b0..2d72618448 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 +#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 9f7a84df15..ce276ffcca 100644 --- a/src/cpu/amd/model_fxx/processor_name.c +++ b/src/cpu/amd/model_fxx/processor_name.c @@ -35,6 +35,7 @@ #include #include #include +#include /* 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++; -- cgit v1.2.3