diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-11-04 00:19:32 +0300 |
| commit | 901ced0812b458fdc599fe40b0a4233d422d6df9 (patch) | |
| tree | b0918e0606da0b1925b5fc9aba5e065e0a5a2f0e /meta-ampere/meta-jade/recipes-phosphor | |
| parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
| parent | 459d47e59bfb3f80542f17c7eb54ba1f6c1a44f3 (diff) | |
| download | openbmc-901ced0812b458fdc599fe40b0a4233d422d6df9.tar.xz | |
Merge tag '0.77' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-ampere/meta-jade/recipes-phosphor')
3 files changed, 18 insertions, 10 deletions
diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index e9e6aa0ad..7136be64f 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,6 +1,14 @@ -RDEPENDS:${PN}-extras:append:mtjade = " webui-vue phosphor-image-signing phosphor-virtual-sensor" -RDEPENDS:${PN}-inventory:append:mtjade = " fault-monitor id-button psu-hotswap-reset" +RDEPENDS:${PN}-extras:append:mtjade = " \ + webui-vue \ + phosphor-image-signing \ + phosphor-virtual-sensor \ + " RDEPENDS:${PN}-inventory:append:mtjade = " \ - host-gpio-handling \ + fault-monitor \ + id-button \ + psu-hotswap-reset \ + host-gpio-handling \ + dbus-sensors \ + entity-manager \ " diff --git a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml b/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml index 757371647..83a1623d6 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml +++ b/meta-ampere/meta-jade/recipes-phosphor/settings/phosphor-settings-manager/mtjade_settings.override.yml @@ -29,3 +29,9 @@ Default: 100 Threshold: Default: 1 + +/xyz/openbmc_project/control/host0/power_restore_policy: + - Interface: xyz.openbmc_project.Control.Power.RestorePolicy + Properties: + PowerRestorePolicy: + Default: RestorePolicy::Policy::AlwaysOn diff --git a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json index dd218c0c9..f2722c881 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ b/meta-ampere/meta-jade/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -4,8 +4,7 @@ "power_config": { "power_good_in": "PGOOD", "power_up_outs": [ - {"name": "BMC_SYS_PSON_L", "polarity": false}, - {"name": "BMC_READY", "polarity": true} + {"name": "BMC_SYS_PSON_L", "polarity": false} ], "reset_outs": [ {"name": "BMC_S0_SYSRESET_L", "polarity": false}, @@ -44,11 +43,6 @@ "name": "RESET_BUTTON", "pin": "R5", "direction": "both" - }, - { - "name": "BMC_READY", - "pin": "AC5", - "direction": "out" } ] } |