Miscellaneous AMD F14 warning fixes

[coreboot.git] / src / include / cpu / amd / mtrr.h

diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h
index 6e25aa3e5e7c815f8834e7be55e8132679f6b9c6..3637dd937d0728a99e2a6bfb79ff00abed770377 100644 (file)
--- a/src/include/cpu/amd/mtrr.h
+++ b/src/include/cpu/amd/mtrr.h
@@ -27,13 +27,17 @@
 
 #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)
 
-#if !defined(__PRE_RAM__) && !defined(ASSEMBLY)
+#if !defined(__PRE_RAM__) && !defined(__ASSEMBLER__)
 void amd_setup_mtrrs(void);
 #endif