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>

1 files changed, 111 insertions, 0 deletions

diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
new file mode 100644
index 000000000..36029dd72
--- /dev/null
+++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend
@@ -0,0 +1,111 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+EXTRA_OECONF_append_mihawk = " --enable-negative-errno-on-fail"
+
+SRC_URI_append_ibm-ac-server = " \
+           file://70-hwmon.rules \
+           file://70-max31785-hwmon.rules \
+           file://start_max31785_hwmon.sh \
+           "
+
+CHIPS_witherspoon = " \
+               bus@1e78a000/i2c-bus@100/max31785@52_air \
+               bus@1e78a000/i2c-bus@100/max31785@52_water \
+               bus@1e78a000/i2c-bus@100/power-supply@68 \
+               bus@1e78a000/i2c-bus@100/power-supply@69 \
+               bus@1e78a000/i2c-bus@100/bmp280@77 \
+               bus@1e78a000/i2c-bus@100/dps310@76 \
+               bus@1e78a000/i2c-bus@140/ir35221@70 \
+               bus@1e78a000/i2c-bus@140/ir35221@71 \
+               bus@1e78a000/i2c-bus@180/ir35221@70 \
+               bus@1e78a000/i2c-bus@180/ir35221@71 \
+               bus@1e78a000/i2c-bus@380/tmp275@4a \
+               "
+CHIPS_swift = " \
+               bus@1e78a000/i2c-bus@100/max31785@52_air \
+               bus@1e78a000/i2c-bus@100/max31785@52_water \
+               bus@1e78a000/i2c-bus@100/power-supply@68 \
+               bus@1e78a000/i2c-bus@100/power-supply@69 \
+               bus@1e78a000/i2c-bus@440/tmp275@4a \
+               bus@1e78a000/i2c-bus@440/tmp275@48 \
+               bus@1e78a000/i2c-bus@300/tmp275@48 \
+               bus@1e78a000/i2c-bus@300/dps310@76 \
+               bus@1e78a000/i2c-bus@300/si7021a20@20 \
+               bus@1e78a000/i2c-bus@380/ir35219@70 \
+               bus@1e78a000/i2c-bus@380/ir35221@71 \
+               bus@1e78a000/i2c-bus@380/ir35221@72 \
+               bus@1e78a000/i2c-bus@3c0/ir35219@70 \
+               bus@1e78a000/i2c-bus@3c0/ir35221@71 \
+               bus@1e78a000/i2c-bus@3c0/ir35221@72 \
+               "
+CHIPS_mihawk = " \
+               bus@1e78a000/i2c-bus@100/power-supply@58 \
+               bus@1e78a000/i2c-bus@100/power-supply@5b \
+               bus@1e78a000/i2c-bus@140/ir35221@70 \
+               bus@1e78a000/i2c-bus@140/ir35221@72 \
+               bus@1e78a000/i2c-bus@180/ir35221@70 \
+               bus@1e78a000/i2c-bus@180/ir35221@72 \
+               bus@1e78a000/i2c-bus@400/tmp275@48 \
+               bus@1e78a000/i2c-bus@400/tmp275@49 \
+               pwm-tacho-controller@1e786000 \
+               bus@1e78a000/i2c-bus@400/emc1403@4c \
+               bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \
+               "
+
+CHIPS_witherspoon-tacoma = " \
+               bus@1e78a000/i2c-bus@200/max31785@52_air \
+               bus@1e78a000/i2c-bus@200/max31785@52_water \
+               bus@1e78a000/i2c-bus@200/power-supply@68 \
+               bus@1e78a000/i2c-bus@200/power-supply@69 \
+               bus@1e78a000/i2c-bus@200/bmp280@77 \
+               bus@1e78a000/i2c-bus@200/dps310@76 \
+               bus@1e78a000/i2c-bus@280/ir35221@70 \
+               bus@1e78a000/i2c-bus@280/ir35221@71 \
+               bus@1e78a000/i2c-bus@300/ir35221@70 \
+               bus@1e78a000/i2c-bus@300/ir35221@71 \
+               bus@1e78a000/i2c-bus@500/tmp275@4a \
+               "
+ITEMSFMT = "ahb/apb/{0}.conf"
+ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}"
+ITEMS_append_mihawk += " iio-hwmon-vdd0.conf"
+ITEMS_append_mihawk += " iio-hwmon-vdd1.conf"
+ITEMS_append_mihawk += " iio-hwmon-vcs0.conf"
+ITEMS_append_mihawk += " iio-hwmon-vcs1.conf"
+ITEMS_append_mihawk += " iio-hwmon-vdn0.conf"
+ITEMS_append_mihawk += " iio-hwmon-vdn1.conf"
+ITEMS_append_mihawk += " iio-hwmon-vio0.conf"
+ITEMS_append_mihawk += " iio-hwmon-vio1.conf"
+ITEMS_append_mihawk += " iio-hwmon-vddra.conf"
+ITEMS_append_mihawk += " iio-hwmon-vddrb.conf"
+ITEMS_append_mihawk += " iio-hwmon-vddrc.conf"
+ITEMS_append_mihawk += " iio-hwmon-vddrd.conf"
+ITEMS_append_mihawk += " iio-hwmon-12v.conf"
+ITEMS_append_mihawk += " iio-hwmon-5v.conf"
+ITEMS_append_mihawk += " iio-hwmon-3v.conf"
+ITEMS_append_mihawk += " iio-hwmon-battery.conf"
+
+OCCS = " \
+        00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \
+        00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \
+        "
+OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf"
+OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}"
+
+ENVS = "obmc/hwmon/{0}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}"
+
+SYSTEMD_ENVIRONMENT_FILE_max31785-msl_append_ibm-ac-server = " obmc/hwmon-max31785/max31785.conf"
+SYSTEMD_LINK_max31785-msl_append_ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service"
+
+SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service"
+
+do_install_append_ibm-ac-server() {
+    install -d ${D}/${base_libdir}/udev/rules.d/
+    install ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/
+
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/start_max31785_hwmon.sh ${D}${bindir}
+}