summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/include/arch/cpu.h3
-rw-r--r--src/arch/x86/smbios.c10
2 files changed, 1 insertions, 12 deletions
diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index d74d6de7b5..e0e3ca1972 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -210,8 +210,7 @@ int cpu_have_cpuid(void);
static inline bool cpu_is_amd(void)
{
- return CONFIG(CPU_AMD_AGESA) || CONFIG(CPU_AMD_PI)
- || CONFIG(SOC_AMD_COMMON) || CONFIG(CPU_AMD_MODEL_10XXX);
+ return CONFIG(CPU_AMD_AGESA) || CONFIG(CPU_AMD_PI) || CONFIG(SOC_AMD_COMMON);
}
static inline bool cpu_is_intel(void)
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index 725d808d56..7e05408242 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -545,16 +545,6 @@ static int get_socket_type(void)
return 0x13;
if (CONFIG(CPU_INTEL_SOCKET_LGA775))
return 0x15;
- if (CONFIG(CPU_AMD_SOCKET_AM2R2))
- return 0x17;
- if (CONFIG(CPU_AMD_SOCKET_F_1207))
- return 0x18;
- if (CONFIG(CPU_AMD_SOCKET_G34_NON_AGESA))
- return 0x1a;
- if (CONFIG(CPU_AMD_SOCKET_AM3))
- return 0x1b;
- if (CONFIG(CPU_AMD_SOCKET_C32_NON_AGESA))
- return 0x1c;
return 0x02; /* Unknown */
}