make early_mtrr_init() invisible for cache as ram targets as it breaks them.
Fix up converted mainboards that still used early_mtrr_init()
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5678 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/cpu/x86/mtrr/earlymtrr.c b/src/cpu/x86/mtrr/earlymtrr.c
index 1cbc544..72c471e 100644
--- a/src/cpu/x86/mtrr/earlymtrr.c
+++ b/src/cpu/x86/mtrr/earlymtrr.c
@@ -62,6 +62,7 @@
enable_cache();
}
+#if !defined(CONFIG_USE_DCACHE_RAM) || (CONFIG_USE_DCACHE_RAM == 0)
/* the fixed and variable MTTRs are power-up with random values,
* clear them to MTRR_TYPE_UNCACHEABLE for safty.
*/
@@ -118,6 +119,7 @@
do_early_mtrr_init(mtrr_msrs);
enable_cache();
}
+#endif
static inline int early_mtrr_init_detected(void)
{
diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c
index cdf4ad3..edca90b 100644
--- a/src/mainboard/bcom/winnetp680/romstage.c
+++ b/src/mainboard/bcom/winnetp680/romstage.c
@@ -95,11 +95,6 @@
enable_smbus();
smbus_fixup(&ctrl);
- if (bist == 0) {
- print_debug("doing early_mtrr\n");
- early_mtrr_init();
- }
-
/* Halt if there was a built-in self test failure. */
report_bist_failure(bist);
diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c
index eb7f294..b98103b 100644
--- a/src/mainboard/via/epia-cn/romstage.c
+++ b/src/mainboard/via/epia-cn/romstage.c
@@ -93,11 +93,6 @@
enable_smbus();
smbus_fixup(&ctrl);
- if (bist == 0) {
- print_debug("doing early_mtrr\n");
- early_mtrr_init();
- }
-
/* Halt if there was a built-in self test failure. */
report_bist_failure(bist);
diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c
index 32a853c..90913e1 100644
--- a/src/mainboard/via/pc2500e/romstage.c
+++ b/src/mainboard/via/pc2500e/romstage.c
@@ -67,9 +67,6 @@
enable_smbus();
smbus_fixup(&ctrl);
- if (bist == 0)
- early_mtrr_init();
-
/* Halt if there was a built-in self test failure. */
report_bist_failure(bist);