Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/29529
Change subject: cpu/intel/socket_*/Kconfig: [WIP] Add CPU_SOCKET_TYPE ......................................................................
cpu/intel/socket_*/Kconfig: [WIP] Add CPU_SOCKET_TYPE
CPU_SOCKET_TYPE values added in accordance with SMBIOS Reference Specification Version: 3.2.0 AMD's have CPU_SOCKET_TYPE but are not a same as SMBIOS spec.
Change-Id: I1bf5ac6c411720d349df8fd706015c6835758cd0 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr --- M src/arch/x86/smbios.c M src/cpu/intel/socket_441/Kconfig M src/cpu/intel/socket_BGA1284/Kconfig M src/cpu/intel/socket_BGA956/Kconfig M src/cpu/intel/socket_FCBGA1023/Kconfig M src/cpu/intel/socket_FCBGA559/Kconfig M src/cpu/intel/socket_LGA1155/Kconfig M src/cpu/intel/socket_LGA775/Kconfig M src/cpu/intel/socket_mFCPGA478/Kconfig M src/cpu/intel/socket_mPGA478MN/Kconfig M src/cpu/intel/socket_mPGA604/Kconfig M src/cpu/intel/socket_rPGA988B/Kconfig M src/cpu/intel/socket_rPGA989/Kconfig 13 files changed, 49 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/29529/1
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index c0545ce..b6337f2 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -555,12 +555,11 @@ t->processor_version = smbios_processor_name(t->eos); t->processor_family = (res.eax > 0) ? 0x0c : 0x6; t->processor_type = 3; /* System Processor */ - t->processor_upgrade = 0x06; t->core_count = (res.ebx >> 16) & 0xff; t->l1_cache_handle = 0xffff; t->l2_cache_handle = 0xffff; t->l3_cache_handle = 0xffff; - t->processor_upgrade = 1; + t->processor_upgrade = CONFIG_CPU_SOCKET_TYPE; len = t->length + smbios_string_table_len(t->eos); *current += len; return len; diff --git a/src/cpu/intel/socket_441/Kconfig b/src/cpu/intel/socket_441/Kconfig index ac249c5..66761f5 100644 --- a/src/cpu/intel/socket_441/Kconfig +++ b/src/cpu/intel/socket_441/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_441
+config CPU_SOCKET_TYPE + hex + default 0x04 + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select CPU_INTEL_MODEL_106CX diff --git a/src/cpu/intel/socket_BGA1284/Kconfig b/src/cpu/intel/socket_BGA1284/Kconfig index 402dc5c..5fef2ba 100644 --- a/src/cpu/intel/socket_BGA1284/Kconfig +++ b/src/cpu/intel/socket_BGA1284/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_BGA1284
+config CPU_SOCKET_TYPE + hex + default 0x01 # Other + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select MMX diff --git a/src/cpu/intel/socket_BGA956/Kconfig b/src/cpu/intel/socket_BGA956/Kconfig index 6c5e414..91c1039 100644 --- a/src/cpu/intel/socket_BGA956/Kconfig +++ b/src/cpu/intel/socket_BGA956/Kconfig @@ -6,6 +6,10 @@
if CPU_INTEL_SOCKET_BGA956
+config CPU_SOCKET_TYPE + hex + default 0x01 # Other + config DCACHE_RAM_BASE hex default 0xfefc0000 diff --git a/src/cpu/intel/socket_FCBGA1023/Kconfig b/src/cpu/intel/socket_FCBGA1023/Kconfig index 3c6e2bf..206e5d9ec3 100644 --- a/src/cpu/intel/socket_FCBGA1023/Kconfig +++ b/src/cpu/intel/socket_FCBGA1023/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_FCBGA1023
+config CPU_SOCKET_TYPE + hex + default 0x22 + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select MMX diff --git a/src/cpu/intel/socket_FCBGA559/Kconfig b/src/cpu/intel/socket_FCBGA559/Kconfig index d1cc80f..f7aaca3 100644 --- a/src/cpu/intel/socket_FCBGA559/Kconfig +++ b/src/cpu/intel/socket_FCBGA559/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_FCBGA559
+config CPU_SOCKET_TYPE + hex + default 0x01 # Other + config SOCKET_SPECIFIC_OPTIONS def_bool y select CPU_INTEL_MODEL_106CX diff --git a/src/cpu/intel/socket_LGA1155/Kconfig b/src/cpu/intel/socket_LGA1155/Kconfig index 35aac3c..46e7509 100644 --- a/src/cpu/intel/socket_LGA1155/Kconfig +++ b/src/cpu/intel/socket_LGA1155/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_LGA1155
+config CPU_SOCKET_TYPE + hex + default 0x24 + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select MMX diff --git a/src/cpu/intel/socket_LGA775/Kconfig b/src/cpu/intel/socket_LGA775/Kconfig index 8b227bd..3d61ac3 100644 --- a/src/cpu/intel/socket_LGA775/Kconfig +++ b/src/cpu/intel/socket_LGA775/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_LGA775
+config CPU_SOCKET_TYPE + hex + default 0x15 + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select CPU_INTEL_MODEL_6FX diff --git a/src/cpu/intel/socket_mFCPGA478/Kconfig b/src/cpu/intel/socket_mFCPGA478/Kconfig index 075abad..83b3e8b 100644 --- a/src/cpu/intel/socket_mFCPGA478/Kconfig +++ b/src/cpu/intel/socket_mFCPGA478/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_MFCPGA478
+config CPU_SOCKET_TYPE + hex + default 0x01 # Other + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select CPU_INTEL_MODEL_6EX diff --git a/src/cpu/intel/socket_mPGA478MN/Kconfig b/src/cpu/intel/socket_mPGA478MN/Kconfig index 7d97022..aa0c7d7 100644 --- a/src/cpu/intel/socket_mPGA478MN/Kconfig +++ b/src/cpu/intel/socket_mPGA478MN/Kconfig @@ -7,6 +7,10 @@
if CPU_INTEL_SOCKET_MPGA478MN
+config CPU_SOCKET_TYPE + hex + default 0x01 # Other + config DCACHE_RAM_BASE hex default 0xfefc0000 diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig index ab0cf8a..206382e 100644 --- a/src/cpu/intel/socket_mPGA604/Kconfig +++ b/src/cpu/intel/socket_mPGA604/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_MPGA604
+config CPU_SOCKET_TYPE + hex + default 0x13 + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select CPU_INTEL_MODEL_F2X diff --git a/src/cpu/intel/socket_rPGA988B/Kconfig b/src/cpu/intel/socket_rPGA988B/Kconfig index 753cfb3..f53491e 100644 --- a/src/cpu/intel/socket_rPGA988B/Kconfig +++ b/src/cpu/intel/socket_rPGA988B/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_RPGA988B
+config CPU_SOCKET_TYPE + hex + default 0x21 + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select MMX diff --git a/src/cpu/intel/socket_rPGA989/Kconfig b/src/cpu/intel/socket_rPGA989/Kconfig index 1d1f64f..8094221 100644 --- a/src/cpu/intel/socket_rPGA989/Kconfig +++ b/src/cpu/intel/socket_rPGA989/Kconfig @@ -3,6 +3,10 @@
if CPU_INTEL_SOCKET_RPGA989
+config CPU_SOCKET_TYPE + hex + default 0x01 # Other + config SOCKET_SPECIFIC_OPTIONS # dummy def_bool y select MMX
-
Elyes HAOUAS (Code Review)