summaryrefslogtreecommitdiff
path: root/src/cpu/amd
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/amd')
-rw-r--r--src/cpu/amd/car/copy_and_run.c2
-rw-r--r--src/cpu/amd/car/post_cache_as_ram.c2
-rw-r--r--src/cpu/amd/model_fxx/init_cpus.c3
-rw-r--r--src/cpu/amd/model_fxx/processor_name.c6
4 files changed, 8 insertions, 5 deletions
diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c
index f495f6dbba..79cae6bc83 100644
--- a/src/cpu/amd/car/copy_and_run.c
+++ b/src/cpu/amd/car/copy_and_run.c
@@ -4,7 +4,7 @@
*/
#if CONFIG_CBFS == 1
-void cbfs_and_run_core(char*, unsigned ebp);
+void cbfs_and_run_core(const char*, unsigned ebp);
static void copy_and_run(void)
{
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index 9e988f02be..c42e8339cb 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -27,10 +27,10 @@ static void inline __attribute__((always_inline)) memcopy(void *dest, const voi
static void vErrata343(void)
{
+#ifdef BU_CFG2_MSR
msr_t msr;
unsigned int uiMask = 0xFFFFFFF7;
-#ifdef BU_CFG2_MSR
msr = rdmsr(BU_CFG2_MSR);
msr.hi &= uiMask; // set bit 35 to 0
wrmsr(BU_CFG2_MSR, msr);
diff --git a/src/cpu/amd/model_fxx/init_cpus.c b/src/cpu/amd/model_fxx/init_cpus.c
index 435167e94a..f3f2f582f5 100644
--- a/src/cpu/amd/model_fxx/init_cpus.c
+++ b/src/cpu/amd/model_fxx/init_cpus.c
@@ -347,7 +347,8 @@ static unsigned init_cpus(unsigned cpu_init_detectedx)
lapic_write(LAPIC_MSG_REG, (apicid<<24) | 0x44); // bsp can not check it before stop_this_cpu
set_init_ram_access();
#if CONFIG_MEM_TRAIN_SEQ == 1
- train_ram_on_node(id.nodeid, id.coreid, sysinfo, STOP_CAR_AND_CPU);
+ train_ram_on_node(id.nodeid, id.coreid, sysinfo,
+ (unsigned) STOP_CAR_AND_CPU);
#endif
STOP_CAR_AND_CPU();
diff --git a/src/cpu/amd/model_fxx/processor_name.c b/src/cpu/amd/model_fxx/processor_name.c
index cab92f73e4..f5372cdf4a 100644
--- a/src/cpu/amd/model_fxx/processor_name.c
+++ b/src/cpu/amd/model_fxx/processor_name.c
@@ -143,7 +143,7 @@ static inline unsigned int cpuid_ecx(unsigned int op)
return ecx;
}
-static inline void strcpy(char *dst, char *src)
+static inline void strcpy(char *dst, const char *src)
{
while (*src) *dst++ = *src++;
}
@@ -151,7 +151,9 @@ static inline void strcpy(char *dst, char *src)
int init_processor_name(void)
{
+#if CONFIG_K8_REV_F_SUPPORT == 0
u32 EightBitBrandId;
+#endif
u32 BrandId;
u32 BrandTableIndex;
u32 NN;
@@ -159,7 +161,7 @@ int init_processor_name(void)
msr_t progmsr;
int i;
- char *processor_name_string=NULL;
+ const char *processor_name_string=NULL;
char program_string[48];
unsigned int *program_values = (unsigned int *)program_string;