summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2017-06-02 12:13:14 -0500
committerAaron Durbin <adurbin@chromium.org>2017-06-05 00:21:31 +0200
commitd86e0e6638062b5d80f5d438f0741dd735734ad4 (patch)
tree4262589b86694170458d9e735fa401b2312b60f0 /src
parent74e1fb0b1a4e7a74a27216c84a3ede2a2457ba1c (diff)
downloadcoreboot-d86e0e6638062b5d80f5d438f0741dd735734ad4.tar.xz
cpu/x86/mtrr: don't guard function declarations
set_var_mtrr() and get_free_var_mtrr() don't need to be guarded against various stages. It just complicates code which lives in a compilation unit that is compiled for multiple stages by needing to reflect the same guarding. Instead, just drop the declaration guard. earlymtrr.c is still just compiled for earlier stages, but if needed it's easy to move to a mtrr_util.c that is compiled for all stages. Change-Id: Id6be6f613771380d5ce803eacf1a0c8b230790b6 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://review.coreboot.org/20018 Reviewed-by: Furquan Shaikh <furquan@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/cpu/x86/mtrr.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h
index 36b5c712d9..188cd17a19 100644
--- a/src/include/cpu/x86/mtrr.h
+++ b/src/include/cpu/x86/mtrr.h
@@ -86,13 +86,10 @@ void x86_mtrr_check(void);
void mtrr_use_temp_range(uintptr_t begin, size_t size, int type);
#endif
-#if !defined(__ASSEMBLER__) && defined(__PRE_RAM__) && !defined(__ROMCC__)
+#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
void set_var_mtrr(unsigned int reg, unsigned int base, unsigned int size,
unsigned int type);
int get_free_var_mtrr(void);
-#endif
-
-#if !defined(__ASSEMBLER__) && !defined(__ROMCC__)
/* fms: find most significant bit set, stolen from Linux Kernel Source. */
static inline unsigned int fms(unsigned int x)