Replace Skylake with Xeon
We are going to use Xeon for all CPU configs so this commit
replaces Skylake string with Xeon.
Tested: Dbus CPU sensors were listed as expected.
Change-Id: I0b8ae488a9c8a1eb75ed38bdf8fbf57d50f7c351
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
diff --git a/configurations/FBTP.json b/configurations/FBTP.json
index 5801ea1..e3d91fa 100644
--- a/configurations/FBTP.json
+++ b/configurations/FBTP.json
@@ -380,7 +380,7 @@
"Address": "0x30",
"Bus": 0,
"CpuID": 1,
- "Name": "Skylake CPU 1",
+ "Name": "Xeon CPU 1",
"Thresholds": [
{
"Direction": "greater than",
@@ -397,13 +397,13 @@
"Value": 89
}
],
- "Type": "SkylakeCPU"
+ "Type": "XeonCPU"
},
{
"Address": "0x31",
"Bus": 0,
"CpuID": 2,
- "Name": "Skylake CPU 2",
+ "Name": "Xeon CPU 2",
"Thresholds": [
{
"Direction": "greater than",
@@ -420,7 +420,7 @@
"Value": 89
}
],
- "Type": "SkylakeCPU"
+ "Type": "XeonCPU"
},
{
"Address": "0x4e",
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index 79d1da2..16b4a19 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -609,7 +609,7 @@
{
"Address": "0x30",
"CpuID": 1,
- "Name": "Skylake CPU 1",
+ "Name": "Xeon CPU 1",
"Thresholds": [
{
"Direction": "greater than",
@@ -626,12 +626,12 @@
"Value": 89
}
],
- "Type": "SkylakeCPU"
+ "Type": "XeonCPU"
},
{
"Address": "0x31",
"CpuID": 2,
- "Name": "Skylake CPU 2",
+ "Name": "Xeon CPU 2",
"Thresholds": [
{
"Direction": "greater than",
@@ -648,7 +648,7 @@
"Value": 89
}
],
- "Type": "SkylakeCPU"
+ "Type": "XeonCPU"
},
{
"Address": "0x4C",
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 1bb365f..55cfb78 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -1773,7 +1773,7 @@
"Address": "0x30",
"Bus": 0,
"CpuID": 1,
- "Name": "Skylake CPU 1",
+ "Name": "Xeon CPU 1",
"Thresholds": [
{
"Direction": "greater than",
@@ -1790,13 +1790,13 @@
"Value": 89
}
],
- "Type": "SkylakeCPU"
+ "Type": "XeonCPU"
},
{
"Address": "0x31",
"Bus": 0,
"CpuID": 2,
- "Name": "Skylake CPU 2",
+ "Name": "Xeon CPU 2",
"Thresholds": [
{
"Direction": "greater than",
@@ -1813,7 +1813,7 @@
"Value": 89
}
],
- "Type": "SkylakeCPU"
+ "Type": "XeonCPU"
},
{
"Address": "0x4D",
diff --git a/include/devices.hpp b/include/devices.hpp
index 2e6f23c..0ba586e 100644
--- a/include/devices.hpp
+++ b/include/devices.hpp
@@ -64,7 +64,7 @@
"/sys/bus/i2c/devices/i2c-$Bus/new_device")},
{"TMP112", ExportTemplate("tmp112 $Address",
"/sys/bus/i2c/devices/i2c-$Bus/new_device")},
- {"SkylakeCPU",
+ {"XeonCPU",
ExportTemplate("peci-client $Address",
"/sys/bus/peci/devices/peci-$Bus/new_device")