diff options
| author | Jim Wright <jlwright@us.ibm.com> | 2019-10-23 00:15:10 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-11-07 20:46:06 +0300 |
| commit | 6e67d1291ef81cf3acc4dd42adbbb3d26f1f40fe (patch) | |
| tree | dfb09ae6ecb1252a512cea207db4fd6b0ff7a297 /meta-ibm | |
| parent | 87b364a8b6993132e28e2b8a4e05735cfa796b38 (diff) | |
| download | openbmc-6e67d1291ef81cf3acc4dd42adbbb3d26f1f40fe.tar.xz | |
Add phosphor-power to Rainier image build
When Rainier was removed from AC server builds, the phosphor-power
repository was dropped from the image. Add phosphor-power to Rainer
builds.
(From meta-ibm rev: 5bbf75e279cfd7d3cf77b8d49c69fe338f97ee72)
Signed-off-by: Jim Wright <jlwright@us.ibm.com>
Change-Id: I9c0105396d9b50d65abc2338eab46ae84bee209e
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
| -rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 2 | ||||
| -rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index d0d785e71..1173e103e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -3,7 +3,7 @@ RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-cont RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " phosphor-power phosphor-power-systemd-links witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_rainier = " phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " phosphor-power phosphor-power-systemd-links phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json new file mode 100644 index 000000000..baa96ac27 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json @@ -0,0 +1,31 @@ +{ + "inventoryPMBusAccessType": "HwmonDeviceDebug", + "fruConfigs": [ + { + "propertyName": "PartNumber", + "fileName": "part_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "SerialNumber", + "fileName": "serial_number", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Model", + "fileName": "ccin", + "interface": "xyz.openbmc_project.Inventory.Decorator.Asset" + }, + { + "propertyName": "Version", + "fileName": "fw_version", + "interface": "xyz.openbmc_project.Software.Version" + } + ], + "psuDevices": { + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0" : "/sys/bus/i2c/devices/3-0068", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply1" : "/sys/bus/i2c/devices/3-0069", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply2" : "/sys/bus/i2c/devices/3-006a", + "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply3" : "/sys/bus/i2c/devices/3-006b" + } +} |