meta-ibm: move all meta-witherspoon metadata

The metadata common to all IBM systems is confusingly split between
meta-ibm and meta-witherspoon.  Move everything to meta-ibm.

The meta-ibm README is re-written to more accurately reflect the scope
of the layer.

Allow the configuration samples (bblayers.conf.sample,
local.conf.sample) to be sourced from either meta-ibm or
meta-witherspoon until such a time that any workflows and tooling have
had the opportunity to move to meta-ibm.

(From meta-ibm rev: 6e05ef2e90b214eaf4e43ee7027bbbb1d8d09442)

Change-Id: I3ec890d5300f9649c974ea6b9dca93a2e8a889ab
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

10 files changed, 89 insertions, 0 deletions

diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf
new file mode 100644
index 0000000000..80ff06f9f3
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf
@@ -0,0 +1,23 @@
+LABEL_in1="ps1_input_voltage"
+WARNHI_in1="264000"
+WARNLO_in1="200000"
+CRITHI_in1="265000"
+CRITLO_in1="180000"
+
+LABEL_in2="ps1_output_voltage"
+WARNHI_in2="12700"
+WARNLO_in2="0"
+CRITHI_in2="13000"
+CRITLO_in2="0"
+
+LABEL_curr1="ps1_output_current"
+WARNHI_curr1="170000"
+WARNLO_curr1="0"
+CRITHI_curr1="180000"
+CRITLO_curr1="0"
+
+LABEL_power1="ps1_input_power"
+WARNHI_power1="2300000000"
+WARNLO_power1="0"
+CRITHI_power1="2500000000"
+CRITLO_power1="0"
\ No newline at end of file
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf
new file mode 100644
index 0000000000..db56c888d2
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf
@@ -0,0 +1,23 @@
+LABEL_in1="ps0_input_voltage"
+WARNHI_in1="264000"
+WARNLO_in1="200000"
+CRITHI_in1="265000"
+CRITLO_in1="180000"
+
+LABEL_in2="ps0_output_voltage"
+WARNHI_in2="12700"
+WARNLO_in2="0"
+CRITHI_in2="13000"
+CRITLO_in2="0"
+
+LABEL_curr1="ps0_output_current"
+WARNHI_curr1="170000"
+WARNLO_curr1="0"
+CRITHI_curr1="180000"
+CRITLO_curr1="0"
+
+LABEL_power1="ps0_input_power"
+WARNHI_power1="2300000000"
+WARNLO_power1="0"
+CRITHI_power1="2500000000"
+CRITLO_power1="0"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
new file mode 100644
index 0000000000..3c25a4a01b
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf
@@ -0,0 +1,11 @@
+LABEL_temp1 = "p0_vdd_temp"
+WARNHI_temp1 = "100000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "105000"
+CRITLO_temp1 = "0"
+
+LABEL_temp2 = "p0_vcs_temp"
+WARNHI_temp2 = "100000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "105000"
+CRITLO_temp2 = "0"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf
new file mode 100644
index 0000000000..7f1f4d871a
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf
@@ -0,0 +1,5 @@
+LABEL_temp1 = "p0_vdn_temp"
+WARNHI_temp1 = "100000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "105000"
+CRITLO_temp1 = "0"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
new file mode 100644
index 0000000000..5f0985d7c3
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf
@@ -0,0 +1,11 @@
+LABEL_temp1 = "p1_vdd_temp"
+WARNHI_temp1 = "100000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "105000"
+CRITLO_temp1 = "0"
+
+LABEL_temp2 = "p1_vcs_temp"
+WARNHI_temp2 = "100000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "105000"
+CRITLO_temp2 = "0"
\ No newline at end of file
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf
new file mode 100644
index 0000000000..4383728377
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf
@@ -0,0 +1,5 @@
+LABEL_temp1 = "p1_vdn_temp"
+WARNHI_temp1 = "100000"
+WARNLO_temp1 = "0"
+CRITHI_temp1 = "105000"
+CRITLO_temp1 = "0"
\ No newline at end of file
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf
new file mode 100644
index 0000000000..939b3c1e52
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf
@@ -0,0 +1,5 @@
+LABEL_temp2 = "ambient_temp"
+WARNHI_temp2 = "38000"
+WARNLO_temp2 = "0"
+CRITHI_temp2 = "40000"
+CRITLO_temp2 = "0"
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf
new file mode 100644
index 0000000000..4f89e7f34a
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf
@@ -0,0 +1,2 @@
+LABEL_temp1 = "p1_pcie_temp"
+
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf
new file mode 100644
index 0000000000..959c66f9d7
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf
@@ -0,0 +1,2 @@
+LABEL_temp1 = "p0_pcie_temp"
+
diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf
new file mode 100644
index 0000000000..82f065818a
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf
@@ -0,0 +1,2 @@
+LABEL_temp1 = "M2_riser_temp"
+