From d58259983f61ab299f5cc0bf4a0e56bd3aed29bf Mon Sep 17 00:00:00 2001 From: Eddie James Date: Fri, 19 Jul 2019 11:24:57 -0500 Subject: zaius: phosphor-hwmon config: Add errnos to OCC REMOVERCS Add errnos produced by the OCC driver stack to the REMOVERCS environment configuration. Zaius has a persistent issue with OCC unbind operations taking too long during host power off, resulting in hwmon errors as phosphor-hwmon attempts to poll the OCC. (From meta-ingrasys rev: b821af616c2bca5021bd28d80209341328371225) Signed-off-by: Eddie James Change-Id: Id010a7269e641d81f1b074565d2c684a2c8e04ea Signed-off-by: Brad Bishop --- .../fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 1 + .../fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 1 + 2 files changed, 2 insertions(+) (limited to 'meta-ingrasys') diff --git a/meta-ingrasys/meta-zaius/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-ingrasys/meta-zaius/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 index 650415131..a5ccf550d 100644 --- a/meta-ingrasys/meta-zaius/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-ingrasys/meta-zaius/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 @@ -1,3 +1,4 @@ +REMOVERCS = "11, 74, 90, 110" MODE_temp1 = "label" MODE_temp2 = "label" MODE_temp3 = "label" diff --git a/meta-ingrasys/meta-zaius/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-ingrasys/meta-zaius/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 index ba615812a..55f3f1dcf 100644 --- a/meta-ingrasys/meta-zaius/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-ingrasys/meta-zaius/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 @@ -1,3 +1,4 @@ +REMOVERCS = "11, 74, 90, 110" MODE_temp1 = "label" MODE_temp2 = "label" MODE_temp3 = "label" -- cgit v1.2.3 From a242d47bb8b3d35c1eef196404db8b219070c264 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 13 Sep 2019 14:08:31 -0400 Subject: meta-ingrasys: Remove references to INGRASYSBASE INGRASYSBASE is only used for pointing at licenses...point at the licenses in oe-core in meta/files/common-licenses instead. to match the defacto convention used in other oe layers like meta-openembedded. (From meta-ingrasys rev: fcd2b2998a76f00307bb2ff821efa8ff8ef87c68) Change-Id: I76d73574778db36a649f20ccc0a5149f616743af Signed-off-by: Brad Bishop --- meta-ingrasys/conf/layer.conf | 3 --- meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb | 2 +- meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb | 2 +- .../meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) (limited to 'meta-ingrasys') diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index 8d0b76be0..064875063 100644 --- a/meta-ingrasys/conf/layer.conf +++ b/meta-ingrasys/conf/layer.conf @@ -4,6 +4,3 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "ingrasys" BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/" LAYERSERIES_COMPAT_ingrasys = "thud warrior" - -# Provide a variable that points the base of the ingrasys layer. -INGRASYSBASE = '${@os.path.normpath("${LAYERDIR}/")}' diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb index 164a9e75b..dd6d6eec0 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control.bb @@ -2,7 +2,7 @@ SUMMARY = "Zaius AVSBus control" DESCRIPTION = "Voltage regulator module (VRM) AVSBus control for Zaius" PR = "r0" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb index f33fe0dc2..597dff4ba 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -2,7 +2,7 @@ SUMMARY = "Zaius VCS rail control" DESCRIPTION = "VCS voltage rail control implementation for Zaius" PR = "r0" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit obmc-phosphor-systemd diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb index 98dbc15b2..129938f37 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/configuration/zaius-yaml-config.bb @@ -1,7 +1,7 @@ SUMMARY = "YAML configuration for Zaius" PR = "r1" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" inherit allarch -- cgit v1.2.3 From acab9842588234b99d2db019a8e63eddda6901d1 Mon Sep 17 00:00:00 2001 From: Patrick Venture Date: Thu, 19 Sep 2019 12:37:44 -0700 Subject: meta-ingrasys: layer.conf: add zeus compatibility OE-core master will be dropping warrior soon; zeus is the next release. (From meta-ingrasys rev: 9e946a348a50d439bbacafaf4f27f9910983d23b) Signed-off-by: Patrick Venture Change-Id: I302038aaab5a120587e734bc1c8bbf30d93cbe20 Signed-off-by: Brad Bishop --- meta-ingrasys/conf/layer.conf | 2 +- meta-ingrasys/meta-zaius/conf/layer.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-ingrasys') diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index 064875063..2686d406b 100644 --- a/meta-ingrasys/conf/layer.conf +++ b/meta-ingrasys/conf/layer.conf @@ -3,4 +3,4 @@ BBPATH .= ":${LAYERDIR}" BBFILE_COLLECTIONS += "ingrasys" BBFILE_PATTERN_ingrasys := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_ingrasys = "thud warrior" +LAYERSERIES_COMPAT_ingrasys = "warrior zeus" diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf index 5131c3491..d78ede1a1 100644 --- a/meta-ingrasys/meta-zaius/conf/layer.conf +++ b/meta-ingrasys/meta-zaius/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "zaius" BBFILE_PATTERN_zaius := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_zaius = "thud warrior" +LAYERSERIES_COMPAT_zaius = "warrior zeus" -- cgit v1.2.3