diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-quanta/meta-gsj/recipes-phosphor | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-quanta/meta-gsj/recipes-phosphor')
-rw-r--r-- | meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 | ||||
-rwxr-xr-x | meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml | 88 |
2 files changed, 33 insertions, 56 deletions
diff --git a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend index 1ad5f9d78..d4f56847e 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -3,3 +3,4 @@ OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " gsj-hotswap-change-setting" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " iperf3" +IMAGE_FEATURES_remove_gsj = "obmc-user-mgmt-ldap" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml index e9ef9e743..804b8df06 100755 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/gsj-ipmi-sensor-map/config.yaml @@ -6,7 +6,6 @@ sensorReadingType: 0x01 bExp: 0 rExp: 0 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -17,7 +16,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x31: entityID: 0x0D @@ -27,7 +26,6 @@ sensorReadingType: 0x01 bExp: 0 rExp: 0 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -38,7 +36,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x32: entityID: 0x0E @@ -48,7 +46,6 @@ sensorReadingType: 0x01 bExp: 0 rExp: 0 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -59,7 +56,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x33: entityID: 0x0E @@ -69,7 +66,6 @@ sensorReadingType: 0x01 bExp: 0 rExp: 0 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -80,7 +76,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x3C: entityID: 0x0A @@ -90,7 +86,6 @@ sensorReadingType: 0x01 bExp: 0 rExp: 0 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -101,7 +96,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x70: entityID: 0x0A entityInstance: 5 @@ -112,7 +107,6 @@ offsetB: 0 bExp: 0 rExp: -2 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -123,7 +117,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x60: entityID: 0x0A @@ -135,7 +129,6 @@ offsetB: 0 bExp: 0 rExp: -3 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -146,7 +139,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x90: entityID: 0x0A @@ -158,7 +151,6 @@ offsetB: 4 bExp: 2 rExp: -2 - scale: -6 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -169,7 +161,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x3D: entityID: 0x0A @@ -179,7 +171,6 @@ sensorReadingType: 0x01 bExp: 0 rExp: 0 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -190,7 +181,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x71: entityID: 0x0A entityInstance: 7 @@ -201,7 +192,6 @@ offsetB: 0 bExp: 0 rExp: -3 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -212,7 +202,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x61: entityID: 0x0A @@ -224,7 +214,6 @@ offsetB: 0 bExp: 0 rExp: -4 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -235,7 +224,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x80: @@ -249,7 +238,6 @@ bExp: 0 rExp: 0 unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS - scale: 0 serviceInterface: org.freedesktop.DBus.Properties readingType: readingData sensorNamePattern: nameLeaf @@ -258,7 +246,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x81: entityID: 0x1D entityInstance: 2 @@ -270,7 +258,6 @@ bExp: 0 rExp: 0 unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS - scale: 0 serviceInterface: org.freedesktop.DBus.Properties readingType: readingData sensorNamePattern: nameLeaf @@ -279,7 +266,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x82: entityID: 0x1D entityInstance: 3 @@ -291,7 +278,6 @@ bExp: 0 rExp: 0 unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS - scale: 0 serviceInterface: org.freedesktop.DBus.Properties readingType: readingData sensorNamePattern: nameLeaf @@ -300,7 +286,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x83: entityID: 0x1D entityInstance: 4 @@ -312,7 +298,6 @@ bExp: 0 rExp: 0 unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS - scale: 0 serviceInterface: org.freedesktop.DBus.Properties readingType: readingData sensorNamePattern: nameLeaf @@ -321,7 +306,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x84: entityID: 0x1D entityInstance: 5 @@ -333,7 +318,6 @@ bExp: 0 rExp: 0 unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS - scale: 0 serviceInterface: org.freedesktop.DBus.Properties readingType: readingData sensorNamePattern: nameLeaf @@ -342,7 +326,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x85: entityID: 0x1D entityInstance: 6 @@ -354,7 +338,6 @@ bExp: 0 rExp: 0 unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS - scale: 0 serviceInterface: org.freedesktop.DBus.Properties readingType: readingData sensorNamePattern: nameLeaf @@ -363,7 +346,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0xC0: &fan_pwm sensorType: 0x04 @@ -406,7 +389,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x35: entityID: 0x07 entityInstance: 2 @@ -423,7 +406,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x36: entityID: 0x07 entityInstance: 3 @@ -440,7 +423,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x37: entityID: 0x07 entityInstance: 4 @@ -457,7 +440,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x38: entityID: 0x07 entityInstance: 5 @@ -474,7 +457,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x39: entityID: 0x07 entityInstance: 6 @@ -491,7 +474,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x3A: entityID: 0x07 entityInstance: 7 @@ -508,7 +491,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x3B: entityID: 0x07 entityInstance: 8 @@ -525,7 +508,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x40: entityID: 0x07 @@ -849,7 +832,6 @@ offsetB: 0 bExp: 0 rExp: -4 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -860,7 +842,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x64: entityID: 0x0A @@ -872,7 +854,6 @@ offsetB: 0 bExp: 0 rExp: -4 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -883,7 +864,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x65: entityID: 0x0A @@ -895,7 +876,6 @@ offsetB: 0 bExp: 0 rExp: -4 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -906,7 +886,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x66: entityID: 0x0A @@ -918,7 +898,6 @@ offsetB: 0 bExp: 0 rExp: -4 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -929,7 +908,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x67: entityID: 0x0A @@ -941,7 +920,6 @@ offsetB: 0 bExp: 0 rExp: -5 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -952,7 +930,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x68: entityID: 0x0A @@ -964,7 +942,6 @@ offsetB: 0 bExp: 0 rExp: -4 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -975,7 +952,7 @@ Value: Offsets: 0xFF: - type: int64_t + type: double 0x69: entityID: 0x0A @@ -987,7 +964,6 @@ offsetB: 0 bExp: 0 rExp: -4 - scale: -3 mutability: Mutability::Write|Mutability::Read serviceInterface: org.freedesktop.DBus.Properties readingType: readingData @@ -998,4 +974,4 @@ Value: Offsets: 0xFF: - type: int64_t
\ No newline at end of file + type: double
\ No newline at end of file |