summaryrefslogtreecommitdiff
path: root/src/include/cpu/amd
diff options
context:
space:
mode:
authorefdesign98 <efdesign98@gmail.com>2011-08-04 16:18:16 -0600
committerPatrick Georgi <patrick@georgi-clan.de>2011-09-12 14:55:24 +0200
commit78834b794d82c91d2745f8de0e4d3bb14ee6187d (patch)
treedca9470ad32ececbfbd55e1c6d45a7b6de9b84ef /src/include/cpu/amd
parent03169d3e1c03e76670ff7a07de7ee4fc6f601d3a (diff)
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 <frank.vibrans@amd.com> Signed-off-by: efdesign98 <efdesign98@gmail.com> Reviewed-on: http://review.coreboot.org/133 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/include/cpu/amd')
-rw-r--r--src/include/cpu/amd/amdfam14.h2
-rw-r--r--src/include/cpu/amd/mtrr.h8
2 files changed, 8 insertions, 2 deletions
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)