- Merge from linuxbios-lnxi (Linux Networx repository) up to public tree.

        - Special version for HDAMA rev G with 33Mhz test and reboot out.
        - Support for CPU rev E, dual core, memory hoisting,
        - corrected an SST flashing problem. Kernel bug work around (NUMA)
        - added a Kernel bug work around for assigning CPU's to memory.

 r2@gog:  svnadmin | 2005-08-03 08:47:54 -0600
 Create local LNXI branch
 r1110@gog:  jschildt | 2005-08-09 10:35:51 -0600
 - Merge from Tom Zimmerman's additions to the hdama code for dual core
   and 33Mhz fix.
 
 
 r1111@gog:  jschildt | 2005-08-09 11:07:11 -0600
 Stable Release tag for HDAMA-1.1.8.10 and HDAMA-1.1.8.10LANL
 r1112@gog:  jschildt | 2005-08-09 15:09:32 -0600
 - temporarily removing hdama tag to update to public repository.  Will
   reset tag after update.
 
 


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

1 files changed, 6 insertions, 27 deletions

diff --git a/src/northbridge/amd/amdk8/cpu_rev.c b/src/northbridge/amd/amdk8/cpu_rev.c
index 1eb47f85f5..c76efa2f39 100644
--- a/src/northbridge/amd/amdk8/cpu_rev.c
+++ b/src/northbridge/amd/amdk8/cpu_rev.c
@@ -3,26 +3,10 @@ static int is_cpu_rev_a0(void)
 {
 	return (cpuid_eax(1) & 0xfffef) == 0x0f00;
 }
-//AMD_D0_SUPPORT
-static int is_cpu_pre_d0(void)
-{
-        return (cpuid_eax(1) & 0xfff0f) < 0x10f00;
-}
-
-static int is_cpu_d0(void)
-{
-        return (cpuid_eax(1) & 0xfff0f) == 0x10f00;
-}
-
-//AMD_E0_SUPPORT
-static int is_cpu_pre_e0(void)
-{
-        return (cpuid_eax(1) & 0xfff0f) < 0x20f00;
-}
 
-static int is_cpu_e0(void)
+static int is_cpu_pre_b3(void)
 {
-        return (cpuid_eax(1) & 0xfff00) == 0x20f00;
+	return (cpuid_eax(1) & 0xfffef) < 0x0f41;
 }
 
 static int is_cpu_pre_c0(void)
@@ -30,17 +14,12 @@ static int is_cpu_pre_c0(void)
 	return (cpuid_eax(1) & 0xfffef) < 0x0f48;
 }
 
-static int is_cpu_c0(void)
-{
-	return (cpuid_eax(1) & 0xfffef) == 0x0f48;
-}
-
-static int is_cpu_pre_b3(void)
+static int is_cpu_pre_d0(void)
 {
-	return (cpuid_eax(1) & 0xfffef) < 0x0f41;
+        return (cpuid_eax(1) & 0xfff0f) < 0x10000;
 }
 
-static int is_cpu_b3(void)
+static int is_cpu_pre_e0(void)
 {
-	return (cpuid_eax(1) & 0xfffef) == 0x0f41;
+        return (cpuid_eax(1) & 0xfff0f) < 0x20f00;
 }