From 49dfe571c691e1a6afe8957ff4bccbd7fcd20f66 Mon Sep 17 00:00:00 2001 From: Raptor Engineering Development Team Date: Fri, 19 Apr 2019 08:40:37 +0000 Subject: Update Talos layer configuration for latest OpenBMC version --- .../recipes-phosphor/host/ast-vga-disable.bb | 6 +- .../recipes-phosphor/sensors/phosphor-hwmon_git.bb | 2 - meta-rcs/meta-talos/conf/bblayers.conf.sample | 42 ++++--- meta-rcs/meta-talos/conf/distro/openbmc-talos.conf | 1 + meta-rcs/meta-talos/conf/layer.conf | 5 +- meta-rcs/meta-talos/conf/local.conf.sample | 2 +- meta-rcs/meta-talos/conf/machine/talos.conf | 6 +- .../recipes-kernel/linux/linux-aspeed/talos.cfg | 21 ++++ .../recipes-kernel/linux/linux-aspeed_%.bbappend | 2 + .../recipes-kernel/linux/linux-obmc/talos.cfg | 21 ---- .../recipes-kernel/linux/linux-obmc_%.bbappend | 2 - .../recipes-phosphor/chassis/avsbus-control.bb | 4 +- .../recipes-phosphor/chassis/vrm-control.bb | 4 +- .../recipes-phosphor/console/obmc-console.bbappend | 1 - .../console/obmc-console_%.bbappend | 1 + .../recipes-phosphor/fans/phosphor-fan%.bbappend | 33 ------ .../fans/phosphor-fan%/fan-watchdog-conflicts.conf | 2 - .../fans/phosphor-fan%/fan-watchdog-monitor.conf | 5 - .../obmc/phosphor-fan/phosphor-cooling-type-0.conf | 6 - .../phosphor-fan%/phosphor-cooling-type@.service | 13 --- .../fans/phosphor-fan-control-fan-config%.bbappend | 1 - .../phosphor-fan-control-fan-config%/fans.yaml | 31 ------ ...phosphor-fan-control-fan-config-native.bbappend | 1 + .../fans.yaml | 31 ++++++ .../fans/phosphor-fan/fan-watchdog-conflicts.conf | 2 + .../fans/phosphor-fan/fan-watchdog-monitor.conf | 5 + .../obmc/phosphor-fan/phosphor-cooling-type-0.conf | 6 + .../phosphor-fan/phosphor-cooling-type@.service | 13 +++ .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 33 ++++++ .../fans/talos-fan-policy-native.bb | 4 +- .../recipes-phosphor/fans/talos-fan-watchdog.bb | 4 +- .../fans/talos-thermal-policy-native.bb | 4 +- .../images/obmc-phosphor-image.bbappend | 2 +- .../ipmi/phosphor-ipmi-host.bbappend | 48 -------- .../ipmi/phosphor-ipmi-host_%.bbappend | 48 ++++++++ .../ipmi/talos-ipmi-inventory-map-native.bb | 4 +- .../leds/talos-led-manager-config-native.bb | 5 +- .../recipes-phosphor/mboxd/mboxd.bbappend | 1 - .../recipes-phosphor/mboxd/mboxd_%.bbappend | 1 + .../sensors/phosphor-hwmon%.bbappend | 25 ----- .../phosphor-hwmon%/obmc/hwmon-max31785/talos.conf | 3 - .../apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf | 16 --- .../i2c@1e78a000/i2c-bus@440/power-supply@68.conf | 23 ---- .../i2c@1e78a000/i2c-bus@440/power-supply@69.conf | 23 ---- .../apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf | 3 - .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 123 --------------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 123 --------------------- .../sensors/phosphor-hwmon/70-hwmon.rules | 4 +- .../sensors/phosphor-hwmon/70-iio.rules | 1 - .../phosphor-hwmon/obmc/hwmon-max31785/talos.conf | 3 + .../apb/bus@1e78a000/i2c-bus@440/max31785@52.conf | 16 +++ .../bus@1e78a000/i2c-bus@440/power-supply@68.conf | 23 ++++ .../bus@1e78a000/i2c-bus@440/power-supply@69.conf | 23 ++++ .../apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf | 3 + .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 123 +++++++++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 123 +++++++++++++++++++++ .../xyz.openbmc_project.Hwmon@.service | 5 +- .../sensors/phosphor-hwmon_%.bbappend | 25 +++++ .../recipes-phosphor/workbook/talos-config.bb | 5 - .../recipes-phosphor/workbook/talos-config_git.bb | 6 + 60 files changed, 568 insertions(+), 554 deletions(-) create mode 100644 meta-rcs/meta-talos/conf/distro/openbmc-talos.conf create mode 100644 meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed/talos.cfg create mode 100644 meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc/talos.cfg delete mode 100644 meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/console/obmc-console.bbappend create mode 100644 meta-rcs/meta-talos/recipes-phosphor/console/obmc-console_%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend delete mode 100755 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml create mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend create mode 100755 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml create mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service create mode 100644 meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend create mode 100644 meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd.bbappend create mode 100644 meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd_%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/talos.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@68.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@69.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/talos.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@68.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@69.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf create mode 100644 meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend delete mode 100644 meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config.bb create mode 100644 meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config_git.bb diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb index 618a75658..fc5b567be 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/ast-vga-disable.bb @@ -2,8 +2,12 @@ SUMMARY = "Talos II VGA Disable" DESCRIPTION = "Talos II power on VGA disable controller" PR = "r0" +LICENSE = "LGPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \ + file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ + " + inherit obmc-phosphor-systemd -inherit obmc-phosphor-license PROVIDES += 'virtual/talos-ast-vga-disable' RPROVIDES_${PN} += 'virtual-talos-ast-vga-disable' diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb index b20dcf433..cddad0afe 100644 --- a/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-hwmon_git.bb @@ -36,7 +36,6 @@ RDEPENDS_max31785-msl = "${VIRTUAL-RUNTIME_base-utils} i2c-tools" SRC_URI += "git://scm.raptorcs.com/scm/git/phosphor-hwmon;protocol=https;branch=04-19-2018" SRC_URI += "file://70-hwmon.rules" -SRC_URI += "file://70-iio.rules" SRC_URI += "file://start_hwmon.sh" SRCREV = "5c014d2bb76f6f6d51aecf31bea95cb9ed9b1953" @@ -47,7 +46,6 @@ do_install_append() { install -d ${D}/${base_libdir}/udev/rules.d/ install ${WORKDIR}/70-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ - install ${WORKDIR}/70-iio.rules ${D}/${base_libdir}/udev/rules.d/ install -d ${D}${bindir} install -m 0755 ${WORKDIR}/start_hwmon.sh ${D}${bindir} diff --git a/meta-rcs/meta-talos/conf/bblayers.conf.sample b/meta-rcs/meta-talos/conf/bblayers.conf.sample index 986f6663d..4c5f2c667 100644 --- a/meta-rcs/meta-talos/conf/bblayers.conf.sample +++ b/meta-rcs/meta-talos/conf/bblayers.conf.sample @@ -1,37 +1,33 @@ # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "7" +LCONF_VERSION = "8" BBPATH = "${TOPDIR}" BBFILES ?= "" BBLAYERS ?= " \ ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/import-layers/meta-openembedded/meta-oe \ - ##OEROOT##/import-layers/meta-openembedded/meta-networking \ - ##OEROOT##/import-layers/meta-openembedded/meta-perl \ - ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ - ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \ - ##OEROOT##/meta-openbmc-machines/meta-openpower \ - ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs \ - ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ibm \ + ##OEROOT##/meta-rcs \ + ##OEROOT##/meta-rcs/meta-talos \ " BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta \ - ##OEROOT##/meta-poky \ - ##OEROOT##/import-layers/meta-openembedded/meta-oe \ - ##OEROOT##/import-layers/meta-openembedded/meta-networking \ - ##OEROOT##/import-layers/meta-openembedded/meta-perl \ - ##OEROOT##/import-layers/meta-openembedded/meta-python \ - ##OEROOT##/import-layers/meta-virtualization \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ ##OEROOT##/meta-phosphor \ - ##OEROOT##/meta-openbmc-bsp/meta-aspeed \ - ##OEROOT##/meta-openbmc-bsp/meta-aspeed/meta-ast2500 \ - ##OEROOT##/meta-openbmc-machines/meta-openpower \ - ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs \ - ##OEROOT##/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ibm \ + ##OEROOT##/meta-rcs \ + ##OEROOT##/meta-rcs/meta-talos \ " diff --git a/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf b/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf new file mode 100644 index 000000000..2570a9a19 --- /dev/null +++ b/meta-rcs/meta-talos/conf/distro/openbmc-talos.conf @@ -0,0 +1 @@ +require conf/distro/openbmc-openpower.conf diff --git a/meta-rcs/meta-talos/conf/layer.conf b/meta-rcs/meta-talos/conf/layer.conf index 774c01bca..093a341b9 100644 --- a/meta-rcs/meta-talos/conf/layer.conf +++ b/meta-rcs/meta-talos/conf/layer.conf @@ -5,5 +5,6 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "talos" -BBFILE_PATTERN_talos = "" +BBFILE_COLLECTIONS += "talos-layer" +BBFILE_PATTERN_talos-layer = "" +LAYERSERIES_COMPAT_talos-layer = "thud warrior" diff --git a/meta-rcs/meta-talos/conf/local.conf.sample b/meta-rcs/meta-talos/conf/local.conf.sample index 77399ab01..9c49a4fa3 100644 --- a/meta-rcs/meta-talos/conf/local.conf.sample +++ b/meta-rcs/meta-talos/conf/local.conf.sample @@ -63,7 +63,7 @@ MACHINE ??= "talos" # Ultimately when creating custom policy, people will likely end up subclassing # these defaults. # -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "openbmc-talos" # As an example of a subclass there is a "bleeding" edge policy configuration # where many versions are set to the absolute latest code from the upstream # source control systems. This is just mentioned here as an example, its not diff --git a/meta-rcs/meta-talos/conf/machine/talos.conf b/meta-rcs/meta-talos/conf/machine/talos.conf index 352dea78e..60684da70 100644 --- a/meta-rcs/meta-talos/conf/machine/talos.conf +++ b/meta-rcs/meta-talos/conf/machine/talos.conf @@ -16,14 +16,14 @@ PHOSPHOR_MRW_URI = "git://scm.raptorcs.com/scm/git/talos-xml;protocol=https" PHOSPHOR_MRW_REV = "572148010e4bf8dbf9c3578bd5c1ca17d13cee73" # Inhibit phosphor-hwmon-config-mrw -VIRTUAL-RUNTIME_phosphor-hwmon-config = "" +VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = "" # Inhibit phosphor-fan-presence-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ "phosphor-fan-presence-config-native" # Inhibit phosphor-fan-control-fan-config-mrw-native -PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config = \ +PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \ "phosphor-fan-control-fan-config-native" DISTRO_FEATURES_append = "\ diff --git a/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed/talos.cfg b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed/talos.cfg new file mode 100644 index 000000000..8182c7a23 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed/talos.cfg @@ -0,0 +1,21 @@ +CONFIG_HWMON=y +CONFIG_SENSORS_TMP421=y +CONFIG_SENSORS_MAX31785=y +CONFIG_SENSORS_W83773G=y +CONFIG_RTC_DRV_RV8803=y + +CONFIG_GPIOLIB=y +CONFIG_PWM=y +CONFIG_PWM_GPIO=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_PWM=y + +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_LL_UART_8250=y +CONFIG_DEBUG_UART_PHYS=0x1e784000 +CONFIG_DEBUG_UART_VIRT=0xe8784000 +CONFIG_EARLY_PRINTK=y + +CONFIG_HZ=1000 +CONFIG_SCHED_HRTICK=y +CONFIG_HIGH_RES_TIMERS=y diff --git a/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend new file mode 100644 index 000000000..123c6ad79 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend_talos := "${THISDIR}/${PN}:" +SRC_URI += "file://talos.cfg" diff --git a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc/talos.cfg b/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc/talos.cfg deleted file mode 100644 index 8182c7a23..000000000 --- a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc/talos.cfg +++ /dev/null @@ -1,21 +0,0 @@ -CONFIG_HWMON=y -CONFIG_SENSORS_TMP421=y -CONFIG_SENSORS_MAX31785=y -CONFIG_SENSORS_W83773G=y -CONFIG_RTC_DRV_RV8803=y - -CONFIG_GPIOLIB=y -CONFIG_PWM=y -CONFIG_PWM_GPIO=y -CONFIG_LEDS_CLASS=y -CONFIG_LEDS_PWM=y - -CONFIG_DEBUG_LL=y -CONFIG_DEBUG_LL_UART_8250=y -CONFIG_DEBUG_UART_PHYS=0x1e784000 -CONFIG_DEBUG_UART_VIRT=0xe8784000 -CONFIG_EARLY_PRINTK=y - -CONFIG_HZ=1000 -CONFIG_SCHED_HRTICK=y -CONFIG_HIGH_RES_TIMERS=y diff --git a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend deleted file mode 100644 index 8ebf9d442..000000000 --- a/meta-rcs/meta-talos/recipes-kernel/linux/linux-obmc_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:" -SRC_URI += "file://talos.cfg" diff --git a/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb b/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb index e74682dba..a9958e459 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-rcs/meta-talos/recipes-phosphor/chassis/avsbus-control.bb @@ -1,8 +1,10 @@ SUMMARY = "Talos II AVSBus control" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + inherit obmc-phosphor-systemd -inherit obmc-phosphor-license RDEPENDS_${PN} += "i2c-tools bash" diff --git a/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb b/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb index e2eb9f3b9..b9b07da8b 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-rcs/meta-talos/recipes-phosphor/chassis/vrm-control.bb @@ -2,8 +2,10 @@ SUMMARY = "Talos II VRM Overrides" DESCRIPTION = "Sets Talos II VRMs to custom voltages" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + inherit obmc-phosphor-systemd -inherit obmc-phosphor-license RDEPENDS_${PN} += "i2c-tools bash" diff --git a/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console.bbappend b/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console.bbappend deleted file mode 100644 index 5acf3af89..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend_talos := "${THISDIR}/${PN}:" diff --git a/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console_%.bbappend new file mode 100644 index 000000000..5acf3af89 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/console/obmc-console_%.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend_talos := "${THISDIR}/${PN}:" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%.bbappend deleted file mode 100644 index 76aad1558..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -# Package configuration -FAN_PACKAGES += " \ - phosphor-cooling-type \ -" - -PACKAGECONFIG += "cooling-type" - -RDEPENDS_phosphor-cooling-type += "libevdev" - -TMPL_COOLING = "phosphor-cooling-type@.service" -INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" -COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}" -FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" - -FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" -SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" - -COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" - -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" - -#These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control-init += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor-init += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" - -#These services need to be stopped when watchdog expires -SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf deleted file mode 100644 index 90b1e810e..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-conflicts.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Unit] -Conflicts=obmc-fan-watchdog-takeover.target diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf deleted file mode 100644 index 240336343..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/fan-watchdog-monitor.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -#These overrides allow the fan watchdog to take over when this service dies -OnFailure=talos-fan-watchdog-monitor@%n.service -StartLimitIntervalSec=5 -StartLimitBurst=3 diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf deleted file mode 100644 index 6b74301d1..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ /dev/null @@ -1,6 +0,0 @@ -OBJPATH="--path=/system/chassis" -AIR="--air" -WATER="" -DEVICE="" -CODE="" - diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service deleted file mode 100644 index 9a4f8df42..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan%/phosphor-cooling-type@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Phosphor Cooling Type -Wants=mapper-wait@-xyz-openbmc_project-inventory.service -After=mapper-wait@-xyz-openbmc_project-inventory.service -ConditionPathExists={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf - -[Service] -EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf -ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}} -SyslogIdentifier=phosphor-cooling-type - -[Install] -RequiredBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend deleted file mode 100644 index 72d991c7e..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%.bbappend +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml deleted file mode 100755 index 5bda3ccdb..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config%/fans.yaml +++ /dev/null @@ -1,31 +0,0 @@ -fans: - - inventory: /system/chassis/motherboard/fan4 - cooling_zone: 0 - cooling_profile: all - sensors: - - fan4 - - inventory: /system/chassis/motherboard/fan5 - cooling_zone: 1 - cooling_profile: air - sensors: - - fan5 - - inventory: /system/chassis/motherboard/fan0 - cooling_zone: 2 - cooling_profile: all - sensors: - - fan0 - - inventory: /system/chassis/motherboard/fan1 - cooling_zone: 2 - cooling_profile: air - sensors: - - fan1 - - inventory: /system/chassis/motherboard/fan2 - cooling_zone: 2 - cooling_profile: air - sensors: - - fan2 - - inventory: /system/chassis/motherboard/fan3 - cooling_zone: 2 - cooling_profile: air - sensors: - - fan3 diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend new file mode 100644 index 000000000..72d991c7e --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend @@ -0,0 +1 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml new file mode 100755 index 000000000..5bda3ccdb --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-control-fan-config-native/fans.yaml @@ -0,0 +1,31 @@ +fans: + - inventory: /system/chassis/motherboard/fan4 + cooling_zone: 0 + cooling_profile: all + sensors: + - fan4 + - inventory: /system/chassis/motherboard/fan5 + cooling_zone: 1 + cooling_profile: air + sensors: + - fan5 + - inventory: /system/chassis/motherboard/fan0 + cooling_zone: 2 + cooling_profile: all + sensors: + - fan0 + - inventory: /system/chassis/motherboard/fan1 + cooling_zone: 2 + cooling_profile: air + sensors: + - fan1 + - inventory: /system/chassis/motherboard/fan2 + cooling_zone: 2 + cooling_profile: air + sensors: + - fan2 + - inventory: /system/chassis/motherboard/fan3 + cooling_zone: 2 + cooling_profile: air + sensors: + - fan3 diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf new file mode 100644 index 000000000..90b1e810e --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf @@ -0,0 +1,2 @@ +[Unit] +Conflicts=obmc-fan-watchdog-takeover.target diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf new file mode 100644 index 000000000..240336343 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf @@ -0,0 +1,5 @@ +[Unit] +#These overrides allow the fan watchdog to take over when this service dies +OnFailure=talos-fan-watchdog-monitor@%n.service +StartLimitIntervalSec=5 +StartLimitBurst=3 diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf new file mode 100644 index 000000000..6b74301d1 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/obmc/phosphor-fan/phosphor-cooling-type-0.conf @@ -0,0 +1,6 @@ +OBJPATH="--path=/system/chassis" +AIR="--air" +WATER="" +DEVICE="" +CODE="" + diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service new file mode 100644 index 000000000..9a4f8df42 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/phosphor-cooling-type@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Phosphor Cooling Type +Wants=mapper-wait@-xyz-openbmc_project-inventory.service +After=mapper-wait@-xyz-openbmc_project-inventory.service +ConditionPathExists={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf + +[Service] +EnvironmentFile={envfiledir}/obmc/phosphor-fan/phosphor-cooling-type-%i.conf +ExecStart=/usr/bin/env phosphor-cooling-type ${{OBJPATH}} ${{AIR}} ${{WATER}} ${{DEVICE}} ${{CODE}} +SyslogIdentifier=phosphor-cooling-type + +[Install] +RequiredBy={SYSTEMD_DEFAULT_TARGET} diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend new file mode 100644 index 000000000..76aad1558 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -0,0 +1,33 @@ +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +# Package configuration +FAN_PACKAGES += " \ + phosphor-cooling-type \ +" + +PACKAGECONFIG += "cooling-type" + +RDEPENDS_phosphor-cooling-type += "libevdev" + +TMPL_COOLING = "phosphor-cooling-type@.service" +INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" +COOLING_TGT = "${SYSTEMD_DEFAULT_TARGET}" +FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" + +FILES_phosphor-cooling-type = "${sbindir}/phosphor-cooling-type" +SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}" +SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" + +COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" + +SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" + +#These services are protected by the watchdog +SYSTEMD_OVERRIDE_phosphor-fan-control-init += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor-init += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" + +#These services need to be stopped when watchdog expires +SYSTEMD_OVERRIDE_phosphor-fan-control += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE_phosphor-fan-monitor += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb index df6848d3c..d2a283870 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy-native.bb @@ -1,8 +1,10 @@ SUMMARY = "Fan policy for Talos" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + inherit native -inherit obmc-phosphor-license inherit phosphor-dbus-monitor SRC_URI += "file://air-cooled.yaml" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb index 19be898dd..699677d47 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-watchdog.bb @@ -1,7 +1,9 @@ SUMMARY = "Talos fan watchdog services" PR = "r1" -inherit obmc-phosphor-license +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + inherit obmc-phosphor-systemd RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb index 1b20e53a5..c327bb887 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/talos-thermal-policy-native.bb @@ -1,8 +1,10 @@ SUMMARY = "Thermal policy for Talos" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + inherit native -inherit obmc-phosphor-license inherit phosphor-dbus-monitor SRC_URI += "file://thermal-policy.yaml" diff --git a/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend index aa57bbfe6..772685db7 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd" +OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd liberation-fonts uart-render-controller" diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend deleted file mode 100644 index 1f0254d0f..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host.bbappend +++ /dev/null @@ -1,48 +0,0 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI_append = " file://occ_sensors.hardcoded.yaml \ - file://dev_id.json \ - file://dcmi_sensors.json \ - file://power_reading.json \ - file://hwmon_sensors.hardcoded.yaml \ - " -inherit image_version - -# Calculate the auxiliary firmware revision to be updated in the dev_id.json -# file. It is calculated from the VERSION_ID field which currently has two -# formats. The revision field is 4 bytes, the first two bytes represent the -# count of commits from the tagging and next two bytes represent the version. -# Both fields are represented in BCD encoded format, so 9999 is the maximum -# value both fields can take. With the format "v2.1-216-ga78ace8", Petitboot -# would display the firmware revision as "Firmware version: 2.01.02160000", -# "0216" is count and the revision is "0000". With the format -# "ibm-v2.0-10-r41-0-gd0c319e" Petitboot would display the firmware revision -# as "Firmware version: 2.00.00100041", "0010" is count and the revision -# is "0041". - -python do_populate_aux_version() { - import json - import re - version_id = do_get_version(d) - - # count from the commit version - count = re.findall("-(\d{1,4})-", version_id) - - release = re.findall("-r(\d{1,4})", version_id) - if release: - auxVer = count[0] + "{0:0>4}".format(release[0]) - else: - auxVer = count[0] + "0000" - - # Update dev_id.json with the auxiliary firmware revision - workdir = d.getVar('WORKDIR', True) - file = os.path.join(workdir, 'dev_id.json') - - with open(file, "r+") as jsonFile: - data = json.load(jsonFile) - jsonFile.seek(0) - jsonFile.truncate() - data["aux"] = int(auxVer, 16) - json.dump(data, jsonFile) -} - -addtask populate_aux_version after do_configure before do_compile diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend new file mode 100644 index 000000000..1f0254d0f --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -0,0 +1,48 @@ +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI_append = " file://occ_sensors.hardcoded.yaml \ + file://dev_id.json \ + file://dcmi_sensors.json \ + file://power_reading.json \ + file://hwmon_sensors.hardcoded.yaml \ + " +inherit image_version + +# Calculate the auxiliary firmware revision to be updated in the dev_id.json +# file. It is calculated from the VERSION_ID field which currently has two +# formats. The revision field is 4 bytes, the first two bytes represent the +# count of commits from the tagging and next two bytes represent the version. +# Both fields are represented in BCD encoded format, so 9999 is the maximum +# value both fields can take. With the format "v2.1-216-ga78ace8", Petitboot +# would display the firmware revision as "Firmware version: 2.01.02160000", +# "0216" is count and the revision is "0000". With the format +# "ibm-v2.0-10-r41-0-gd0c319e" Petitboot would display the firmware revision +# as "Firmware version: 2.00.00100041", "0010" is count and the revision +# is "0041". + +python do_populate_aux_version() { + import json + import re + version_id = do_get_version(d) + + # count from the commit version + count = re.findall("-(\d{1,4})-", version_id) + + release = re.findall("-r(\d{1,4})", version_id) + if release: + auxVer = count[0] + "{0:0>4}".format(release[0]) + else: + auxVer = count[0] + "0000" + + # Update dev_id.json with the auxiliary firmware revision + workdir = d.getVar('WORKDIR', True) + file = os.path.join(workdir, 'dev_id.json') + + with open(file, "r+") as jsonFile: + data = json.load(jsonFile) + jsonFile.seek(0) + jsonFile.truncate() + data["aux"] = int(auxVer, 16) + json.dump(data, jsonFile) +} + +addtask populate_aux_version after do_configure before do_compile diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb b/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb index 7dc9393fb..b8894a4d8 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/talos-ipmi-inventory-map-native.bb @@ -1,8 +1,10 @@ SUMMARY = "Talos II IPMI to DBus Inventory mapping." PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + inherit native -inherit obmc-phosphor-license inherit phosphor-ipmi-fru SRC_URI += "file://config.yaml" diff --git a/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb b/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb index dd8502ca3..680a9ca0c 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb +++ b/meta-rcs/meta-talos/recipes-phosphor/leds/talos-led-manager-config-native.bb @@ -1,9 +1,10 @@ SUMMARY = "Phosphor LED Group Management for Talos II" PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${IBMBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" + inherit native -inherit obmc-phosphor-utils -inherit obmc-phosphor-license PROVIDES += "virtual/phosphor-led-manager-config-native" diff --git a/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd.bbappend b/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd.bbappend deleted file mode 100644 index 8b6248a46..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd.bbappend +++ /dev/null @@ -1 +0,0 @@ -MBOXD_FLASH_SIZE = "64M" diff --git a/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd_%.bbappend new file mode 100644 index 000000000..8b6248a46 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -0,0 +1 @@ +MBOXD_FLASH_SIZE = "64M" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend deleted file mode 100644 index b794bef1a..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -TALOS_CHIPS = " \ - i2c@1e78a000/i2c-bus@440/max31785@52 \ - i2c@1e78a000/i2c-bus@440/w83773g@4c \ - i2c@1e78a000/i2c-bus@440/power-supply@68 \ - i2c@1e78a000/i2c-bus@440/power-supply@69 \ - " -TALOS_ITEMSFMT = "ahb/apb/{0}.conf" -TALOS_ITEMS = "${@compose_list(d, 'TALOS_ITEMSFMT', 'TALOS_CHIPS')}" - -TALOS_OCCS = " \ - 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ - 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ - " - -TALOS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" -TALOS_OCCITEMS = "${@compose_list(d, 'TALOS_OCCSFMT', 'TALOS_OCCS')}" - -ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'TALOS_ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'TALOS_OCCITEMS')}" - -SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/talos.conf" -SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:${SYSTEMD_DEFAULT_TARGET}.wants/phosphor-max31785-msl@talos.service" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/talos.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/talos.conf deleted file mode 100644 index 0fc81037c..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon-max31785/talos.conf +++ /dev/null @@ -1,3 +0,0 @@ -BUS=12 -PATHS="/system/chassis/motherboard/fan0 /system/chassis/motherboard/fan1 /system/chassis/motherboard/fan2 /system/chassis/motherboard/fan3 /system/chassis/motherboard/fan4 /system/chassis/motherboard/fan5" -REVISION=0x3030 diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf deleted file mode 100644 index 204de8b8b..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/max31785@52.conf +++ /dev/null @@ -1,16 +0,0 @@ -LABEL_fan1 = "fan0" -LABEL_fan2 = "fan1" -LABEL_fan3 = "fan2" -LABEL_fan4 = "fan3" -LABEL_fan5 = "fan5" -LABEL_fan6 = "fan4" - -ENABLE_fan1 = "1" -ENABLE_fan2 = "1" -ENABLE_fan3 = "1" -ENABLE_fan4 = "1" -ENABLE_fan5 = "1" -ENABLE_fan6 = "1" - -# Legacy mode -TARGET_MODE = "RPM" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@68.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@68.conf deleted file mode 100644 index e463b517c..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@68.conf +++ /dev/null @@ -1,23 +0,0 @@ -LABEL_in1="ps1_input_voltage" -WARNHI_in1="290000" -WARNLO_in1="200000" -CRITHI_in1="300000" -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="2350000000" -WARNLO_power1="0" -CRITHI_power1="2500000000" -CRITLO_power1="0" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@69.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@69.conf deleted file mode 100644 index 2fadbdec0..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/power-supply@69.conf +++ /dev/null @@ -1,23 +0,0 @@ -LABEL_in1="ps0_input_voltage" -WARNHI_in1="290000" -WARNLO_in1="200000" -CRITHI_in1="300000" -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="2350000000" -WARNLO_power1="0" -CRITHI_power1="2500000000" -CRITLO_power1="0" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf deleted file mode 100644 index 506687fcd..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/ahb/apb/i2c@1e78a000/i2c-bus@440/w83773g@4c.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1 = "pcie" -LABEL_temp2 = "cpu_1_ambient" -LABEL_temp3 = "ambient" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index 7752d2bbb..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,123 +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_freq1 = "label" -MODE_freq2 = "label" -MODE_freq3 = "label" -MODE_freq4 = "label" -MODE_freq5 = "label" -MODE_freq6 = "label" -MODE_freq7 = "label" -MODE_freq8 = "label" -MODE_freq9 = "label" -MODE_freq10 = "label" -MODE_freq11 = "label" -MODE_freq12 = "label" -MODE_freq13 = "label" -MODE_freq14 = "label" -MODE_freq15 = "label" -MODE_freq16 = "label" -MODE_freq17 = "label" -MODE_freq18 = "label" -MODE_freq19 = "label" -MODE_freq20 = "label" -MODE_freq21 = "label" -MODE_freq22 = "label" -MODE_freq23 = "label" -MODE_freq24 = "label" -MODE_freq25 = "label" -MODE_freq26 = "label" -MODE_freq27 = "label" -MODE_freq28 = "label" -MODE_freq29 = "label" -MODE_freq30 = "label" -MODE_freq31 = "label" -MODE_freq32 = "label" -LABEL_temp91 = "p0_core0_temp" -LABEL_temp92 = "p0_core1_temp" -LABEL_temp93 = "p0_core2_temp" -LABEL_temp94 = "p0_core3_temp" -LABEL_temp95 = "p0_core4_temp" -LABEL_temp96 = "p0_core5_temp" -LABEL_temp97 = "p0_core6_temp" -LABEL_temp98 = "p0_core7_temp" -LABEL_temp99 = "p0_core8_temp" -LABEL_temp100 = "p0_core9_temp" -LABEL_temp101 = "p0_core10_temp" -LABEL_temp102 = "p0_core11_temp" -LABEL_temp103 = "p0_core12_temp" -LABEL_temp104 = "p0_core13_temp" -LABEL_temp105 = "p0_core14_temp" -LABEL_temp106 = "p0_core15_temp" -LABEL_temp107 = "p0_core16_temp" -LABEL_temp108 = "p0_core17_temp" -LABEL_temp109 = "p0_core18_temp" -LABEL_temp110 = "p0_core19_temp" -LABEL_temp111 = "p0_core20_temp" -LABEL_temp112 = "p0_core21_temp" -LABEL_temp113 = "p0_core22_temp" -LABEL_temp114 = "p0_core23_temp" -LABEL_temp27 = "dimm0_temp" -LABEL_temp28 = "dimm1_temp" -LABEL_temp29 = "dimm2_temp" -LABEL_temp30 = "dimm3_temp" -LABEL_temp31 = "dimm4_temp" -LABEL_temp32 = "dimm5_temp" -LABEL_temp33 = "dimm6_temp" -LABEL_temp34 = "dimm7_temp" -LABEL_freq91 = "p0_core0_freq" -LABEL_freq92 = "p0_core1_freq" -LABEL_freq93 = "p0_core2_freq" -LABEL_freq94 = "p0_core3_freq" -LABEL_freq95 = "p0_core4_freq" -LABEL_freq96 = "p0_core5_freq" -LABEL_freq97 = "p0_core6_freq" -LABEL_freq98 = "p0_core7_freq" -LABEL_freq99 = "p0_core8_freq" -LABEL_freq100 = "p0_core9_freq" -LABEL_freq101 = "p0_core10_freq" -LABEL_freq102 = "p0_core11_freq" -LABEL_freq103 = "p0_core12_freq" -LABEL_freq104 = "p0_core13_freq" -LABEL_freq105 = "p0_core14_freq" -LABEL_freq106 = "p0_core15_freq" -LABEL_freq107 = "p0_core16_freq" -LABEL_freq108 = "p0_core17_freq" -LABEL_freq109 = "p0_core18_freq" -LABEL_freq110 = "p0_core19_freq" -LABEL_freq111 = "p0_core20_freq" -LABEL_freq112 = "p0_core21_freq" -LABEL_freq113 = "p0_core22_freq" -LABEL_freq114 = "p0_core23_freq" -LABEL_power2 = "p0_power" -LABEL_power3 = "p0_vdd_power" -LABEL_power4 = "p0_vdn_power" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf deleted file mode 100644 index d90820d8c..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ /dev/null @@ -1,123 +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_freq1 = "label" -MODE_freq2 = "label" -MODE_freq3 = "label" -MODE_freq4 = "label" -MODE_freq5 = "label" -MODE_freq6 = "label" -MODE_freq7 = "label" -MODE_freq8 = "label" -MODE_freq9 = "label" -MODE_freq10 = "label" -MODE_freq11 = "label" -MODE_freq12 = "label" -MODE_freq13 = "label" -MODE_freq14 = "label" -MODE_freq15 = "label" -MODE_freq16 = "label" -MODE_freq17 = "label" -MODE_freq18 = "label" -MODE_freq19 = "label" -MODE_freq20 = "label" -MODE_freq21 = "label" -MODE_freq22 = "label" -MODE_freq23 = "label" -MODE_freq24 = "label" -MODE_freq25 = "label" -MODE_freq26 = "label" -MODE_freq27 = "label" -MODE_freq28 = "label" -MODE_freq29 = "label" -MODE_freq30 = "label" -MODE_freq31 = "label" -MODE_freq32 = "label" -LABEL_temp115 = "p1_core0_temp" -LABEL_temp116 = "p1_core1_temp" -LABEL_temp117 = "p1_core2_temp" -LABEL_temp118 = "p1_core3_temp" -LABEL_temp119 = "p1_core4_temp" -LABEL_temp120 = "p1_core5_temp" -LABEL_temp121 = "p1_core6_temp" -LABEL_temp122 = "p1_core7_temp" -LABEL_temp123 = "p1_core8_temp" -LABEL_temp124 = "p1_core9_temp" -LABEL_temp125 = "p1_core10_temp" -LABEL_temp126 = "p1_core11_temp" -LABEL_temp127 = "p1_core12_temp" -LABEL_temp128 = "p1_core13_temp" -LABEL_temp129 = "p1_core14_temp" -LABEL_temp130 = "p1_core15_temp" -LABEL_temp131 = "p1_core16_temp" -LABEL_temp132 = "p1_core17_temp" -LABEL_temp133 = "p1_core18_temp" -LABEL_temp134 = "p1_core19_temp" -LABEL_temp135 = "p1_core20_temp" -LABEL_temp136 = "p1_core21_temp" -LABEL_temp137 = "p1_core22_temp" -LABEL_temp138 = "p1_core23_temp" -LABEL_temp35 = "dimm8_temp" -LABEL_temp36 = "dimm9_temp" -LABEL_temp37 = "dimm10_temp" -LABEL_temp38 = "dimm11_temp" -LABEL_temp39 = "dimm12_temp" -LABEL_temp40 = "dimm13_temp" -LABEL_temp41 = "dimm14_temp" -LABEL_temp42 = "dimm15_temp" -LABEL_freq115 = "p1_core0_freq" -LABEL_freq116 = "p1_core1_freq" -LABEL_freq117 = "p1_core2_freq" -LABEL_freq118 = "p1_core3_freq" -LABEL_freq119 = "p1_core4_freq" -LABEL_freq120 = "p1_core5_freq" -LABEL_freq121 = "p1_core6_freq" -LABEL_freq122 = "p1_core7_freq" -LABEL_freq123 = "p1_core8_freq" -LABEL_freq124 = "p1_core9_freq" -LABEL_freq125 = "p1_core10_freq" -LABEL_freq126 = "p1_core11_freq" -LABEL_freq127 = "p1_core12_freq" -LABEL_freq128 = "p1_core13_freq" -LABEL_freq129 = "p1_core14_freq" -LABEL_freq130 = "p1_core15_freq" -LABEL_freq131 = "p1_core16_freq" -LABEL_freq132 = "p1_core17_freq" -LABEL_freq133 = "p1_core18_freq" -LABEL_freq134 = "p1_core19_freq" -LABEL_freq135 = "p1_core20_freq" -LABEL_freq136 = "p1_core21_freq" -LABEL_freq137 = "p1_core22_freq" -LABEL_freq138 = "p1_core23_freq" -LABEL_power2 = "p1_power" -LABEL_power3 = "p1_vdd_power" -LABEL_power4 = "p1_vdn_power" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules index 070d88f51..cdc9b9c54 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-hwmon.rules @@ -1 +1,3 @@ -SUBSYSTEM=="hwmon", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service" +SUBSYSTEM=="hwmon", ACTION=="add", DRIVERS!="occ-hwmon", PROGRAM="/bin/systemd-escape -p '%E{OF_FULLNAME}'", RUN="/bin/systemctl start xyz.openbmc_project.Hwmon@%c.service" +SUBSYSTEM=="hwmon", ACTION=="add", DRIVERS=="occ-hwmon", RUN="/usr/bin/start_hwmon.sh start %p %E{OF_FULLNAME}" +SUBSYSTEM=="hwmon", ACTION=="remove", RUN="/usr/bin/start_hwmon.sh stop %p %E{OF_FULLNAME}" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules deleted file mode 100644 index f332d11ac..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/70-iio.rules +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="iio", ACTION=="add", TAG+="systemd", ENV{SYSTEMD_WANTS}+="xyz.openbmc_project.Hwmon@%E{OF_FULLNAME}.service" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/talos.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/talos.conf new file mode 100644 index 000000000..0fc81037c --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/talos.conf @@ -0,0 +1,3 @@ +BUS=12 +PATHS="/system/chassis/motherboard/fan0 /system/chassis/motherboard/fan1 /system/chassis/motherboard/fan2 /system/chassis/motherboard/fan3 /system/chassis/motherboard/fan4 /system/chassis/motherboard/fan5" +REVISION=0x3030 diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf new file mode 100644 index 000000000..204de8b8b --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf @@ -0,0 +1,16 @@ +LABEL_fan1 = "fan0" +LABEL_fan2 = "fan1" +LABEL_fan3 = "fan2" +LABEL_fan4 = "fan3" +LABEL_fan5 = "fan5" +LABEL_fan6 = "fan4" + +ENABLE_fan1 = "1" +ENABLE_fan2 = "1" +ENABLE_fan3 = "1" +ENABLE_fan4 = "1" +ENABLE_fan5 = "1" +ENABLE_fan6 = "1" + +# Legacy mode +TARGET_MODE = "RPM" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@68.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@68.conf new file mode 100644 index 000000000..e463b517c --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@68.conf @@ -0,0 +1,23 @@ +LABEL_in1="ps1_input_voltage" +WARNHI_in1="290000" +WARNLO_in1="200000" +CRITHI_in1="300000" +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="2350000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@69.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@69.conf new file mode 100644 index 000000000..2fadbdec0 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/power-supply@69.conf @@ -0,0 +1,23 @@ +LABEL_in1="ps0_input_voltage" +WARNHI_in1="290000" +WARNLO_in1="200000" +CRITHI_in1="300000" +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="2350000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf new file mode 100644 index 000000000..506687fcd --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf @@ -0,0 +1,3 @@ +LABEL_temp1 = "pcie" +LABEL_temp2 = "cpu_1_ambient" +LABEL_temp3 = "ambient" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..7752d2bbb --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,123 @@ +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_freq1 = "label" +MODE_freq2 = "label" +MODE_freq3 = "label" +MODE_freq4 = "label" +MODE_freq5 = "label" +MODE_freq6 = "label" +MODE_freq7 = "label" +MODE_freq8 = "label" +MODE_freq9 = "label" +MODE_freq10 = "label" +MODE_freq11 = "label" +MODE_freq12 = "label" +MODE_freq13 = "label" +MODE_freq14 = "label" +MODE_freq15 = "label" +MODE_freq16 = "label" +MODE_freq17 = "label" +MODE_freq18 = "label" +MODE_freq19 = "label" +MODE_freq20 = "label" +MODE_freq21 = "label" +MODE_freq22 = "label" +MODE_freq23 = "label" +MODE_freq24 = "label" +MODE_freq25 = "label" +MODE_freq26 = "label" +MODE_freq27 = "label" +MODE_freq28 = "label" +MODE_freq29 = "label" +MODE_freq30 = "label" +MODE_freq31 = "label" +MODE_freq32 = "label" +LABEL_temp91 = "p0_core0_temp" +LABEL_temp92 = "p0_core1_temp" +LABEL_temp93 = "p0_core2_temp" +LABEL_temp94 = "p0_core3_temp" +LABEL_temp95 = "p0_core4_temp" +LABEL_temp96 = "p0_core5_temp" +LABEL_temp97 = "p0_core6_temp" +LABEL_temp98 = "p0_core7_temp" +LABEL_temp99 = "p0_core8_temp" +LABEL_temp100 = "p0_core9_temp" +LABEL_temp101 = "p0_core10_temp" +LABEL_temp102 = "p0_core11_temp" +LABEL_temp103 = "p0_core12_temp" +LABEL_temp104 = "p0_core13_temp" +LABEL_temp105 = "p0_core14_temp" +LABEL_temp106 = "p0_core15_temp" +LABEL_temp107 = "p0_core16_temp" +LABEL_temp108 = "p0_core17_temp" +LABEL_temp109 = "p0_core18_temp" +LABEL_temp110 = "p0_core19_temp" +LABEL_temp111 = "p0_core20_temp" +LABEL_temp112 = "p0_core21_temp" +LABEL_temp113 = "p0_core22_temp" +LABEL_temp114 = "p0_core23_temp" +LABEL_temp27 = "dimm0_temp" +LABEL_temp28 = "dimm1_temp" +LABEL_temp29 = "dimm2_temp" +LABEL_temp30 = "dimm3_temp" +LABEL_temp31 = "dimm4_temp" +LABEL_temp32 = "dimm5_temp" +LABEL_temp33 = "dimm6_temp" +LABEL_temp34 = "dimm7_temp" +LABEL_freq91 = "p0_core0_freq" +LABEL_freq92 = "p0_core1_freq" +LABEL_freq93 = "p0_core2_freq" +LABEL_freq94 = "p0_core3_freq" +LABEL_freq95 = "p0_core4_freq" +LABEL_freq96 = "p0_core5_freq" +LABEL_freq97 = "p0_core6_freq" +LABEL_freq98 = "p0_core7_freq" +LABEL_freq99 = "p0_core8_freq" +LABEL_freq100 = "p0_core9_freq" +LABEL_freq101 = "p0_core10_freq" +LABEL_freq102 = "p0_core11_freq" +LABEL_freq103 = "p0_core12_freq" +LABEL_freq104 = "p0_core13_freq" +LABEL_freq105 = "p0_core14_freq" +LABEL_freq106 = "p0_core15_freq" +LABEL_freq107 = "p0_core16_freq" +LABEL_freq108 = "p0_core17_freq" +LABEL_freq109 = "p0_core18_freq" +LABEL_freq110 = "p0_core19_freq" +LABEL_freq111 = "p0_core20_freq" +LABEL_freq112 = "p0_core21_freq" +LABEL_freq113 = "p0_core22_freq" +LABEL_freq114 = "p0_core23_freq" +LABEL_power2 = "p0_power" +LABEL_power3 = "p0_vdd_power" +LABEL_power4 = "p0_vdn_power" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..d90820d8c --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,123 @@ +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_freq1 = "label" +MODE_freq2 = "label" +MODE_freq3 = "label" +MODE_freq4 = "label" +MODE_freq5 = "label" +MODE_freq6 = "label" +MODE_freq7 = "label" +MODE_freq8 = "label" +MODE_freq9 = "label" +MODE_freq10 = "label" +MODE_freq11 = "label" +MODE_freq12 = "label" +MODE_freq13 = "label" +MODE_freq14 = "label" +MODE_freq15 = "label" +MODE_freq16 = "label" +MODE_freq17 = "label" +MODE_freq18 = "label" +MODE_freq19 = "label" +MODE_freq20 = "label" +MODE_freq21 = "label" +MODE_freq22 = "label" +MODE_freq23 = "label" +MODE_freq24 = "label" +MODE_freq25 = "label" +MODE_freq26 = "label" +MODE_freq27 = "label" +MODE_freq28 = "label" +MODE_freq29 = "label" +MODE_freq30 = "label" +MODE_freq31 = "label" +MODE_freq32 = "label" +LABEL_temp115 = "p1_core0_temp" +LABEL_temp116 = "p1_core1_temp" +LABEL_temp117 = "p1_core2_temp" +LABEL_temp118 = "p1_core3_temp" +LABEL_temp119 = "p1_core4_temp" +LABEL_temp120 = "p1_core5_temp" +LABEL_temp121 = "p1_core6_temp" +LABEL_temp122 = "p1_core7_temp" +LABEL_temp123 = "p1_core8_temp" +LABEL_temp124 = "p1_core9_temp" +LABEL_temp125 = "p1_core10_temp" +LABEL_temp126 = "p1_core11_temp" +LABEL_temp127 = "p1_core12_temp" +LABEL_temp128 = "p1_core13_temp" +LABEL_temp129 = "p1_core14_temp" +LABEL_temp130 = "p1_core15_temp" +LABEL_temp131 = "p1_core16_temp" +LABEL_temp132 = "p1_core17_temp" +LABEL_temp133 = "p1_core18_temp" +LABEL_temp134 = "p1_core19_temp" +LABEL_temp135 = "p1_core20_temp" +LABEL_temp136 = "p1_core21_temp" +LABEL_temp137 = "p1_core22_temp" +LABEL_temp138 = "p1_core23_temp" +LABEL_temp35 = "dimm8_temp" +LABEL_temp36 = "dimm9_temp" +LABEL_temp37 = "dimm10_temp" +LABEL_temp38 = "dimm11_temp" +LABEL_temp39 = "dimm12_temp" +LABEL_temp40 = "dimm13_temp" +LABEL_temp41 = "dimm14_temp" +LABEL_temp42 = "dimm15_temp" +LABEL_freq115 = "p1_core0_freq" +LABEL_freq116 = "p1_core1_freq" +LABEL_freq117 = "p1_core2_freq" +LABEL_freq118 = "p1_core3_freq" +LABEL_freq119 = "p1_core4_freq" +LABEL_freq120 = "p1_core5_freq" +LABEL_freq121 = "p1_core6_freq" +LABEL_freq122 = "p1_core7_freq" +LABEL_freq123 = "p1_core8_freq" +LABEL_freq124 = "p1_core9_freq" +LABEL_freq125 = "p1_core10_freq" +LABEL_freq126 = "p1_core11_freq" +LABEL_freq127 = "p1_core12_freq" +LABEL_freq128 = "p1_core13_freq" +LABEL_freq129 = "p1_core14_freq" +LABEL_freq130 = "p1_core15_freq" +LABEL_freq131 = "p1_core16_freq" +LABEL_freq132 = "p1_core17_freq" +LABEL_freq133 = "p1_core18_freq" +LABEL_freq134 = "p1_core19_freq" +LABEL_freq135 = "p1_core20_freq" +LABEL_freq136 = "p1_core21_freq" +LABEL_freq137 = "p1_core22_freq" +LABEL_freq138 = "p1_core23_freq" +LABEL_power2 = "p1_power" +LABEL_power3 = "p1_vdd_power" +LABEL_power4 = "p1_vdn_power" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service index 8dca3ad4b..b930b5711 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/xyz.openbmc_project.Hwmon@.service @@ -1,11 +1,10 @@ [Unit] Description=Phosphor Hwmon Poller ConditionFileNotEmpty=/etc/default/obmc/hwmon/%I.conf -StopWhenUnneeded=true After=xyz.openbmc_project.ObjectMapper.service [Service] -Restart=always -ExecStart=/usr/bin/env phosphor-hwmon-readd -o %f +Restart=on-failure +ExecStart=/usr/bin/env phosphor-hwmon-readd -o %I SyslogIdentifier=phosphor-hwmon-readd EnvironmentFile=/etc/default/obmc/hwmon/%I.conf diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend new file mode 100644 index 000000000..feacfe437 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -0,0 +1,25 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +TALOS_CHIPS = " \ + bus@1e78a000/i2c-bus@440/max31785@52 \ + bus@1e78a000/i2c-bus@440/w83773g@4c \ + bus@1e78a000/i2c-bus@440/power-supply@68 \ + bus@1e78a000/i2c-bus@440/power-supply@69 \ + " +TALOS_ITEMSFMT = "ahb/apb/{0}.conf" +TALOS_ITEMS = "${@compose_list(d, 'TALOS_ITEMSFMT', 'TALOS_CHIPS')}" + +TALOS_OCCS = " \ + 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ + 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + " + +TALOS_OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +TALOS_OCCITEMS = "${@compose_list(d, 'TALOS_OCCSFMT', 'TALOS_OCCS')}" + +ENVS = "obmc/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'TALOS_ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'TALOS_OCCITEMS')}" + +SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/talos.conf" +SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:${SYSTEMD_DEFAULT_TARGET}.wants/phosphor-max31785-msl@talos.service" diff --git a/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config.bb b/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config.bb deleted file mode 100644 index 03164579c..000000000 --- a/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config.bb +++ /dev/null @@ -1,5 +0,0 @@ -SUMMARY = "Talos II board wiring" -DESCRIPTION = "Talos II wiring information for the Talos II OpenPOWER system." -PR = "r1" - -inherit config-in-skeleton diff --git a/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config_git.bb b/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config_git.bb new file mode 100644 index 000000000..40b67663b --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/workbook/talos-config_git.bb @@ -0,0 +1,6 @@ +SUMMARY = "Talos II board wiring" +DESCRIPTION = "Talos II wiring information for the Talos II OpenPOWER system." +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit config-in-skeleton -- cgit v1.2.1