From 78834b794d82c91d2745f8de0e4d3bb14ee6187d Mon Sep 17 00:00:00 2001 From: efdesign98 Date: Thu, 4 Aug 2011 16:18:16 -0600 Subject: Miscellaneous AMD F14 warning fixes This commit adds in some more fixes to AMD F14 compile warnings. The change in the mtrr.c file is in prep- aration for changes yet to com, but it is currently innocuous. Change-Id: I6b204fe0af16a97d982f46f0dfeaccc4b8eb883e Signed-off-by: Frank Vibrans Signed-off-by: efdesign98 Reviewed-on: http://review.coreboot.org/133 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/include/cpu/amd/amdfam14.h | 2 ++ src/include/cpu/amd/mtrr.h | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/include/cpu/amd') diff --git a/src/include/cpu/amd/amdfam14.h b/src/include/cpu/amd/amdfam14.h index c4b7e6d143..a732219a29 100644 --- a/src/include/cpu/amd/amdfam14.h +++ b/src/include/cpu/amd/amdfam14.h @@ -42,5 +42,7 @@ void wait_all_other_cores_started(u32 bsp_apicid); void wait_all_aps_started(u32 bsp_apicid); void allow_all_aps_stop(u32 bsp_apicid); #endif +void get_bus_conf(void); +u32 get_initial_apicid(void); #endif /* CPU_AMD_FAM14_H */ diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h index c0d6b51c36..3637dd937d 100644 --- a/src/include/cpu/amd/mtrr.h +++ b/src/include/cpu/amd/mtrr.h @@ -27,8 +27,12 @@ #define TOP_MEM_MSR 0xC001001A #define TOP_MEM2_MSR 0xC001001D -#define TOP_MEM TOP_MEM_MSR -#define TOP_MEM2 TOP_MEM2_MSR +#ifndef TOP_MEM + #define TOP_MEM TOP_MEM_MSR +#endif +#ifndef TOP_MEM2 + #define TOP_MEM2 TOP_MEM2_MSR +#endif #define TOP_MEM_MASK 0x007fffff #define TOP_MEM_MASK_KB (TOP_MEM_MASK >> 10) -- cgit v1.2.3