diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h
index 38066c15a2..32717ba5b3 100644
--- a/src/arch/x86/include/arch/cpu.h
+++ b/src/arch/x86/include/arch/cpu.h
@@ -210,7 +210,8 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1);
 
 static inline bool cpu_is_amd(void)
 {
-	return CONFIG(CPU_AMD_AGESA) || CONFIG(CPU_AMD_PI);
+	return CONFIG(CPU_AMD_AGESA) || CONFIG(CPU_AMD_PI)
+			|| CONFIG(SOC_AMD_COMMON) || CONFIG(CPU_AMD_MODEL_10XXX);
 }
 
 static inline bool cpu_is_intel(void)