From 88a67f0cc9d0bec08a6cfa5b1c3f4198fd98ab4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Thu, 12 Dec 2013 12:27:53 +0200
Subject: AMD boards (non-AGESA): Cleanup earlymtrr.c includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I5f4bf9dbaf3470dc83d3e980bb6cab10801e15c1
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4523
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Bruce Griffith <Bruce.Griffith@se-eng.com>
---
 src/cpu/x86/mtrr/earlymtrr.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/cpu/x86/mtrr')

diff --git a/src/cpu/x86/mtrr/earlymtrr.c b/src/cpu/x86/mtrr/earlymtrr.c
index f16da279c6..36f94cdf05 100644
--- a/src/cpu/x86/mtrr/earlymtrr.c
+++ b/src/cpu/x86/mtrr/earlymtrr.c
@@ -1,13 +1,12 @@
-#ifndef EARLYMTRR_C
-#define EARLYMTRR_C
 #include <cpu/x86/cache.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
-#include <cpu/amd/mtrr.h>
 
-static void set_var_mtrr(
+#ifdef __ROMCC__
+static
+#endif
+void set_var_mtrr(
 	unsigned reg, unsigned base, unsigned size, unsigned type)
-
 {
 	/* Bit Bit 32-35 of MTRRphysMask should be set to 1 */
 	/* FIXME: It only support 4G less range */
@@ -104,5 +103,3 @@ static inline int early_mtrr_init_detected(void)
 	return msr.lo & MTRRdefTypeEn;
 }
 #endif
-
-#endif /* EARLYMTRR_C */
-- 
cgit v1.2.3