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>

2 files changed, 0 insertions, 587 deletions

diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
deleted file mode 100644
index d6d2416ea..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ /dev/null
@@ -1,307 +0,0 @@
-MODE_temp1 = "label"
-MODE_temp2 = "label"
-MODE_temp3 = "label"
-MODE_temp4 = "label"
-MODE_temp5 = "label"
-MODE_temp6 = "label"
-MODE_temp7 = "label"
-MODE_temp8 = "label"
-MODE_temp9 = "label"
-MODE_temp10 = "label"
-MODE_temp11 = "label"
-MODE_temp12 = "label"
-MODE_temp13 = "label"
-MODE_temp14 = "label"
-MODE_temp15 = "label"
-MODE_temp16 = "label"
-MODE_temp17 = "label"
-MODE_temp18 = "label"
-MODE_temp19 = "label"
-MODE_temp20 = "label"
-MODE_temp21 = "label"
-MODE_temp22 = "label"
-MODE_temp23 = "label"
-MODE_temp24 = "label"
-MODE_temp25 = "label"
-MODE_temp26 = "label"
-MODE_temp27 = "label"
-MODE_temp28 = "label"
-MODE_temp29 = "label"
-MODE_temp30 = "label"
-MODE_temp31 = "label"
-MODE_temp32 = "label"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-MODE_temp39 = "label"
-MODE_temp40 = "label"
-
-MODE_power1 = "label"
-MODE_power2 = "label"
-MODE_power3 = "label"
-MODE_power4 = "label"
-MODE_power5 = "label"
-MODE_power6 = "label"
-MODE_power7 = "label"
-MODE_power8 = "label"
-MODE_power9 = "label"
-MODE_power10 = "label"
-MODE_power11 = "label"
-MODE_power12 = "label"
-MODE_power13 = "label"
-MODE_power14 = "label"
-MODE_power15 = "label"
-
-LABEL_temp17 = "p0_core0_temp"
-WARNHI_temp17 = "85000"
-WARNLO_temp17 = "0"
-CRITHI_temp17 = "90000"
-CRITLO_temp17 = "0"
-
-LABEL_temp20 = "p0_core1_temp"
-WARNHI_temp20 = "85000"
-WARNLO_temp20 = "0"
-CRITHI_temp20 = "90000"
-CRITLO_temp20 = "0"
-
-LABEL_temp23 = "p0_core2_temp"
-WARNHI_temp23 = "85000"
-WARNLO_temp23 = "0"
-CRITHI_temp23 = "90000"
-CRITLO_temp23 = "0"
-
-LABEL_temp26 = "p0_core3_temp"
-WARNHI_temp26 = "85000"
-WARNLO_temp26 = "0"
-CRITHI_temp26 = "90000"
-CRITLO_temp26 = "0"
-
-LABEL_temp29 = "p0_core4_temp"
-WARNHI_temp29 = "85000"
-WARNLO_temp29 = "0"
-CRITHI_temp29 = "90000"
-CRITLO_temp29 = "0"
-
-LABEL_temp32 = "p0_core5_temp"
-WARNHI_temp32 = "85000"
-WARNLO_temp32 = "0"
-CRITHI_temp32 = "90000"
-CRITLO_temp32 = "0"
-
-LABEL_temp35 = "p0_core6_temp"
-WARNHI_temp35 = "85000"
-WARNLO_temp35 = "0"
-CRITHI_temp35 = "90000"
-CRITLO_temp35 = "0"
-
-LABEL_temp38 = "p0_core7_temp"
-WARNHI_temp38 = "85000"
-WARNLO_temp38 = "0"
-CRITHI_temp38 = "90000"
-CRITLO_temp38 = "0"
-
-LABEL_temp41 = "p0_core8_temp"
-WARNHI_temp41 = "85000"
-WARNLO_temp41 = "0"
-CRITHI_temp41 = "90000"
-CRITLO_temp41 = "0"
-
-LABEL_temp44 = "p0_core9_temp"
-WARNHI_temp44 = "85000"
-WARNLO_temp44 = "0"
-CRITHI_temp44 = "90000"
-CRITLO_temp44 = "0"
-
-LABEL_temp47 = "p0_core10_temp"
-WARNHI_temp47 = "85000"
-WARNLO_temp47 = "0"
-CRITHI_temp47 = "90000"
-CRITLO_temp47 = "0"
-
-LABEL_temp50 = "p0_core11_temp"
-WARNHI_temp50 = "85000"
-WARNLO_temp50 = "0"
-CRITHI_temp50 = "90000"
-CRITLO_temp50 = "0"
-
-LABEL_temp53 = "p0_core12_temp"
-WARNHI_temp53 = "85000"
-WARNLO_temp53 = "0"
-CRITHI_temp53 = "90000"
-CRITLO_temp53 = "0"
-
-LABEL_temp56 = "p0_core13_temp"
-WARNHI_temp56 = "85000"
-WARNLO_temp56 = "0"
-CRITHI_temp56 = "90000"
-CRITLO_temp56 = "0"
-
-LABEL_temp59 = "p0_core14_temp"
-WARNHI_temp59 = "85000"
-WARNLO_temp59 = "0"
-CRITHI_temp59 = "90000"
-CRITLO_temp59 = "0"
-
-LABEL_temp62 = "p0_core15_temp"
-WARNHI_temp62 = "85000"
-WARNLO_temp62 = "0"
-CRITHI_temp62 = "90000"
-CRITLO_temp62 = "0"
-
-LABEL_temp65 = "p0_core16_temp"
-WARNHI_temp65 = "85000"
-WARNLO_temp65 = "0"
-CRITHI_temp65 = "90000"
-CRITLO_temp65 = "0"
-
-LABEL_temp68 = "p0_core17_temp"
-WARNHI_temp68 = "85000"
-WARNLO_temp68 = "0"
-CRITHI_temp68 = "90000"
-CRITLO_temp68 = "0"
-
-LABEL_temp71 = "p0_core18_temp"
-WARNHI_temp71 = "85000"
-WARNLO_temp71 = "0"
-CRITHI_temp71 = "90000"
-CRITLO_temp71 = "0"
-
-LABEL_temp74 = "p0_core19_temp"
-WARNHI_temp74 = "85000"
-WARNLO_temp74 = "0"
-CRITHI_temp74 = "90000"
-CRITLO_temp74 = "0"
-
-LABEL_temp77 = "p0_core20_temp"
-WARNHI_temp77 = "85000"
-WARNLO_temp77 = "0"
-CRITHI_temp77 = "90000"
-CRITLO_temp77 = "0"
-
-LABEL_temp80 = "p0_core21_temp"
-WARNHI_temp80 = "85000"
-WARNLO_temp80 = "0"
-CRITHI_temp80 = "90000"
-CRITLO_temp80 = "0"
-
-LABEL_temp83 = "p0_core22_temp"
-WARNHI_temp83 = "85000"
-WARNLO_temp83 = "0"
-CRITHI_temp83 = "90000"
-CRITLO_temp83 = "0"
-
-LABEL_temp86 = "p0_core23_temp"
-WARNHI_temp86 = "85000"
-WARNLO_temp86 = "0"
-CRITHI_temp86 = "90000"
-CRITLO_temp86 = "0"
-
-LABEL_temp165 = "dimm0_temp"
-WARNHI_temp165 = "85000"
-WARNLO_temp165 = "0"
-CRITHI_temp165 = "95000"
-CRITLO_temp165 = "0"
-
-LABEL_temp167 = "dimm1_temp"
-WARNHI_temp167 = "85000"
-WARNLO_temp167 = "0"
-CRITHI_temp167 = "95000"
-CRITLO_temp167 = "0"
-
-LABEL_temp169 = "dimm2_temp"
-WARNHI_temp169 = "85000"
-WARNLO_temp169 = "0"
-CRITHI_temp169 = "95000"
-CRITLO_temp169 = "0"
-
-LABEL_temp171 = "dimm3_temp"
-WARNHI_temp171 = "85000"
-WARNLO_temp171 = "0"
-CRITHI_temp171 = "95000"
-CRITLO_temp171 = "0"
-
-LABEL_temp173 = "dimm4_temp"
-WARNHI_temp173 = "85000"
-WARNLO_temp173 = "0"
-CRITHI_temp173 = "95000"
-CRITLO_temp173 = "0"
-
-LABEL_temp175 = "dimm5_temp"
-WARNHI_temp175 = "85000"
-WARNLO_temp175 = "0"
-CRITHI_temp175 = "95000"
-CRITLO_temp175 = "0"
-
-LABEL_temp177 = "dimm6_temp"
-WARNHI_temp177 = "85000"
-WARNLO_temp177 = "0"
-CRITHI_temp177 = "95000"
-CRITLO_temp177 = "0"
-
-LABEL_temp179 = "dimm7_temp"
-WARNHI_temp179 = "85000"
-WARNLO_temp179 = "0"
-CRITHI_temp179 = "95000"
-CRITLO_temp179 = "0"
-
-LABEL_temp197 = "dimm16_temp"
-WARNHI_temp197 = "85000"
-WARNLO_temp197 = "0"
-CRITHI_temp197 = "95000"
-CRITLO_temp197 = "0"
-
-LABEL_temp199 = "dimm17_temp"
-WARNHI_temp199 = "85000"
-WARNLO_temp199 = "0"
-CRITHI_temp199 = "95000"
-CRITLO_temp199 = "0"
-
-LABEL_temp201 = "dimm18_temp"
-WARNHI_temp201 = "85000"
-WARNLO_temp201 = "0"
-CRITHI_temp201 = "95000"
-CRITLO_temp201 = "0"
-
-LABEL_temp203 = "dimm19_temp"
-WARNHI_temp203 = "85000"
-WARNLO_temp203 = "0"
-CRITHI_temp203 = "95000"
-CRITLO_temp203 = "0"
-
-LABEL_temp205 = "dimm20_temp"
-WARNHI_temp205 = "85000"
-WARNLO_temp205 = "0"
-CRITHI_temp205 = "95000"
-CRITLO_temp205 = "0"
-
-LABEL_temp207 = "dimm21_temp"
-WARNHI_temp207 = "85000"
-WARNLO_temp207 = "0"
-CRITHI_temp207 = "95000"
-CRITLO_temp207 = "0"
-
-LABEL_temp209 = "dimm22_temp"
-WARNHI_temp209 = "85000"
-WARNLO_temp209 = "0"
-CRITHI_temp209 = "95000"
-CRITLO_temp209 = "0"
-
-LABEL_temp211 = "dimm23_temp"
-WARNHI_temp211 = "85000"
-WARNLO_temp211 = "0"
-CRITHI_temp211 = "95000"
-CRITLO_temp211 = "0"
-
-LABEL_power0_14_2 = "io_b_power"
-LABEL_power0_13_3 = "io_a_power"
-LABEL_power0_2_4 = "p1_mem_power"
-LABEL_power0_6_5 = "p1_vdd_power"
-LABEL_power0_1_6 = "p0_mem_power"
-LABEL_power0_5_7 = "p0_vdd_power"
-LABEL_power0_16_8 = "fans_power"
-LABEL_power0_19_9 = "storage_b_power"
-LABEL_power0_18_10 = "storage_a_power"
-LABEL_powersystem = "total_power"
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
deleted file mode 100644
index ba53cd95d..000000000
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf
+++ /dev/null
@@ -1,280 +0,0 @@
-MODE_temp1 = "label"
-MODE_temp2 = "label"
-MODE_temp3 = "label"
-MODE_temp4 = "label"
-MODE_temp5 = "label"
-MODE_temp6 = "label"
-MODE_temp7 = "label"
-MODE_temp8 = "label"
-MODE_temp9 = "label"
-MODE_temp10 = "label"
-MODE_temp11 = "label"
-MODE_temp12 = "label"
-MODE_temp13 = "label"
-MODE_temp14 = "label"
-MODE_temp15 = "label"
-MODE_temp16 = "label"
-MODE_temp17 = "label"
-MODE_temp18 = "label"
-MODE_temp19 = "label"
-MODE_temp20 = "label"
-MODE_temp21 = "label"
-MODE_temp22 = "label"
-MODE_temp23 = "label"
-MODE_temp24 = "label"
-MODE_temp25 = "label"
-MODE_temp26 = "label"
-MODE_temp27 = "label"
-MODE_temp28 = "label"
-MODE_temp29 = "label"
-MODE_temp30 = "label"
-MODE_temp31 = "label"
-MODE_temp32 = "label"
-MODE_temp33 = "label"
-MODE_temp34 = "label"
-MODE_temp35 = "label"
-MODE_temp36 = "label"
-MODE_temp37 = "label"
-MODE_temp38 = "label"
-MODE_temp39 = "label"
-MODE_temp40 = "label"
-LABEL_temp91 = "p1_core0_temp"
-WARNHI_temp91 = "85000"
-WARNLO_temp91 = "0"
-CRITHI_temp91 = "90000"
-CRITLO_temp91 = "0"
-
-LABEL_temp94 = "p1_core1_temp"
-WARNHI_temp94 = "85000"
-WARNLO_temp94 = "0"
-CRITHI_temp94 = "90000"
-CRITLO_temp94 = "0"
-
-LABEL_temp97 = "p1_core2_temp"
-WARNHI_temp97 = "85000"
-WARNLO_temp97 = "0"
-CRITHI_temp97 = "90000"
-CRITLO_temp97 = "0"
-
-LABEL_temp100 = "p1_core3_temp"
-WARNHI_temp100 = "85000"
-WARNLO_temp100 = "0"
-CRITHI_temp100 = "90000"
-CRITLO_temp100 = "0"
-
-LABEL_temp103 = "p1_core4_temp"
-WARNHI_temp103 = "85000"
-WARNLO_temp103 = "0"
-CRITHI_temp103 = "90000"
-CRITLO_temp103 = "0"
-
-LABEL_temp106 = "p1_core5_temp"
-WARNHI_temp106 = "85000"
-WARNLO_temp106 = "0"
-CRITHI_temp106 = "90000"
-CRITLO_temp106 = "0"
-
-LABEL_temp109 = "p1_core6_temp"
-WARNHI_temp109 = "85000"
-WARNLO_temp109 = "0"
-CRITHI_temp109 = "90000"
-CRITLO_temp109 = "0"
-
-LABEL_temp112 = "p1_core7_temp"
-WARNHI_temp112 = "85000"
-WARNLO_temp112 = "0"
-CRITHI_temp112 = "90000"
-CRITLO_temp112 = "0"
-
-LABEL_temp115 = "p1_core8_temp"
-WARNHI_temp115 = "85000"
-WARNLO_temp115 = "0"
-CRITHI_temp115 = "90000"
-CRITLO_temp115 = "0"
-
-LABEL_temp118 = "p1_core9_temp"
-WARNHI_temp118 = "85000"
-WARNLO_temp118 = "0"
-CRITHI_temp118 = "90000"
-CRITLO_temp118 = "0"
-
-LABEL_temp121 = "p1_core10_temp"
-WARNHI_temp121 = "85000"
-WARNLO_temp121 = "0"
-CRITHI_temp121 = "90000"
-CRITLO_temp121 = "0"
-
-LABEL_temp124 = "p1_core11_temp"
-WARNHI_temp124 = "85000"
-WARNLO_temp124 = "0"
-CRITHI_temp124 = "90000"
-CRITLO_temp124 = "0"
-
-LABEL_temp127 = "p1_core12_temp"
-WARNHI_temp127 = "85000"
-WARNLO_temp127 = "0"
-CRITHI_temp127 = "90000"
-CRITLO_temp127 = "0"
-
-LABEL_temp130 = "p1_core13_temp"
-WARNHI_temp130 = "85000"
-WARNLO_temp130 = "0"
-CRITHI_temp130 = "90000"
-CRITLO_temp130 = "0"
-
-LABEL_temp133 = "p1_core14_temp"
-WARNHI_temp133 = "85000"
-WARNLO_temp133 = "0"
-CRITHI_temp133 = "90000"
-CRITLO_temp133 = "0"
-
-LABEL_temp136 = "p1_core15_temp"
-WARNHI_temp136 = "85000"
-WARNLO_temp136 = "0"
-CRITHI_temp136 = "90000"
-CRITLO_temp136 = "0"
-
-LABEL_temp139 = "p1_core16_temp"
-WARNHI_temp139 = "85000"
-WARNLO_temp139 = "0"
-CRITHI_temp139 = "90000"
-CRITLO_temp139 = "0"
-
-LABEL_temp142 = "p1_core17_temp"
-WARNHI_temp142 = "85000"
-WARNLO_temp142 = "0"
-CRITHI_temp142 = "90000"
-CRITLO_temp142 = "0"
-
-LABEL_temp145 = "p1_core18_temp"
-WARNHI_temp145 = "85000"
-WARNLO_temp145 = "0"
-CRITHI_temp145 = "90000"
-CRITLO_temp145 = "0"
-
-LABEL_temp148 = "p1_core19_temp"
-WARNHI_temp148 = "85000"
-WARNLO_temp148 = "0"
-CRITHI_temp148 = "90000"
-CRITLO_temp148 = "0"
-
-LABEL_temp151 = "p1_core20_temp"
-WARNHI_temp151 = "85000"
-WARNLO_temp151 = "0"
-CRITHI_temp151 = "90000"
-CRITLO_temp151 = "0"
-
-LABEL_temp154 = "p1_core21_temp"
-WARNHI_temp154 = "85000"
-WARNLO_temp154 = "0"
-CRITHI_temp154 = "90000"
-CRITLO_temp154 = "0"
-
-LABEL_temp157 = "p1_core22_temp"
-WARNHI_temp157 = "85000"
-WARNLO_temp157 = "0"
-CRITHI_temp157 = "90000"
-CRITLO_temp157 = "0"
-
-LABEL_temp160 = "p1_core23_temp"
-WARNHI_temp160 = "85000"
-WARNLO_temp160 = "0"
-CRITHI_temp160 = "90000"
-CRITLO_temp160 = "0"
-
-LABEL_temp181 = "dimm8_temp"
-WARNHI_temp181 = "85000"
-WARNLO_temp181 = "0"
-CRITHI_temp181 = "95000"
-CRITLO_temp181 = "0"
-
-LABEL_temp183 = "dimm9_temp"
-WARNHI_temp183 = "85000"
-WARNLO_temp183 = "0"
-CRITHI_temp183 = "95000"
-CRITLO_temp183 = "0"
-
-LABEL_temp185 = "dimm10_temp"
-WARNHI_temp185 = "85000"
-WARNLO_temp185 = "0"
-CRITHI_temp185 = "95000"
-CRITLO_temp185 = "0"
-
-LABEL_temp187 = "dimm11_temp"
-WARNHI_temp187 = "85000"
-WARNLO_temp187 = "0"
-CRITHI_temp187 = "95000"
-CRITLO_temp187 = "0"
-
-LABEL_temp189 = "dimm12_temp"
-WARNHI_temp189 = "85000"
-WARNLO_temp189 = "0"
-CRITHI_temp189 = "95000"
-CRITLO_temp189 = "0"
-
-LABEL_temp191 = "dimm13_temp"
-WARNHI_temp191 = "85000"
-WARNLO_temp191 = "0"
-CRITHI_temp191 = "95000"
-CRITLO_temp191 = "0"
-
-LABEL_temp193 = "dimm14_temp"
-WARNHI_temp193 = "85000"
-WARNLO_temp193 = "0"
-CRITHI_temp193 = "95000"
-CRITLO_temp193 = "0"
-
-LABEL_temp195 = "dimm15_temp"
-WARNHI_temp195 = "85000"
-WARNLO_temp195 = "0"
-CRITHI_temp195 = "95000"
-CRITLO_temp195 = "0"
-
-LABEL_temp213 = "dimm24_temp"
-WARNHI_temp213 = "85000"
-WARNLO_temp213 = "0"
-CRITHI_temp213 = "95000"
-CRITLO_temp213 = "0"
-
-LABEL_temp215 = "dimm25_temp"
-WARNHI_temp215 = "85000"
-WARNLO_temp215 = "0"
-CRITHI_temp215 = "95000"
-CRITLO_temp215 = "0"
-
-LABEL_temp217 = "dimm26_temp"
-WARNHI_temp217 = "85000"
-WARNLO_temp217 = "0"
-CRITHI_temp217 = "95000"
-CRITLO_temp217 = "0"
-
-LABEL_temp219 = "dimm27_temp"
-WARNHI_temp219 = "85000"
-WARNLO_temp219 = "0"
-CRITHI_temp219 = "95000"
-CRITLO_temp219 = "0"
-
-LABEL_temp221 = "dimm28_temp"
-WARNHI_temp221 = "85000"
-WARNLO_temp221 = "0"
-CRITHI_temp221 = "95000"
-CRITLO_temp221 = "0"
-
-LABEL_temp223 = "dimm29_temp"
-WARNHI_temp223 = "85000"
-WARNLO_temp223 = "0"
-CRITHI_temp223 = "95000"
-CRITLO_temp223 = "0"
-
-LABEL_temp225 = "dimm30_temp"
-WARNHI_temp225 = "85000"
-WARNLO_temp225 = "0"
-CRITHI_temp225 = "95000"
-CRITLO_temp225 = "0"
-
-LABEL_temp227 = "dimm31_temp"
-WARNHI_temp227 = "85000"
-WARNLO_temp227 = "0"
-CRITHI_temp227 = "95000"
-CRITLO_temp227 = "0"
-