From patchwork Sat Sep 25 12:16:08 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: Drop <cpu/amd/mtrr.h> #include from Intel CPUs
Date: Sat, 25 Sep 2010 12:16:08 -0000
From: Uwe Hermann <uwe@hermann-uwe.de>
X-Patchwork-Id: 1975
Message-Id: <20100925121607.GL3256@greenwood>
To: coreboot@coreboot.org

See patch.


Uwe.
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>


Drop <cpu/amd/mtrr.h> #include from Intel CPUs.

Three CAR implementations on Intel CPUs include <cpu/amd/mtrr.h>, which
is obviously wrong, so drop the #includes. None of their #defines are used
in the Intel code.

Build-tested with two of the affected boards.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>

Index: src/cpu/intel/model_6ex/cache_as_ram.inc
===================================================================
--- src/cpu/intel/model_6ex/cache_as_ram.inc	(Revision 5839)
+++ src/cpu/intel/model_6ex/cache_as_ram.inc	(Arbeitskopie)
@@ -23,7 +23,6 @@
 
 #include <cpu/x86/stack.h>
 #include <cpu/x86/mtrr.h>
-#include <cpu/amd/mtrr.h>
 
 	/* Save the BIST result */
 	movl    %eax, %ebp
Index: src/cpu/intel/model_106cx/cache_as_ram.inc
===================================================================
--- src/cpu/intel/model_106cx/cache_as_ram.inc	(Revision 5839)
+++ src/cpu/intel/model_106cx/cache_as_ram.inc	(Arbeitskopie)
@@ -23,7 +23,6 @@
 
 #include <cpu/x86/stack.h>
 #include <cpu/x86/mtrr.h>
-#include <cpu/amd/mtrr.h>
 
 	/* Save the BIST result */
 	movl    %eax, %ebp
Index: src/cpu/intel/model_6fx/cache_as_ram.inc
===================================================================
--- src/cpu/intel/model_6fx/cache_as_ram.inc	(Revision 5839)
+++ src/cpu/intel/model_6fx/cache_as_ram.inc	(Arbeitskopie)
@@ -23,7 +23,6 @@
 
 #include <cpu/x86/stack.h>
 #include <cpu/x86/mtrr.h>
-#include <cpu/amd/mtrr.h>
 
 	/* Save the BIST result */
 	movl    %eax, %ebp