diff options
Diffstat (limited to 'meta-yadro/meta-nicole')
6 files changed, 31 insertions, 4 deletions
diff --git a/meta-yadro/meta-nicole/conf/bblayers.conf.sample b/meta-yadro/meta-nicole/conf/bblayers.conf.sample index 62622c8cb..776b1a90b 100644 --- a/meta-yadro/meta-nicole/conf/bblayers.conf.sample +++ b/meta-yadro/meta-nicole/conf/bblayers.conf.sample @@ -11,6 +11,7 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ @@ -23,6 +24,7 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-networking \ ##OEROOT##/meta-openembedded/meta-perl \ ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-security \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ ##OEROOT##/meta-openpower \ diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf index 6bb50b713..5159fc942 100644 --- a/meta-yadro/meta-nicole/conf/layer.conf +++ b/meta-yadro/meta-nicole/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nicole-layer" BBFILE_PATTERN_nicole-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_nicole-layer = "dunfell gatesgarth" +LAYERSERIES_COMPAT_nicole-layer = "gatesgarth hardknott" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend index 760a12aa9..6708a6a9f 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend @@ -4,7 +4,7 @@ RDEPENDS_${PN}_append = " \ op-proc-control \ openpower-esel-parser \ phosphor-debug-collector \ - phosphor-led-manager-ledmanager \ + phosphor-led-manager \ phosphor-mapper \ phosphor-state-manager \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-sensors.yaml b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-sensors.yaml index 20b3a4ea2..d12d3397b 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-sensors.yaml +++ b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-sensors.yaml @@ -739,3 +739,24 @@ sensorReadingType: 111 sensorType: 31 serviceInterface: org.freedesktop.DBus.Properties + +254: + sensorType: 2 + path: /xyz/openbmc_project/sensors/voltage/vbat + sensorReadingType: 1 + # This gives the measurement 1.800..3.585 volts with a step 0.007 + multiplierM: 7 + offsetB: 18 + bExp: 2 + rExp: -3 + scale: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + mutability: Mutability::Read + readingType: readingData + serviceInterface: org.freedesktop.DBus.Properties + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf index a6065805c..cca2f395a 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf @@ -1,5 +1,9 @@ LABEL_in1=vbat -GAIN_in1=0.00225 +CRITLO_in1 = "2000" +WARNLO_in1 = "2500" +WARNHI_in1 = "3400" +CRITHI_in1 = "3500" +GAIN_in1=2.25 # GPIOP2 needs to be pulled high for battery voltage reading GPIOCHIP_in1=0 diff --git a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 58e0c90b3..e06afb48a 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,6 +1,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -EXTRA_OECONF_append = " --enable-negative-errno-on-fail" +EXTRA_OEMESON_append = " -Dnegative-errno-on-fail=true" ITEMS = "iio-hwmon-battery.conf" |