commit 6ca7636c8f52560e732cdd5b1c7829cda5aa2bde
author arch import user (historical) <svn@openbios.org> Wed Jul 06 17:17:25 2005 +0000
committer arch import user (historical) <svn@openbios.org> Wed Jul 06 17:17:25 2005 +0000
tree cc45ae7c4dea6e2c5338f52b4314106bf07023be
parent b2ed53dd5669c2c3839633bd2b3b4af709a5b149

Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-51
Creator:  Yinghai Lu <yhlu@tyan.com>

cache_as_ram for AMD and some intel


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1967 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/include/cpu/amd/mtrr.h

diff --git a/src/include/cpu/amd/mtrr.h b/src/include/cpu/amd/mtrr.h
index 572997b..2b7017d 100644
--- a/src/include/cpu/amd/mtrr.h
+++ b/src/include/cpu/amd/mtrr.h
@@ -31,7 +31,7 @@
 #define TOP_MEM_MASK			0x007fffff
 #define TOP_MEM_MASK_KB			(TOP_MEM_MASK >> 10)
 
-#ifndef __ROMCC__
+#if !defined( __ROMCC__ ) && !defined (ASSEMBLY)
 void amd_setup_mtrrs(void);
 #endif /* __ROMCC__ */
 

src/include/cpu/x86/bist.h

diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h
index 6a62150..ff66eab 100644
--- a/src/include/cpu/x86/bist.h
+++ b/src/include/cpu/x86/bist.h
@@ -4,9 +4,14 @@
 static void report_bist_failure(unsigned long bist)
 {
 	if (bist != 0) {
+#if CONFIG_USE_INIT
+                printk_emerg("BIST failed: %08x", bist);
+#else
 		print_emerg("BIST failed: ");
 		print_emerg_hex32(bist);
+#endif
 		die("\r\n");
+
 	}
 }
 

src/include/cpu/x86/cache.h

diff --git a/src/include/cpu/x86/cache.h b/src/include/cpu/x86/cache.h
index 623ef97..af7d3d5 100644
--- a/src/include/cpu/x86/cache.h
+++ b/src/include/cpu/x86/cache.h
@@ -41,7 +41,7 @@
 	wbinvd();
 }
 
-#ifndef __ROMCC__
+#if !defined( __ROMCC__)  && defined (__GNUC__)
 void x86_enable_cache(void);
 #endif /* !__ROMCC__ */
 

src/include/cpu/x86/msr.h

diff --git a/src/include/cpu/x86/msr.h b/src/include/cpu/x86/msr.h
index 4f481bd..c4bc55a 100644
--- a/src/include/cpu/x86/msr.h
+++ b/src/include/cpu/x86/msr.h
@@ -1,8 +1,7 @@
 #ifndef CPU_X86_MSR_H
 #define CPU_X86_MSR_H
 
-
-#ifdef __ROMCC__
+#if defined( __ROMCC__) && !defined (__GNUC__)
 
 typedef __builtin_msr_t msr_t;
 
@@ -16,9 +15,7 @@
 	__builtin_wrmsr(index, msr.lo, msr.hi);
 }
 
-#endif /* __ROMCC__ */
-
-#if defined(__GNUC__) && !defined(__ROMCC__)
+#else
 
 typedef struct msr_struct 
 {
@@ -46,7 +43,7 @@
 		);
 }
 
-#endif /* __GNUC__ */
+#endif /* ROMCC__ && !__GNUC__ */
 
 
 #endif /* CPU_X86_MSR_H */

src/include/cpu/x86/mtrr.h

diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h
index eb9bcb4..3d229d2 100644
--- a/src/include/cpu/x86/mtrr.h
+++ b/src/include/cpu/x86/mtrr.h
@@ -32,7 +32,7 @@
 #define MTRRfix4K_F8000_MSR 0x26f
 
 
-#if !defined(__ROMCC__) && !defined(ASSEMBLY)
+#if !defined(__ROMCC__) && !defined (ASSEMBLY)
 
 void x86_setup_mtrrs(void);
 int x86_mtrr_check(void);