mstrool: only use intel targets for actual intel CPUs
VIA c3 & C7 use the the family of 0x6 and model 10, but are not quite Pentium III. Change-Id: I85e9853b42cfd20db46db0bd244620d6813bc826 Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Reviewed-on: https://review.coreboot.org/18256 Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
f5f552afcd
commit
199a23cd8a
|
@ -16,8 +16,9 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_atom_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return (0x6 == id->family) &&
|
||||
(0x1c == id->model);
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0x6 == id->family) &&
|
||||
(0x1c == id->model));
|
||||
}
|
||||
|
||||
const struct msrdef intel_atom_msrs[] = {
|
||||
|
|
|
@ -16,7 +16,9 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_core1_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0x6 == id->family) && (0xe == id->model));
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0x6 == id->family) &&
|
||||
(0xe == id->model));
|
||||
}
|
||||
|
||||
const struct msrdef intel_core1_msrs[] = {
|
||||
|
|
|
@ -16,7 +16,9 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_core2_early_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0x6 == id->family) && (0xf == id->model));
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0x6 == id->family) &&
|
||||
(0xf == id->model));
|
||||
}
|
||||
|
||||
const struct msrdef intel_core2_early_msrs[] = {
|
||||
|
|
|
@ -16,7 +16,9 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_core2_later_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0x6 == id->family)&(0x17 == id->model));
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0x6 == id->family) &&
|
||||
(0x17 == id->model));
|
||||
}
|
||||
|
||||
const struct msrdef intel_core2_later_msrs[] = {
|
||||
|
|
|
@ -16,7 +16,8 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_nehalem_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0x6 == id->family) && (
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0x6 == id->family) && (
|
||||
(0x1a == id->model) ||
|
||||
(0x1e == id->model) ||
|
||||
(0x1f == id->model) ||
|
||||
|
|
|
@ -16,7 +16,8 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_pentium3_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0x6 == id->family) && (
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0x6 == id->family) && (
|
||||
(0xa == id->model) ||
|
||||
(0xb == id->model)
|
||||
));
|
||||
|
|
|
@ -16,7 +16,8 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_pentium3_early_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0x6 == id->family) && (
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0x6 == id->family) && (
|
||||
(0x7 == id->model) ||
|
||||
(0x8 == id->model)
|
||||
));
|
||||
|
|
|
@ -16,7 +16,9 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_pentium4_early_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0xf == id->family) && (0x2 == id->model));
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0xf == id->family) &&
|
||||
(0x2 == id->model));
|
||||
}
|
||||
|
||||
const struct msrdef intel_pentium4_early_msrs[] = {
|
||||
|
|
|
@ -16,7 +16,8 @@
|
|||
#include "msrtool.h"
|
||||
|
||||
int intel_pentium4_later_probe(const struct targetdef *target, const struct cpuid_t *id) {
|
||||
return ((0xf == id->family) && (
|
||||
return ((VENDOR_INTEL == id->vendor) &&
|
||||
(0xf == id->family) && (
|
||||
(0x3 == id->model) ||
|
||||
(0x4 == id->model)
|
||||
));
|
||||
|
|
Loading…
Reference in New Issue