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

login
register
about
Submitter Uwe Hermann
Date 2010-09-25 12:16:08
Message ID <20100925121607.GL3256@greenwood>
Download mbox | patch
Permalink /patch/1975/
State Accepted
Commit r5840
Headers show

Comments

Uwe Hermann - 2010-09-25 12:16:08
See patch.


Uwe.
Patrick Georgi - 2010-09-25 12:22:09
Am 25.09.2010 14:16, schrieb Uwe Hermann:
> See patch.
Obvious enough, thanks!

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

Patch

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