diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-26 22:34:40 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-26 22:34:40 +0300 |
commit | 028c1a3663f63db3fdf4b92e6f091506c1c784f9 (patch) | |
tree | 0b28e401de9ee2da03fde96c81a3838fbd3521a7 | |
parent | b83c9dda9eabe4c0124decec25bce46e0ae11160 (diff) | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-028c1a3663f63db3fdf4b92e6f091506c1c784f9.tar.xz |
Merge tag 'wht-0.56' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb | 2 | ||||
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc | 333 | ||||
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb | 2 | ||||
-rw-r--r-- | meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc | 2 | ||||
-rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig | 2 | ||||
-rw-r--r-- | meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb | 2 | ||||
-rw-r--r-- | meta-facebook/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-facebook/meta-tiogapass/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-facebook/meta-yosemitev2/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb | 1 | ||||
-rw-r--r-- | meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json (renamed from meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json) | 0 | ||||
-rw-r--r-- | meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend | 6 | ||||
-rw-r--r-- | meta-facebook/recipes-phosphor/sensors/phosphor-nvme/tiogapass/nvme_config.json | 36 | ||||
-rw-r--r-- | meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend | 8 | ||||
-rw-r--r-- | meta-google/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/README | 25 | ||||
-rw-r--r-- | meta-ibm/README.md | 75 | ||||
-rw-r--r-- | meta-ibm/conf/bblayers.conf.sample | 29 | ||||
-rw-r--r-- | meta-ibm/conf/conf-notes.txt | 12 | ||||
-rw-r--r-- | meta-ibm/conf/distro/openbmc-witherspoon.conf (renamed from meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/conf/local.conf.sample | 21 | ||||
-rw-r--r-- | meta-ibm/conf/machine/mihawk.conf (renamed from meta-ibm/meta-witherspoon/conf/machine/mihawk.conf) | 1 | ||||
-rw-r--r-- | meta-ibm/conf/machine/rainier.conf (renamed from meta-ibm/meta-witherspoon/conf/machine/rainier.conf) | 3 | ||||
-rw-r--r-- | meta-ibm/conf/machine/swift.conf (renamed from meta-ibm/meta-witherspoon/conf/machine/swift.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon-128.conf (renamed from meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon-tacoma.conf (renamed from meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf) | 3 | ||||
-rw-r--r-- | meta-ibm/conf/machine/witherspoon.conf (renamed from meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf) | 2 | ||||
-rw-r--r-- | meta-ibm/meta-palmetto/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/meta-romulus/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ibm/meta-romulus/conf/machine/romulus.conf | 2 | ||||
-rw-r--r-- | meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend | 1 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/README.md | 29 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend | 3 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend | 3 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 33 | ||||
-rw-r--r-- | meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf (renamed from meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-core/systemd/systemd/journald-storage-policy.conf (renamed from meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-core/systemd/systemd/systemd-journald-override.conf (renamed from meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-core/systemd/systemd_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-kernel/linux/linux-aspeed/mihawk.cfg (renamed from meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/mihawk.cfg) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg (renamed from meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-kernel/linux/linux-aspeed/witherspoon.cfg (renamed from meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend | 5 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service | 15 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/power-workarounds.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/vrm-control.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/chassis/vrm-control/mihawk/ir35221-unbind-bind.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/mihawk/ir35221-unbind-bind.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-fru-bmc.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-fru-bmc.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/events-policy.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/events-policy/config.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy/config.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/mihawk/air-cooled.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/mihawk/air-cooled.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/mihawk/fan-errors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/mihawk/fan-errors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/thermal-policy.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/thermal-policy/ibm-ac-server/thermal-policy.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/ibm-ac-server/thermal-policy.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend | 7 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/mihawk/zone_conditions.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/mihawk/zone_conditions.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/mihawk/zones.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/mihawk/zones.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/mihawk/config.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/mihawk/config.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/mihawk/obmc/phosphor-fan/phosphor-cooling-type-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/mihawk/obmc/phosphor-fan/phosphor-cooling-type-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/mihawk/phosphor-cooling-type@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/mihawk/phosphor-cooling-type@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service) | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend) | 15 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/id-button.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/id-button/id-button-pressed.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/id-button-pressed.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/id-button/obmc/gpio/id_button (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/obmc/gpio/id_button) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/id-button/toggle_identify_led.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-0.conf) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/host/p9-host-start.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend) | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/channel_config.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/channel_config.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/leds/mihawk-led-manager-config-native.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config-native.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts/callouts.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/logging/mihawk-phosphor-logging-callouts/callouts.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/mboxd/mboxd/check-pnor-format.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check-pnor-format.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/first-boot-set-mac_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 38 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/pldm/pldm/11.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/11.json) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/enum_attrs.json) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/fileTable.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/pldm/pldm/host_eid (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/host_eid) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/swift/psu.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/psu.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/power-sequencer.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf) | 0 | ||||
-rwxr-xr-x | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/mihawk/gpio_defs.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/mihawk/gpio_defs.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon-tacoma/gpio_defs.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon-tacoma/gpio_defs.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend (renamed from meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes.txt (renamed from meta-ibm/meta-witherspoon/recipes.txt) | 0 | ||||
-rw-r--r-- | meta-ingrasys/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/conf/machine/zaius.conf | 2 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb | 3 | ||||
-rw-r--r-- | meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend | 2 | ||||
-rwxr-xr-x | meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb | 2 | ||||
-rw-r--r-- | meta-nuvoton/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc | 333 | ||||
-rw-r--r-- | meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb | 2 | ||||
-rw-r--r-- | meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig | 3 | ||||
-rw-r--r-- | meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.5.0.bb | 13 | ||||
-rw-r--r-- | meta-openpower/conf/machine/include/p9.inc | 2 | ||||
-rw-r--r-- | meta-openpower/recipes-bsp/ecmd/croserver_git.bb | 3 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service | 1 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/host/op-host-control/vcs_workaround@.service | 19 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb | 25 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/host/op-proc-control_git.bb | 4 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/host/p9-host-start.bb | 3 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb | 20 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb | 1 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb | 2 | ||||
-rw-r--r-- | meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc | 2 | ||||
-rw-r--r-- | meta-phosphor/classes/image_types_phosphor.bbclass | 20 | ||||
-rw-r--r-- | meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass | 2 | ||||
-rw-r--r-- | meta-phosphor/classes/skeleton-python.bbclass | 2 | ||||
-rw-r--r-- | meta-phosphor/conf/distro/include/phosphor-base.inc | 1 | ||||
-rw-r--r-- | meta-phosphor/recipes-core/systemd/systemd_%.bbappend | 3 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/pyphosphor_git.bb | 4 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python-mako_%.bbappend | 12 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch | 34 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb | 53 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend | 13 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python3_%.bbappend | 20 | ||||
-rw-r--r-- | meta-phosphor/recipes-devtools/python/python_2.%.bbappend | 11 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/console/obmc-console_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb | 12 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/logging/ffdc_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/pldm/pldm.inc | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/power/phosphor-power.inc | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb | 6 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb | 52 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb | 21 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb | 6 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb | 2 | ||||
-rw-r--r-- | meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb | 2 | ||||
-rw-r--r-- | meta-quanta/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf | 5 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/conf/local.conf.sample | 2 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/conf/machine/gsj.conf | 3 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb | 8 | ||||
-rw-r--r-- | meta-quanta/meta-gsj/recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 | ||||
-rw-r--r-- | meta-yadro/conf/layer.conf | 6 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/conf/machine/nicole.conf | 2 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch | 186 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend | 5 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts | 106 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-fru-properties.yaml | 2 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend | 1 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend | 1 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml | 18 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 6 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf | 9 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 3 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json | 10 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager/resetreason.conf | 2 | ||||
-rw-r--r-- | meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend | 5 | ||||
-rw-r--r-- | meta-yadro/meta-vesnin/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-yadro/recipes-phosphor/flash/obmc-yadro-fwupdate_git.bb | 22 | ||||
-rwxr-xr-x | setup | 5 |
409 files changed, 1514 insertions, 416 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb index 78c352f27..3ecd17ce6 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk_2019.04.bb @@ -2,7 +2,7 @@ require u-boot-common-aspeed-sdk_${PV}.inc UBOOT_MAKE_TARGET ?= "DEVICE_TREE=${UBOOT_DEVICETREE}" -require recipes-bsp/u-boot/u-boot.inc +require u-boot-aspeed.inc PROVIDES += "u-boot" DEPENDS += "bc-native dtc-native" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc new file mode 100644 index 000000000..55d8b4787 --- /dev/null +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed.inc @@ -0,0 +1,333 @@ +SUMMARY = "Universal Boot Loader for embedded devices" +PROVIDES = "virtual/bootloader" + +B = "${WORKDIR}/build" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS += "kern-tools-native" + +inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native + +DEPENDS += "swig-native" + +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' +EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' + +PACKAGECONFIG ??= "openssl" +# u-boot will compile its own tools during the build, with specific +# configurations (aka when CONFIG_FIT_SIGNATURE is enabled) openssl is needed as +# a host build dependency. +PACKAGECONFIG[openssl] = ",,openssl-native" + +# Allow setting an additional version string that will be picked up by the +# u-boot build system and appended to the u-boot version. If the .scmversion +# file already exists it will not be overwritten. +UBOOT_LOCALVERSION ?= "" + +# Some versions of u-boot use .bin and others use .img. By default use .bin +# but enable individual recipes to change this value. +UBOOT_SUFFIX ??= "bin" +UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}" +UBOOT_MAKE_TARGET ?= "all" + +# Output the ELF generated. Some platforms can use the ELF file and directly +# load it (JTAG booting, QEMU) additionally the ELF can be used for debugging +# purposes. +UBOOT_ELF ?= "" +UBOOT_ELF_SUFFIX ?= "elf" +UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}" +UBOOT_ELF_BINARY ?= "u-boot.${UBOOT_ELF_SUFFIX}" +UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}" + +# Some versions of u-boot build an SPL (Second Program Loader) image that +# should be packaged along with the u-boot binary as well as placed in the +# deploy directory. For those versions they can set the following variables +# to allow packaging the SPL. +SPL_BINARY ?= "" +SPL_BINARYNAME ?= "${@os.path.basename(d.getVar("SPL_BINARY"))}" +SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}" +SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}" + +# Additional environment variables or a script can be installed alongside +# u-boot to be used automatically on boot. This file, typically 'uEnv.txt' +# or 'boot.scr', should be packaged along with u-boot as well as placed in the +# deploy directory. Machine configurations needing one of these files should +# include it in the SRC_URI and set the UBOOT_ENV parameter. +UBOOT_ENV_SUFFIX ?= "txt" +UBOOT_ENV ?= "" +UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" +UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" +UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" + +# U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf +# to find EXTLINUX conf file. +UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" +UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" +UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" + +# returns all the elements from the src uri that are .cfg files +def find_cfgs(d): + sources=src_patches(d, True) + sources_list=[] + for s in sources: + if s.endswith('.cfg'): + sources_list.append(s) + + return sources_list + +do_configure () { + if [ -z "${UBOOT_CONFIG}" ]; then + if [ -n "${UBOOT_MACHINE}" ]; then + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} + else + oe_runmake -C ${S} O=${B} oldconfig + fi + merge_config.sh -m .config ${@" ".join(find_cfgs(d))} + cml1_do_configure + fi +} + +do_compile () { + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk + fi + + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] + then + echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion + echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion + fi + + if [ -n "${UBOOT_CONFIG}" ] + then + unset i j k + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + oe_runmake -C ${S} O=${B}/${config} ${config} + oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} + for binary in ${UBOOT_BINARIES}; do + k=$(expr $k + 1); + if [ $k -eq $i ]; then + cp ${B}/${config}/${binary} ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} + fi + done + unset k + fi + done + unset j + done + unset i + else + oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} + fi + +} + +do_install () { + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -d ${D}/boot + install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -d ${D}/boot + install -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + fi + + if [ -n "${UBOOT_ELF}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} + fi + fi + + if [ -e ${WORKDIR}/fw_env.config ] ; then + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + fi + + if [ -n "${SPL_BINARY}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} + ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME} + fi + fi + + if [ -n "${UBOOT_ENV}" ] + then + install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} + ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY} + fi + + if [ "${UBOOT_EXTLINUX}" = "1" ] + then + install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME} + fi + +} + +FILES_${PN} = "/boot ${sysconfdir} ${datadir}" + +do_deploy () { + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -d ${DEPLOYDIR} + install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + cd ${DEPLOYDIR} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -d ${DEPLOYDIR} + install -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + cd ${DEPLOYDIR} + rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} + fi + + if [ -n "${UBOOT_ELF}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + fi + fi + + + if [ -n "${SPL_BINARY}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} + rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} + rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + fi + + + if [ -n "${UBOOT_ENV}" ] + then + install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} + rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} + ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY} + ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} + fi + + if [ "${UBOOT_EXTLINUX}" = "1" ] + then + install -m 644 ${UBOOT_EXTLINUX_CONFIG} ${DEPLOYDIR}/${UBOOT_EXTLINUX_SYMLINK} + ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE} + ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME} + fi +} + +addtask deploy before do_build after do_compile diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb index ac1ead714..8cebe5ab3 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb @@ -1,5 +1,5 @@ require u-boot-common-aspeed_${PV}.inc -require recipes-bsp/u-boot/u-boot.inc +require u-boot-aspeed.inc PROVIDES += "u-boot" DEPENDS += "dtc-native" diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc index 46ab2e782..8e0ad65f3 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "0991f0b8ae2eaad7d06977d2fabbb599f0d28a97" +SRCREV = "09e0e88ee0e79e9fa967ac1fa03f589a5d7eface" SRC_URI = "git://git@github.com/openbmc/u-boot.git;nobranch=1;protocol=https" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig index a7d1d7d44..e963f3096 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig @@ -87,6 +87,7 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_NBD=y +CONFIG_MCTP_LPC=y CONFIG_EEPROM_AT24=y CONFIG_MD=y CONFIG_BLK_DEV_DM=y @@ -233,6 +234,7 @@ CONFIG_RTC_DRV_ASPEED=y CONFIG_ASPEED_LPC_CTRL=y CONFIG_ASPEED_LPC_SNOOP=y CONFIG_ASPEED_P2A_CTRL=y +CONFIG_SPI_FSI=y CONFIG_IIO=y CONFIG_ASPEED_ADC=y CONFIG_MAX1363=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index 28d939903..6b83cd241 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.4" LINUX_VERSION ?= "5.4.32" -SRCREV="2cf49560af20199920858cb91e3b7b138e54f597" +SRCREV="7dc9442bbe7d0d1512c64a97b7cc58fed2b38ba4" require linux-aspeed.inc diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index bc7b5deee..7ff4ac189 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "warrior zeus" +LAYERSERIES_COMPAT_facebook-layer := "zeus dunfell" diff --git a/meta-facebook/meta-tiogapass/conf/layer.conf b/meta-facebook/meta-tiogapass/conf/layer.conf index 022aea9d5..ca0785e5c 100644 --- a/meta-facebook/meta-tiogapass/conf/layer.conf +++ b/meta-facebook/meta-tiogapass/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "tiogapass-layer" BBFILE_PATTERN_tiogapass-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "warrior zeus" +LAYERSERIES_COMPAT_tiogapass-layer := "zeus dunfell" diff --git a/meta-facebook/meta-yosemitev2/conf/layer.conf b/meta-facebook/meta-yosemitev2/conf/layer.conf index 4c4571a68..501e86dd1 100644 --- a/meta-facebook/meta-yosemitev2/conf/layer.conf +++ b/meta-facebook/meta-yosemitev2/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "yosemitev2-layer" BBFILE_PATTERN_yosemitev2-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_tiogapass-layer := "warrior zeus" +LAYERSERIES_COMPAT_yosemitev2-layer := "zeus dunfell" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index a5dae1d9a..1709ac2ed 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -25,4 +25,5 @@ RDEPENDS_${PN}-system = " \ ipmitool \ phosphor-post-code-manager \ phosphor-host-postd \ + phosphor-nvme \ " diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json index 690f9e733..690f9e733 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/tiogapass/ipmb-channels.json diff --git a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index c2d5ed8b9..1a9d9e0a5 100644 --- a/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-facebook/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" -SRC_URI_append_tiogapass = " file://ipmb-channels.json" +SRC_URI_append = " file://ipmb-channels.json" -do_install_append_tiogapass(){ +do_install_append() { install -m 0644 -D ${WORKDIR}/ipmb-channels.json \ ${D}/usr/share/ipmbbridge } diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/tiogapass/nvme_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/tiogapass/nvme_config.json new file mode 100644 index 000000000..fefa711cc --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme/tiogapass/nvme_config.json @@ -0,0 +1,36 @@ +{ + "config": [ + { + "NVMeDriveIndex": 0, + "NVMeDriveBusID": 20 + }, + { + "NVMeDriveIndex": 1, + "NVMeDriveBusID": 21 + }, + { + "NVMeDriveIndex": 4, + "NVMeDriveBusID": 24 + }, + { + "NVMeDriveIndex": 5, + "NVMeDriveBusID": 25 + }, + { + "NVMeDriveIndex": 6, + "NVMeDriveBusID": 26 + }, + { + "NVMeDriveIndex": 7, + "NVMeDriveBusID": 27 + } + ], + "threshold": [ + { + "criticalHigh": 75, + "criticalLow": 0, + "maxValue": 127, + "minValue": -127 + } + ] +} diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend new file mode 100644 index 000000000..95a590704 --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-nvme_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" + +SRC_URI_append = " file://nvme_config.json" + +do_install_append() { + install -m 0644 -D ${WORKDIR}/nvme_config.json \ + ${D}/etc/nvme +} diff --git a/meta-google/conf/layer.conf b/meta-google/conf/layer.conf index 982339c10..03f9c68ab 100644 --- a/meta-google/conf/layer.conf +++ b/meta-google/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "google-layer" BBFILE_PATTERN_google-layer := "^${LAYERDIR}/" LAYERVERSION_google-layer = "1" -LAYERSERIES_COMPAT_google-layer = "warrior zeus" +LAYERSERIES_COMPAT_google-layer = "warrior zeus dunfell" diff --git a/meta-ibm/README b/meta-ibm/README deleted file mode 100644 index 6f1b695b3..000000000 --- a/meta-ibm/README +++ /dev/null @@ -1,25 +0,0 @@ -Collection of BSP and distro layers for IBM branded servers. - -This repository contains a set of distro policy for IBM branded servers: - -conf/ -classes/ -recipes-*/ - -BSP layer(s) for the following IBM service processors: -FSP-2: meta-fsp2 - -BSP layer(s) for the following IBM branded servers: -Witherspoon: meta-witherspoon - -Subsequent description applies to the distro policy for IBM systems only in -conf, classes, and recipes-*, for description of the BSP layers consult the -README files there. - -Dependencies -============ - -This layer depends on: - - URI: https://github.com/openbmc/meta-phosphor - branch: master diff --git a/meta-ibm/README.md b/meta-ibm/README.md new file mode 100644 index 000000000..6d54c5514 --- /dev/null +++ b/meta-ibm/README.md @@ -0,0 +1,75 @@ +OpenEmbedded/Yocto/OpenBMC BSP layer for IBM systems +==================================================== + +This layer provides support for the BMC firmware on IBM POWER systems server +products. + +``` +This layer depends on: + +URI: git://git.openembedded.org/openembedded-core +layers: meta +branch: master +revision: HEAD + +URI: https://github.com/openbmc/meta-phosphor +branch: master +revision: HEAD + +URI: https://github.com/openbmc/meta-openpower +branch: master +revision: HEAD + +URI: https://github.com/openbmc/meta-aspeed +branch: master +revision: HEAD +``` + +The following systems are supported. + +Witherspoon, or AC922, is an IBM POWER9 two-socket, 2U Accelerated Compute +Server with up to 6 NVIDIA Tesla GPUs. More information can be found +[here](https://www.ibm.com/us-en/marketplace/power-systems-ac922). + +In addition to witherspoon, this layer contains additional machine +configurations such as swift. The default machine target is witherspoon, +so in order to build a different configuration, or to build witherspoon +after building a different one, set the MACHINE environment to the desired +configuration name (see the conf/machine/ subdirectory for available options): + + export MACHINE=machine_configuration_name + +Then build: + + bitbake obmc-phosphor-image + +Example: + + export MACHINE=swift + bitbake obmc-phosphor-image + bitbake phosphor-logging + + export MACHINE=witherspoon + bitbake obmc-phosphor-image + +Contributing +------------ + +meta-ibm patches are reviewed using the Gerrit instance at +https://gerrit.openbmc-project.xyz. + +Please submit patches to Gerrit. More information on using Gerrit can be found +[here](https://github.com/openbmc/docs/blob/master/CONTRIBUTING.md#submitting-changes-via-gerrit-server). +https://github.com/openbmc/meta-ibm is a hosting mirror only and GitHub +pull requests are not monitored and will not be accepted. + +Patch checklist. Please ensure patches adhere to the following guidelines: + + - meta-ibm uses the [OE style + guidelines](https://www.openembedded.org/wiki/Styleguide). + - follow [the seven rules of a great git commit + message](https://chris.beams.io/posts/git-commit/#seven-rules) + +For questions or help please come join us on the [mailing +list](https://lists.ozlabs.org/listinfo/openbmc) or in +[IRC](irc://freenode.net/openbmc). diff --git a/meta-ibm/conf/bblayers.conf.sample b/meta-ibm/conf/bblayers.conf.sample new file mode 100644 index 000000000..771bfb8a7 --- /dev/null +++ b/meta-ibm/conf/bblayers.conf.sample @@ -0,0 +1,29 @@ +# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# changes incompatibly +LCONF_VERSION = "8" + +BBPATH = "${TOPDIR}" +BBFILES ?= "" + +BBLAYERS ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ibm \ + " +BBLAYERS_NON_REMOVABLE ?= " \ + ##OEROOT##/meta \ + ##OEROOT##/meta-openembedded/meta-oe \ + ##OEROOT##/meta-openembedded/meta-networking \ + ##OEROOT##/meta-openembedded/meta-perl \ + ##OEROOT##/meta-openembedded/meta-python \ + ##OEROOT##/meta-phosphor \ + ##OEROOT##/meta-aspeed \ + ##OEROOT##/meta-openpower \ + ##OEROOT##/meta-ibm \ + " diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/conf-notes.txt new file mode 100644 index 000000000..112353d6f --- /dev/null +++ b/meta-ibm/conf/conf-notes.txt @@ -0,0 +1,12 @@ +Sample meta-witherspoon build invocations: + +mihawk: +DISTRO=openbmc-witherspoon MACHINE=mihawk bitbake obmc-phosphor-image +swift: +DISTRO=openbmc-witherspoon MACHINE=swift bitbake obmc-phosphor-image +witherspoon: +DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image +witherspoon-tacoma: +DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image +witherspoon-128: +DISTRO=openbmc-witherspoon MACHINE=witherspoon-128 bitbake obmc-phosphor-image diff --git a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-ibm/conf/distro/openbmc-witherspoon.conf index 1ccdeb3f5..1ccdeb3f5 100644 --- a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf +++ b/meta-ibm/conf/distro/openbmc-witherspoon.conf diff --git a/meta-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample new file mode 100644 index 000000000..94e76f3db --- /dev/null +++ b/meta-ibm/conf/local.conf.sample @@ -0,0 +1,21 @@ +#MACHINE ?= "mihawk" +#MACHINE ?= "swift" +#MACHINE ?= "witherspoon-128" +#MACHINE ?= "rainier" +MACHINE ??= "witherspoon" +DISTRO ?= "openbmc-witherspoon" +PACKAGE_CLASSES ?= "package_rpm" +SANITY_TESTED_DISTROS_append ?= " *" +EXTRA_IMAGE_FEATURES = "debug-tweaks" +USER_CLASSES ?= "buildstats image-mklibs image-prelink" +PATCHRESOLVE = "noop" +BB_DISKMON_DIRS = "\ + STOPTASKS,${TMPDIR},1G,100K \ + STOPTASKS,${DL_DIR},1G,100K \ + STOPTASKS,${SSTATE_DIR},1G,100K \ + STOPTASKS,/tmp,100M,100K \ + ABORT,${TMPDIR},100M,1K \ + ABORT,${DL_DIR},100M,1K \ + ABORT,${SSTATE_DIR},100M,1K \ + ABORT,/tmp,10M,1K" +CONF_VERSION = "1" diff --git a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf index a296e79b0..e5485c3be 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/mihawk.conf +++ b/meta-ibm/conf/machine/mihawk.conf @@ -6,7 +6,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" OBMC_POWER_SUPPLY_INSTANCES = "0 1" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "mihawk-openpower-fru-vpd-layout-native" require conf/machine/include/ast2500.inc diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/conf/machine/rainier.conf index 4ce298e43..1f8c21e73 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/conf/machine/rainier.conf @@ -1,7 +1,6 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" -UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" UBOOT_DEVICETREE = "ast2600-rainier" -SPL_BINARY = "spl/u-boot-spl.bin" OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3" diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/conf/machine/swift.conf index 4c0abb57d..4c0abb57d 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/swift.conf +++ b/meta-ibm/conf/machine/swift.conf diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf b/meta-ibm/conf/machine/witherspoon-128.conf index d21b9b22b..d21b9b22b 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-128.conf +++ b/meta-ibm/conf/machine/witherspoon-128.conf diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf b/meta-ibm/conf/machine/witherspoon-tacoma.conf index c367e4c73..4d94d9e9d 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon-tacoma.conf +++ b/meta-ibm/conf/machine/witherspoon-tacoma.conf @@ -1,7 +1,6 @@ KERNEL_DEVICETREE = "aspeed-bmc-opp-tacoma.dtb" -UBOOT_MACHINE = "ast2600_openbmc_spl_defconfig" +UBOOT_MACHINE = "ast2600_openbmc_defconfig" UBOOT_DEVICETREE = "ast2600-tacoma" -SPL_BINARY = "spl/u-boot-spl.bin" IMAGE_FSTYPES += "ext4 mmc-ext4-tar" diff --git a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf index 20f515907..340d7f751 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-ibm/conf/machine/witherspoon.conf @@ -6,8 +6,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" OBMC_POWER_SUPPLY_INSTANCES = "0 1" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' - # A machine override for common machine configuration for all of IBM's # "Accelerated Computing" class of systems. MACHINEOVERRIDES =. "ibm-ac-server:" diff --git a/meta-ibm/meta-palmetto/conf/layer.conf b/meta-ibm/meta-palmetto/conf/layer.conf index 0bbb885ed..9dabd9807 100644 --- a/meta-ibm/meta-palmetto/conf/layer.conf +++ b/meta-ibm/meta-palmetto/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "palmetto-layer" BBFILE_PATTERN_palmetto-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_palmetto-layer = "warrior zeus" +LAYERSERIES_COMPAT_palmetto-layer = "warrior zeus dunfell" diff --git a/meta-ibm/meta-romulus/conf/layer.conf b/meta-ibm/meta-romulus/conf/layer.conf index 5b20790b6..fa2e2afaf 100644 --- a/meta-ibm/meta-romulus/conf/layer.conf +++ b/meta-ibm/meta-romulus/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "romulus-layer" BBFILE_PATTERN_romulus-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_romulus-layer = "warrior zeus" +LAYERSERIES_COMPAT_romulus-layer = "warrior zeus dunfell" diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf index 87ac99536..1d73ba4fe 100644 --- a/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -2,8 +2,6 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" UBOOT_MACHINE = "ast_g5_ncsi_config" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' - require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc diff --git a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend index 278470fa7..bc7e02ea0 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend @@ -1,3 +1,2 @@ RDEPENDS_${PN}_append_romulus = " avsbus-control" RDEPENDS_${PN}_append_romulus = " vrm-control" -RDEPENDS_${PN}_remove_romulus = "p9-vcs-workaround" diff --git a/meta-ibm/meta-witherspoon/README.md b/meta-ibm/meta-witherspoon/README.md deleted file mode 100644 index 7386d29b4..000000000 --- a/meta-ibm/meta-witherspoon/README.md +++ /dev/null @@ -1,29 +0,0 @@ -Witherspoon -================ - -This is the Witherspoon machine layer. - -Witherspoon, or AC922, is an IBM POWER9 two-socket, 2U Accelerated Compute -Server with up to 6 NVIDIA Tesla GPUs. More information can be found -[here](https://www.ibm.com/us-en/marketplace/power-systems-ac922). - -In addition to witherspoon, this layer contains additional machine -configurations such as swift. The default machine target is witherspoon, -so in order to build a different configuration, or to build witherspoon -after building a different one, set the MACHINE environment to the desired -configuration name (see the conf/machine/ subdirectory for available options): - - export MACHINE=machine_configuration_name - -Then build: - - bitbake obmc-phosphor-image - -Example: - - export MACHINE=swift - bitbake obmc-phosphor-image - bitbake phosphor-logging - - export MACHINE=witherspoon - bitbake obmc-phosphor-image diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend deleted file mode 100644 index 9b66d367e..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PACKAGECONFIG_append_witherspoon-128 = " host-dump-offload-pldm" -PACKAGECONFIG_append_rainier = " host-dump-offload-pldm" -PACKAGECONFIG_append_witherspoon-tacoma = " host-dump-offload-pldm" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend deleted file mode 100644 index e5e6f57ee..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PACKAGECONFIG_append_ibm-ac-server = " policy-interface" -PACKAGECONFIG_append_mihawk = " policy-interface" 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 deleted file mode 100644 index 972dacf45..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -POWER_SERVICE_PACKAGES_AC_SERVER = " \ - phosphor-power-monitor \ - phosphor-power-systemd-links-monitor \ - phosphor-power-sequencer \ - phosphor-power-systemd-links-sequencer \ - phosphor-power-utils \ - phosphor-power \ -" - -POWER_SERVICE_PACKAGES_RAINIER = " \ - ${POWER_SERVICE_PACKAGES_AC_SERVER} \ - phosphor-power-regulators \ - phosphor-power-psu-monitor \ -" - -RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" -RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" -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 = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" -RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" -RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem" -RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" -RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" -RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" -RDEPENDS_${PN}-logging_remove_rainier = "ibm-logging" -RDEPENDS_${PN}-logging_remove_witherspoon-tacoma = "ibm-logging" -RDEPENDS_${PN}-extras_append_rainier = " pldm" -RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm openpower-hw-diags" - -RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm openpower-hw-diags" - -${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend deleted file mode 100644 index 36e406e46..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml" -SRC_URI_append_ibm-ac-server += " file://ClearHostSecurityKeys-default-zero.override.yml" -SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml" diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf index fb84c6734..fb84c6734 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-size-policy.conf +++ b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf b/meta-ibm/recipes-core/systemd/systemd/journald-storage-policy.conf index eb746a56f..eb746a56f 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/journald-storage-policy.conf +++ b/meta-ibm/recipes-core/systemd/systemd/journald-storage-policy.conf diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf b/meta-ibm/recipes-core/systemd/systemd/systemd-journald-override.conf index 0ca86f863..0ca86f863 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/systemd-journald-override.conf +++ b/meta-ibm/recipes-core/systemd/systemd/systemd-journald-override.conf diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend index 500c91df5..500c91df5 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/mihawk.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/mihawk.cfg index 63c39a9d4..63c39a9d4 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/mihawk.cfg +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/mihawk.cfg diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg index dc41d5834..dc41d5834 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/rainier.cfg diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg b/meta-ibm/recipes-kernel/linux/linux-aspeed/witherspoon.cfg index dc41d5834..dc41d5834 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/witherspoon.cfg +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed/witherspoon.cfg diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend index dfd3afded..dfd3afded 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/recipes-kernel/linux/linux-aspeed_%.bbappend diff --git a/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend index 44f4f4695..8e4049eaa 100644 --- a/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend +++ b/meta-ibm/recipes-phosphor/bmcweb/bmcweb_%.bbappend @@ -1,3 +1,8 @@ EXTRA_OECMAKE_append = " \ -DBMCWEB_INSECURE_ENABLE_REDFISH_FW_TFTP_UPDATE=ON \ " + +inherit obmc-phosphor-discovery-service + +REGISTERED_SERVICES_${PN} += "obmc_redfish:tcp:443:" +REGISTERED_SERVICES_${PN} += "obmc_rest:tcp:443:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb index 2e98aaf90..2e98aaf90 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable.sh b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable.sh index 96f6cf884..96f6cf884 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable.sh +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service index 5396948bc..5396948bc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-disable@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable.sh b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable.sh index 67acc730b..67acc730b 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable.sh +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service index 34d9e4b0f..34d9e4b0f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/mihawk/avsbus-enable@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh b/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh index 7ff607a4b..7ff607a4b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable.sh diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service new file mode 100644 index 000000000..45776aa71 --- /dev/null +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/swift/avsbus-enable@.service @@ -0,0 +1,15 @@ +[Unit] +Description=Enable the AVS bus on VRMs +Wants=op-power-start@%i.service +Before=op-power-start@%i.service +Conflicts=obmc-chassis-poweroff@%i.target +ConditionPathExists=!/run/openbmc/chassis@%i-on + +[Service] +ExecStart={bindir}/avsbus-enable.sh +SyslogIdentifier=avsbus-enable.sh +Type=oneshot +RemainAfterExit=yes + +[Install] +WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh index a158f159e..a158f159e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service index 859f42883..859f42883 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-disable@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh index 6306c58b0..6306c58b0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service index b7fb41e24..b7fb41e24 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control/witherspoon/avsbus-enable@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control index a93bdd758..a93bdd758 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control +++ b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%/ibm-ac-server/obmc/power_control diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb index af8babb53..af8babb53 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds.bb +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh b/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh index dc1f4803b..dc1f4803b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service b/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service index 0926e033b..0926e033b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds/swift/power-workarounds@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh b/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh index d40579731..d40579731 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service b/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service index 3bd1287ee..3bd1287ee 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds/witherspoon/power-workarounds@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb index 8a0d7a6eb..8a0d7a6eb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh index 85d77412d..85d77412d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/ibm-ac-server/ir35221-unbind-bind.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service b/meta-ibm/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service index e6adc05f3..e6adc05f3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/ir35221-on-bind@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service b/meta-ibm/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service index 7638538d1..7638538d1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/ir35221-on-unbind@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/mihawk/ir35221-unbind-bind.sh b/meta-ibm/recipes-phosphor/chassis/vrm-control/mihawk/ir35221-unbind-bind.sh index 27ca3b9dc..27ca3b9dc 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/mihawk/ir35221-unbind-bind.sh +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/mihawk/ir35221-unbind-bind.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control.sh b/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control.sh index c67e244a7..c67e244a7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control.sh +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service b/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service index 731ce55c3..731ce55c3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/vrm-control/vrm-control@.service +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control/vrm-control@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb index 5ec7d4565..5ec7d4565 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml index 6dd17b7ab..6dd17b7ab 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-inventory-sensors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml index aa69a646c..aa69a646c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-occ-sensors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml index 419b9c86f..419b9c86f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/acx22-ipmi-sensors-mrw.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-fru-bmc.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-fru-bmc.yaml index 57adcaf77..57adcaf77 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-fru-bmc.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-fru-bmc.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml index 1cf747856..1cf747856 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/mihawk/acx22-ipmi-hwmon-sensors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml index 6de8be206..6de8be206 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-bmc.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml index 114360ef9..114360ef9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-fru-not-sent-by-host.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml index 38f38355a..38f38355a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/swift/acx22-ipmi-hwmon-sensors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml index a5ce2e841..a5ce2e841 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-bmc.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml index a4c34b4fc..a4c34b4fc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-fru-not-sent-by-host.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml index 803ed77ad..803ed77ad 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml +++ b/meta-ibm/recipes-phosphor/configuration/acx22-yaml-config/witherspoon/acx22-ipmi-hwmon-sensors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf index 638ae7e5d..638ae7e5d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf index a5ba3f328..a5ba3f328 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/mihawk/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf index 7264e8278..7264e8278 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/client.2201.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/client.2201.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf index 638ae7e5d..638ae7e5d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf index e98587f15..e98587f15 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/rainier/server.ttyVUART1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf index 7264e8278..7264e8278 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/client.2201.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf index 010d82468..010d82468 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf index e98587f15..e98587f15 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend index c10b7ce04..c10b7ce04 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ibm/recipes-phosphor/console/obmc-console_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy.bb b/meta-ibm/recipes-phosphor/dbus/events-policy.bb index 52cb31313..52cb31313 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/events-policy.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy/config.yaml b/meta-ibm/recipes-phosphor/dbus/events-policy/config.yaml index 5c62d45a3..5c62d45a3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/events-policy/config.yaml +++ b/meta-ibm/recipes-phosphor/dbus/events-policy/config.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy.bb b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb index f8355053d..f8355053d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/mihawk/air-cooled.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/mihawk/air-cooled.yaml index 52232e3f0..52232e3f0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/mihawk/air-cooled.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/mihawk/air-cooled.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/mihawk/fan-errors.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/mihawk/fan-errors.yaml index 65cfbeb25..65cfbeb25 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/mihawk/fan-errors.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/mihawk/fan-errors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml index bfdcd1bb6..bfdcd1bb6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/swift/air-cooled.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml index 794d91f17..794d91f17 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/swift/fan-errors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml index 661021a9b..661021a9b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/swift/water-cooled.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml index d60aa9179..d60aa9179 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/air-cooled.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml index 0c14627d2..0c14627d2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/fan-errors.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml b/meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml index a279cfefa..a279cfefa 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml +++ b/meta-ibm/recipes-phosphor/dbus/fan-policy/witherspoon/water-cooled.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index bfc789788..bfc789788 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend index 3a18960ea..3a18960ea 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 5c9d0b15c..5c9d0b15c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy.bb b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb index 8d3df4600..8d3df4600 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/power-supply-policy.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml b/meta-ibm/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml index e00e747b6..e00e747b6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml +++ b/meta-ibm/recipes-phosphor/dbus/power-supply-policy/power-supply-policy.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy.bb b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb index b5b38baa3..b5b38baa3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy.bb +++ b/meta-ibm/recipes-phosphor/dbus/thermal-policy.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/ibm-ac-server/thermal-policy.yaml b/meta-ibm/recipes-phosphor/dbus/thermal-policy/ibm-ac-server/thermal-policy.yaml index 7c48509c5..7c48509c5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/ibm-ac-server/thermal-policy.yaml +++ b/meta-ibm/recipes-phosphor/dbus/thermal-policy/ibm-ac-server/thermal-policy.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml b/meta-ibm/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml index 727630cb8..727630cb8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml +++ b/meta-ibm/recipes-phosphor/dbus/thermal-policy/mihawk/thermal-policy.yaml diff --git a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend index 402e4fa09..814699c76 100644 --- a/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend +++ b/meta-ibm/recipes-phosphor/dump/phosphor-debug-collector_%.bbappend @@ -1,4 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" + +PACKAGECONFIG_append_witherspoon-128 = " host-dump-offload-pldm" +PACKAGECONFIG_append_rainier = " host-dump-offload-pldm" +PACKAGECONFIG_append_witherspoon-tacoma = " host-dump-offload-pldm" SRC_URI += "file://plugins.d/ibm_elogall" @@ -14,7 +18,6 @@ python link_ibm_plugins() { workdir = d.getVar('WORKDIR', True) script = os.path.join(workdir, 'plugins.d', 'ibm_elogall') install_dreport_user_script(script, d) - } do_install[postfuncs] += "install_ibm_plugins" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend index 8f2097cc1..8f2097cc1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml index 2efbb0c7d..2efbb0c7d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/mihawk/events.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml index c1902d02b..c1902d02b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend index 8f2097cc1..8f2097cc1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml index d0a09004e..d0a09004e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/mihawk/fans.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml index a70ac85a3..a70ac85a3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/swift/fans.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml index a70ac85a3..a70ac85a3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-fan-config/witherspoon/fans.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend index 8f2097cc1..8f2097cc1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/mihawk/zone_conditions.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/mihawk/zone_conditions.yaml index 7dc99b6a2..7dc99b6a2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/mihawk/zone_conditions.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/mihawk/zone_conditions.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml index 0c8b3c5ff..0c8b3c5ff 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/swift/zone_conditions.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml index 0c8b3c5ff..0c8b3c5ff 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config/witherspoon/zone_conditions.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend index 8f2097cc1..8f2097cc1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/mihawk/zones.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/mihawk/zones.yaml index 4deb2523e..4deb2523e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/mihawk/zones.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/mihawk/zones.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml index c10c6c186..c10c6c186 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/swift/zones.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml index 63303d7c0..63303d7c0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index 8f2097cc1..8f2097cc1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml index 076349de5..076349de5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/mihawk/monitor.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml index 2c93e65c8..2c93e65c8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/swift/monitor.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml index 5db7966fa..5db7966fa 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-monitor-config/witherspoon/monitor.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index 9442477af..9442477af 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/mihawk/config.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/mihawk/config.yaml index 9cb5ecddb..9cb5ecddb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/mihawk/config.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/mihawk/config.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml index 20dc31c40..20dc31c40 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/swift/config.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json index 36cdae85b..36cdae85b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan-presence-config/witherspoon/config.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf index 90b1e810e..90b1e810e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-conflicts.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf index 023e61a64..023e61a64 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/fan-watchdog-monitor.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/mihawk/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/mihawk/obmc/phosphor-fan/phosphor-cooling-type-0.conf index 21fcfcb49..21fcfcb49 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/mihawk/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/mihawk/obmc/phosphor-fan/phosphor-cooling-type-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/mihawk/phosphor-cooling-type@.service b/meta-ibm/recipes-phosphor/fans/phosphor-fan/mihawk/phosphor-cooling-type@.service index 9232b13fc..9232b13fc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/mihawk/phosphor-cooling-type@.service +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/mihawk/phosphor-cooling-type@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf index e5e8f435e..e5e8f435e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/swift/obmc/phosphor-fan/phosphor-cooling-type-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service b/meta-ibm/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service index c1f5ae293..c1f5ae293 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/swift/phosphor-cooling-type@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf index dcab0ee98..dcab0ee98 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon-tacoma/obmc/phosphor-fan/phosphor-cooling-type-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf index e5e8f435e..e5e8f435e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/obmc/phosphor-fan/phosphor-cooling-type-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service index c1f5ae293..c1f5ae293 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-cooling-type@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service index 489292bfa..267907776 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan/witherspoon/phosphor-fan-control@.service @@ -1,7 +1,7 @@ [Unit] Description=Phosphor Fan Control Daemon -Requires=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40100-max31785\x4052.service -After=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40100-max31785\x4052.service +Requires=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service +After=max31785-hwmon-helper@ahb-apb-bus\x401e78a000-i2c\x2dbus\x40{ADDR}-max31785\x4052.service [Service] Restart=on-failure diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 70bbc77d4..713c0c6a2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -30,6 +30,7 @@ SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_ibm-ac-server = " ${@compo SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog +SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" @@ -38,12 +39,9 @@ SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-monitor.conf: SYSTEMD_OVERRIDE_phosphor-fan-control_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" SYSTEMD_OVERRIDE_phosphor-fan-monitor_witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -# Remove fan control init service completely -SYSTEMD_SERVICE_${PN}-control_remove_witherspoon = "${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control_remove_witherspoon = "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" -# Remove fan control from being linked -SYSTEMD_LINK_${PN}-control_remove_witherspoon = "${@compose_list(d, 'FMT_CONTROL', 'OBMC_CHASSIS_INSTANCES')}" - +# Witherspoon fan control service linking +# Link fan control init service +SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to be started at standby FMT_CONTROL_STDBY_witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" @@ -54,3 +52,8 @@ SYSTEMD_LINK_${PN}-control_witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON # Enable the use of JSON on the fan applications that support it EXTRA_OECONF_append_witherspoon = " --enable-json" RDEPENDS_${PN}-presence-tach_append_witherspoon = " phosphor-fan-presence-config" + +# Set the appropriate i2c address used within the overridden phosphor-fan-control@.service +# file that's used for witherspoon type(including witherspoon-tacoma) machines +SYSTEMD_SUBSTITUTIONS_witherspoon = "ADDR:100:phosphor-fan-control@.service" +SYSTEMD_SUBSTITUTIONS_witherspoon-tacoma = "ADDR:200:phosphor-fan-control@.service" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog.bb index 93c8d457b..93c8d457b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf index ce7824ccb..ce7824ccb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf +++ b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/fan-watchdog.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf index b4e5ce74e..b4e5ce74e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf +++ b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/obmc/witherspoon-fan-watchdog/reset-fan-watchdog.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service index 945561b50..945561b50 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service +++ b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog-monitor@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service index 597ee03cb..597ee03cb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service +++ b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-fan-watchdog.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service index 675a67269..675a67269 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service +++ b/meta-ibm/recipes-phosphor/fans/witherspoon-fan-watchdog/witherspoon-reset-fan-watchdog.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend index 6c1f27534..6c1f27534 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/openpower-software-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 61297c12c..61297c12c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/flash/phosphor-software-manager_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb index 386a2b93d..386a2b93d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/id-button-pressed.service b/meta-ibm/recipes-phosphor/gpio/id-button/id-button-pressed.service index c4f939cc3..c4f939cc3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/id-button-pressed.service +++ b/meta-ibm/recipes-phosphor/gpio/id-button/id-button-pressed.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/obmc/gpio/id_button b/meta-ibm/recipes-phosphor/gpio/id-button/obmc/gpio/id_button index 370e609cd..370e609cd 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/obmc/gpio/id_button +++ b/meta-ibm/recipes-phosphor/gpio/id-button/obmc/gpio/id_button diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh b/meta-ibm/recipes-phosphor/gpio/id-button/toggle_identify_led.sh index 496ece2b2..496ece2b2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/id-button/toggle_identify_led.sh +++ b/meta-ibm/recipes-phosphor/gpio/id-button/toggle_identify_led.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-0.conf index 577548792..577548792 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-1.conf index 4d76afb4d..4d76afb4d 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/mihawk/obmc/gpio/phosphor-power-supply-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf index e271d4d63..e271d4d63 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf index 07564e989..07564e989 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf index 304442fe9..304442fe9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf index 0f2a9c4f6..0f2a9c4f6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf index 3ea74acab..3ea74acab 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/rainier/obmc/gpio/phosphor-power-supply-3.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf index 57f5c7a4c..57f5c7a4c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/swift/obmc/gpio/phosphor-power-supply-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf index d4f7e1d44..d4f7e1d44 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf index 029912ea5..029912ea5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon-tacoma/obmc/gpio/phosphor-power-supply-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf index d7681f896..d7681f896 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor/witherspoon/obmc/gpio/phosphor-power-supply-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 04399f83c..04399f83c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend index 423a9e4a1..9ceffea77 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend @@ -1,9 +1,5 @@ RDEPENDS_${PN}_append_ibm-ac-server = " avsbus-control" RDEPENDS_${PN}_append_witherspoon = " vrm-control" RDEPENDS_${PN}_append_ibm-ac-server = " power-workarounds" -RDEPENDS_${PN}_remove_ibm-ac-server = "p9-vcs-workaround" RDEPENDS_${PN}_append_mihawk = " avsbus-control" RDEPENDS_${PN}_append_mihawk = " vrm-control" -RDEPENDS_${PN}_remove_mihawk = "p9-vcs-workaround" -RDEPENDS_${PN}_remove_rainier = "p9-vcs-workaround" - diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend index 562679222..562679222 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/recipes-phosphor/images/obmc-phosphor-image.bbappend diff --git a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend deleted file mode 100644 index 68b7fa2c8..000000000 --- a/meta-ibm/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -inherit obmc-phosphor-discovery-service - -REGISTERED_SERVICES_${PN} += "obmc_redfish:tcp:443:" -REGISTERED_SERVICES_${PN} += "obmc_rest:tcp:443:" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb index 0c4b56f72..0c4b56f72 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup.bb +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml index a2ff9d177..a2ff9d177 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/swift/inventory-cleanup.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml index a363bda8d..a363bda8d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml +++ b/meta-ibm/recipes-phosphor/inventory/inventory-cleanup/witherspoon/inventory-cleanup.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index accf38b18..accf38b18 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend index bdc3912d5..bdc3912d5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend index fd27f7dce..fd27f7dce 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index e3e5002bb..e3e5002bb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/channel_config.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/channel_config.json index 3f4746e56..3f4746e56 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/channel_config.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/channel_config.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json index 837071398..837071398 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json index 6cd9a94b3..6cd9a94b3 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json index 97e8f32b5..97e8f32b5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json index 7f26c247e..7f26c247e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json index cd72656e2..cd72656e2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json index 3a4571935..3a4571935 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dev_id.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json index 97e8f32b5..97e8f32b5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 6efe241bc..6efe241bc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 8d51478af..8d51478af 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index c847c0564..c847c0564 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-ibm/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb index 2281192fe..2281192fe 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb +++ b/meta-ibm/recipes-phosphor/ipmi/wistron-ipmi-oem_git.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config-native.bb b/meta-ibm/recipes-phosphor/leds/mihawk-led-manager-config-native.bb index 459a3161c..459a3161c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config-native.bb +++ b/meta-ibm/recipes-phosphor/leds/mihawk-led-manager-config-native.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml b/meta-ibm/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml index 0a7a160fe..0a7a160fe 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml +++ b/meta-ibm/recipes-phosphor/leds/mihawk-led-manager-config/led.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json index 123aa6df9..123aa6df9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging/ibm-ac-server/policyTable.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json b/meta-ibm/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json index 9e2701eb6..9e2701eb6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging/mihawk/policyTable.json diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 50be5da41..cb48849f5 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -30,6 +30,9 @@ SRC_URI += "file://policyTable.json" PACKAGECONFIG ??= "" PACKAGECONFIG[policy-interface] = "--enable-policy-interface, --disable-policy-interface,," +PACKAGECONFIG_ibm-ac-server = "policy-interface" +PACKAGECONFIG_mihawk = "policy-interface" + SERVICE = "com.ibm.Logging.service" DBUS_SERVICE_${PN} += "${SERVICE}" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb index a52e93762..a52e93762 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb +++ b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts-native.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/mihawk-phosphor-logging-callouts/callouts.yaml b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts/callouts.yaml index 4fd506047..4fd506047 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/mihawk-phosphor-logging-callouts/callouts.yaml +++ b/meta-ibm/recipes-phosphor/logging/mihawk-phosphor-logging-callouts/callouts.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend index 5c1d740ba..5c1d740ba 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/recipes-phosphor/logging/phosphor-logging_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check-pnor-format.service b/meta-ibm/recipes-phosphor/mboxd/mboxd/check-pnor-format.service index 88bf0ad39..88bf0ad39 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check-pnor-format.service +++ b/meta-ibm/recipes-phosphor/mboxd/mboxd/check-pnor-format.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh b/meta-ibm/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh index ec043eaf9..ec043eaf9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh +++ b/meta-ibm/recipes-phosphor/mboxd/mboxd/check_pnor_format.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend index e23d8fa45..e23d8fa45 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ibm/recipes-phosphor/mboxd/mboxd_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend b/meta-ibm/recipes-phosphor/network/first-boot-set-mac_%.bbappend index fc8f6b861..fc8f6b861 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/first-boot-set-mac_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/first-boot-set-mac_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service index 890551e7a..890551e7a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend index bcb2d0136..bcb2d0136 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 44f8028af..2231cedd1 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1,37 @@ -RDEPENDS_${PN}-logging += "ibm-logging"
\ No newline at end of file +POWER_SERVICE_PACKAGES_AC_SERVER = " \ + phosphor-power-monitor \ + phosphor-power-systemd-links-monitor \ + phosphor-power-sequencer \ + phosphor-power-systemd-links-sequencer \ + phosphor-power-utils \ + phosphor-power \ +" + +POWER_SERVICE_PACKAGES_RAINIER = " \ + ${POWER_SERVICE_PACKAGES_AC_SERVER} \ + phosphor-power-regulators \ + phosphor-power-psu-monitor \ +" + +EXTRA_IBM_LOGGING_PKGS = "" +EXTRA_IBM_LOGGING_PKGS_witherspoon = "ibm-logging" +EXTRA_IBM_LOGGING_PKGS_witherspoon-tacoma = "" +EXTRA_IBM_LOGGING_PKGS_mihawk = "ibm-logging" + +RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" +RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" +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 = " ${POWER_SERVICE_PACKAGES_AC_SERVER} witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " ${POWER_SERVICE_PACKAGES_RAINIER} phosphor-webui" +RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing wistron-ipmi-oem" +RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS_${PN}-extras_remove_swift = "obmc-ikvm" +RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" +RDEPENDS_${PN}-logging_append = " ${EXTRA_IBM_LOGGING_PKGS}" +RDEPENDS_${PN}-extras_append_rainier = " pldm" +RDEPENDS_${PN}-extras_append_witherspoon-128 = " pldm openpower-hw-diags" + +RDEPENDS_${PN}-extras_append_witherspoon-tacoma = " pldm" + +${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/11.json b/meta-ibm/recipes-phosphor/pldm/pldm/11.json index 26fdf5c09..26fdf5c09 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/11.json +++ b/meta-ibm/recipes-phosphor/pldm/pldm/11.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/enum_attrs.json b/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json index cf20e3e31..cf20e3e31 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/enum_attrs.json +++ b/meta-ibm/recipes-phosphor/pldm/pldm/enum_attrs.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/fileTable.json b/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json index 9d9750a58..9d9750a58 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/fileTable.json +++ b/meta-ibm/recipes-phosphor/pldm/pldm/fileTable.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/host_eid b/meta-ibm/recipes-phosphor/pldm/pldm/host_eid index ec635144f..ec635144f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm/host_eid +++ b/meta-ibm/recipes-phosphor/pldm/pldm/host_eid diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm_%.bbappend b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend index 335396bd7..335396bd7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/pldm/pldm_%.bbappend +++ b/meta-ibm/recipes-phosphor/pldm/pldm_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend index 03646adeb..03646adeb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-logging-error-logs-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json index baa96ac27..baa96ac27 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/rainier/psu.json +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/rainier/psu.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf index 167e605d0..167e605d0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf index faa5adec6..faa5adec6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/obmc/power-supply-monitor/power-supply-monitor-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/psu.json index 94f14dd60..94f14dd60 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/swift/psu.json +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/swift/psu.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf index 15390ce42..15390ce42 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf index ce9f322a5..ce9f322a5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon-tacoma/obmc/power-supply-monitor/power-supply-monitor-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf index d6732e6b8..d6732e6b8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf index cace335b1..cace335b1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/obmc/power-supply-monitor/power-supply-monitor-1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service index 458c5e6d7..458c5e6d7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/pseq-monitor-pgood.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/psu.json index cbabc7839..cbabc7839 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power/witherspoon/psu.json +++ b/meta-ibm/recipes-phosphor/power/phosphor-power/witherspoon/psu.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 1105e0cf6..1105e0cf6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer.bb b/meta-ibm/recipes-phosphor/power/power-sequencer.bb index be5035eca..be5035eca 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer.bb +++ b/meta-ibm/recipes-phosphor/power/power-sequencer.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml index a6bba44ce..a6bba44ce 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml +++ b/meta-ibm/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml b/meta-ibm/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml index abb2ce326..abb2ce326 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml +++ b/meta-ibm/recipes-phosphor/power/power-sequencer/swift/ucd90160.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml b/meta-ibm/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml index 9dd381248..9dd381248 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml +++ b/meta-ibm/recipes-phosphor/power/power-sequencer/witherspoon/ucd90160.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb index 3c174c3e8..3c174c3e8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-pfault-analysis-error-native_git.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 4f599a78c..4f599a78c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service index 9e342367b..9e342367b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync/power-supply-sync.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules index fd63e0549..fd63e0549 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/70-max31785-hwmon.rules diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules index 548b219e7..548b219e7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/ibm-ac-server/70-hwmon.rules diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service index c7ed6f113..c7ed6f113 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/max31785-hwmon-helper@.service diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf index 80ff06f9f..80ff06f9f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@58.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf index db56c888d..db56c888d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@5b.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf index 3c25a4a01..3c25a4a01 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf index 7f1f4d871..7f1f4d871 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@72.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf index 5f0985d7c..5f0985d7c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf index 438372837..438372837 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@72.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf index 939b3c1e5..939b3c1e5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/emc1403@4c.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf index 4f89e7f34..4f89e7f34 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@48.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf index 959c66f9d..959c66f9d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@400/tmp275@49.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf index 82f065818..82f065818 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf index 066ebf6c2..066ebf6c2 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index d6d2416ea..d6d2416ea 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index ba53cd95d..ba53cd95d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf index 81d3aa519..81d3aa519 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-12v.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf index d7e4a92e8..d7e4a92e8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-3v.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf index b9ea49ef0..b9ea49ef0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-5v.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf index 6f7341cd5..6f7341cd5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-battery.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf index 4b8261f40..4b8261f40 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf index 02732c677..02732c677 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vcs1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf index f91914057..f91914057 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf index fe188856b..fe188856b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdd1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf index 3a11fd246..3a11fd246 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddra.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf index e9811cb1e..e9811cb1e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrb.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf index 1753d93a5..1753d93a5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrc.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf index 8fbfcd330..8fbfcd330 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vddrd.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf index afe6fcead..afe6fcead 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf index 5141b2969..5141b2969 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vdn1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf index bf8e352e5..bf8e352e5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio0.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf index d81958530..d81958530 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/iio-hwmon-vio1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf index 409a75f0b..409a75f0b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon-max31785/max31785.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh index 5eff17450..5eff17450 100755 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/start_max31785_hwmon.sh diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf index 0b97ed559..0b97ed559 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf index 0b97ed559..0b97ed559 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf index 2fadbdec0..2fadbdec0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf index e463b517c..e463b517c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf index d685863f8..d685863f8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf index c8a729067..c8a729067 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf index ef2b46d53..ef2b46d53 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf index 7d2f2ef2a..7d2f2ef2a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf index ca7793722..ca7793722 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf index 7b6b356a4..7b6b356a4 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf index 5e0c63d34..5e0c63d34 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf index 836eef63b..836eef63b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf index 213f64845..213f64845 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf index a96bb93a8..a96bb93a8 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@48.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf index 188898b36..188898b36 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/tmp275@4a.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 5582e9dbf..5582e9dbf 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index 1cc4afb71..1cc4afb71 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf index d3df21599..d3df21599 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf index c96bfa76b..c96bfa76b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf index e463b517c..e463b517c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf index 2fadbdec0..2fadbdec0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf index c5344aeb6..c5344aeb6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf index 23746aa11..23746aa11 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf index e7d8aaf23..e7d8aaf23 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf index 30ec05dbb..30ec05dbb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf index 3af092867..3af092867 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/bmp280@77.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf index cdf8b4726..cdf8b4726 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/dps310@76.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf index d3df21599..d3df21599 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_air.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf index c96bfa76b..c96bfa76b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/max31785@52_water.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf index e463b517c..e463b517c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf index 2fadbdec0..2fadbdec0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf index c5344aeb6..c5344aeb6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf index 23746aa11..23746aa11 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@140/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf index e7d8aaf23..e7d8aaf23 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@70.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf index 30ec05dbb..30ec05dbb 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@180/ir35221@71.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf index 3af092867..3af092867 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/tmp275@4a.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index c5fa56f65..c5fa56f65 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index 55b72fc2a..55b72fc2a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 36029dd72..36029dd72 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml index 71ed6711d..71ed6711d 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/ClearHostSecurityKeys-default-zero.override.yml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml index 905ac12b4..905ac12b4 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager/TPMEnable-default-true.override.yml diff --git a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend index 9dd35757a..1068e1d00 100644 --- a/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-manager_%.bbappend @@ -1,2 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_append_ibm-ac-server = " file://TPMEnable-default-true.override.yml" +SRC_URI_append_ibm-ac-server += " file://ClearHostSecurityKeys-default-zero.override.yml" +SRC_URI_append_mihawk = " file://TPMEnable-default-true.override.yml" SRC_URI_append = " file://ibm_settings.override.yml" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend index aa8149c1b..aa8149c1b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml index c823896f1..c823896f1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml +++ b/meta-ibm/recipes-phosphor/settings/phosphor-settings-read-settings-mrw-native/mrw-override-settings.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/mihawk/gpio_defs.json b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/mihawk/gpio_defs.json index 388ae6832..388ae6832 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/mihawk/gpio_defs.json +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/mihawk/gpio_defs.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json index 296039502..296039502 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/rainier/gpio_defs.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json index 83143b0f4..83143b0f4 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/swift/gpio_defs.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon-tacoma/gpio_defs.json b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon-tacoma/gpio_defs.json index 4ea152249..4ea152249 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon-tacoma/gpio_defs.json +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon-tacoma/gpio_defs.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json index 5df8d0141..5df8d0141 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf/witherspoon/gpio_defs.json diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 72d991c7e..72d991c7e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-ibm/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb index 2edb98d3c..2edb98d3c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory-native.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory index b599ec9ec..b599ec9ec 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-inventory/inventory diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb index c2332d56e..c2332d56e 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout-native.bb diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml index 5bceb2f72..5bceb2f72 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml +++ b/meta-ibm/recipes-phosphor/vpd/mihawk-openpower-fru-vpd-layout/layout.yaml diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend index 6c0cbeba9..6c0cbeba9 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend +++ b/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend diff --git a/meta-ibm/meta-witherspoon/recipes.txt b/meta-ibm/recipes.txt index a943f591a..a943f591a 100644 --- a/meta-ibm/meta-witherspoon/recipes.txt +++ b/meta-ibm/recipes.txt diff --git a/meta-ingrasys/conf/layer.conf b/meta-ingrasys/conf/layer.conf index 2686d406b..5b9d71b18 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 = "warrior zeus" +LAYERSERIES_COMPAT_ingrasys = "warrior zeus dunfell" diff --git a/meta-ingrasys/meta-zaius/conf/layer.conf b/meta-ingrasys/meta-zaius/conf/layer.conf index d78ede1a1..e9412ddd0 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 = "warrior zeus" +LAYERSERIES_COMPAT_zaius = "warrior zeus dunfell" diff --git a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf index 38713cdf8..26595fa3d 100644 --- a/meta-ingrasys/meta-zaius/conf/machine/zaius.conf +++ b/meta-ingrasys/meta-zaius/conf/machine/zaius.conf @@ -5,8 +5,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" FLASH_SIZE = "65536" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = 'vcs-control' - require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/ingrasys.inc 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 597dff4ba..3ab36b1b4 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/vcs-control.bb @@ -6,9 +6,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit obmc-phosphor-systemd -PROVIDES += 'virtual/p9-vcs-workaround' -RPROVIDES_${PN} += 'virtual-p9-vcs-workaround' - TMPL_OFF = "vcs-off@.service" TMPL_ON = "vcs-on@.service" INSTFMT_OFF = "vcs-off@{0}.service" diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend index 23cdb8d7d..42f7117ae 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}_append_zaius = ' avsbus-control' +RDEPENDS_${PN}_append_zaius = ' avsbus-control vcs-control' diff --git a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb index 53024e0c7..ef3cec5a4 100755 --- a/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb +++ b/meta-intel/meta-common/recipes-intel/ipmi/intel-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem" -SRCREV = "2b664d5a185247f0448c763ba7d0e42cfc245024" +SRCREV = "899bfd15e7230b5da0b2b16c814f4e3bdf6c824c" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" diff --git a/meta-nuvoton/conf/layer.conf b/meta-nuvoton/conf/layer.conf index 0ca32584d..19af7e976 100644 --- a/meta-nuvoton/conf/layer.conf +++ b/meta-nuvoton/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "nuvoton-layer" BBFILE_PATTERN_nuvoton-layer = "" LAYERVERSION_nuvoton-layer = "1" -LAYERSERIES_COMPAT_nuvoton-layer = "warrior zeus" +LAYERSERIES_COMPAT_nuvoton-layer = "warrior zeus dunfell" diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc new file mode 100644 index 000000000..55d8b4787 --- /dev/null +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton.inc @@ -0,0 +1,333 @@ +SUMMARY = "Universal Boot Loader for embedded devices" +PROVIDES = "virtual/bootloader" + +B = "${WORKDIR}/build" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS += "kern-tools-native" + +inherit uboot-config uboot-extlinux-config uboot-sign deploy cml1 python3native + +DEPENDS += "swig-native" + +EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' +EXTRA_OEMAKE += 'STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' + +PACKAGECONFIG ??= "openssl" +# u-boot will compile its own tools during the build, with specific +# configurations (aka when CONFIG_FIT_SIGNATURE is enabled) openssl is needed as +# a host build dependency. +PACKAGECONFIG[openssl] = ",,openssl-native" + +# Allow setting an additional version string that will be picked up by the +# u-boot build system and appended to the u-boot version. If the .scmversion +# file already exists it will not be overwritten. +UBOOT_LOCALVERSION ?= "" + +# Some versions of u-boot use .bin and others use .img. By default use .bin +# but enable individual recipes to change this value. +UBOOT_SUFFIX ??= "bin" +UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" +UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}" +UBOOT_MAKE_TARGET ?= "all" + +# Output the ELF generated. Some platforms can use the ELF file and directly +# load it (JTAG booting, QEMU) additionally the ELF can be used for debugging +# purposes. +UBOOT_ELF ?= "" +UBOOT_ELF_SUFFIX ?= "elf" +UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}" +UBOOT_ELF_BINARY ?= "u-boot.${UBOOT_ELF_SUFFIX}" +UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}" + +# Some versions of u-boot build an SPL (Second Program Loader) image that +# should be packaged along with the u-boot binary as well as placed in the +# deploy directory. For those versions they can set the following variables +# to allow packaging the SPL. +SPL_BINARY ?= "" +SPL_BINARYNAME ?= "${@os.path.basename(d.getVar("SPL_BINARY"))}" +SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}" +SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}" + +# Additional environment variables or a script can be installed alongside +# u-boot to be used automatically on boot. This file, typically 'uEnv.txt' +# or 'boot.scr', should be packaged along with u-boot as well as placed in the +# deploy directory. Machine configurations needing one of these files should +# include it in the SRC_URI and set the UBOOT_ENV parameter. +UBOOT_ENV_SUFFIX ?= "txt" +UBOOT_ENV ?= "" +UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" +UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" +UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" + +# U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf +# to find EXTLINUX conf file. +UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" +UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" +UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" + +# returns all the elements from the src uri that are .cfg files +def find_cfgs(d): + sources=src_patches(d, True) + sources_list=[] + for s in sources: + if s.endswith('.cfg'): + sources_list.append(s) + + return sources_list + +do_configure () { + if [ -z "${UBOOT_CONFIG}" ]; then + if [ -n "${UBOOT_MACHINE}" ]; then + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} + else + oe_runmake -C ${S} O=${B} oldconfig + fi + merge_config.sh -m .config ${@" ".join(find_cfgs(d))} + cml1_do_configure + fi +} + +do_compile () { + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then + sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk + fi + + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + + if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] + then + echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion + echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion + fi + + if [ -n "${UBOOT_CONFIG}" ] + then + unset i j k + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + oe_runmake -C ${S} O=${B}/${config} ${config} + oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} + for binary in ${UBOOT_BINARIES}; do + k=$(expr $k + 1); + if [ $k -eq $i ]; then + cp ${B}/${config}/${binary} ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} + fi + done + unset k + fi + done + unset j + done + unset i + else + oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} + fi + +} + +do_install () { + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -d ${D}/boot + install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -d ${D}/boot + install -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} + ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} + fi + + if [ -n "${UBOOT_ELF}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} + fi + fi + + if [ -e ${WORKDIR}/fw_env.config ] ; then + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + fi + + if [ -n "${SPL_BINARY}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} + ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME} + fi + fi + + if [ -n "${UBOOT_ENV}" ] + then + install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} + ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY} + fi + + if [ "${UBOOT_EXTLINUX}" = "1" ] + then + install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME} + fi + +} + +FILES_${PN} = "/boot ${sysconfdir} ${datadir}" + +do_deploy () { + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -d ${DEPLOYDIR} + install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} + cd ${DEPLOYDIR} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} + fi + done + unset j + done + unset i + else + install -d ${DEPLOYDIR} + install -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} + cd ${DEPLOYDIR} + rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} + ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} + fi + + if [ -n "${UBOOT_ELF}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} + ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} + ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} + fi + fi + + + if [ -n "${SPL_BINARY}" ] + then + if [ -n "${UBOOT_CONFIG}" ] + then + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ] + then + install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} + rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} + ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + done + unset j + done + unset i + else + install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} + rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} + ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} + fi + fi + + + if [ -n "${UBOOT_ENV}" ] + then + install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} + rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} + ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY} + ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} + fi + + if [ "${UBOOT_EXTLINUX}" = "1" ] + then + install -m 644 ${UBOOT_EXTLINUX_CONFIG} ${DEPLOYDIR}/${UBOOT_EXTLINUX_SYMLINK} + ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE} + ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME} + fi +} + +addtask deploy before do_build after do_compile diff --git a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb index 0bd23d04d..3ecb4a457 100644 --- a/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb +++ b/meta-nuvoton/recipes-bsp/u-boot/u-boot-nuvoton_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "U-boot for Nuvoton NPCM7xx Baseboard Management Controller" require u-boot-common-nuvoton.inc -require recipes-bsp/u-boot/u-boot.inc +require u-boot-nuvoton.inc PROVIDES += "u-boot" diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig index 207ec6691..0c9767e0a 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton/defconfig @@ -132,3 +132,6 @@ CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_USER_API_SKCIPHER=y CONFIG_CRYPTO_DEV_NPCMX50=y CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_USER_API_HASH=y diff --git a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb index 2d33e378c..95981f4b3 100644 --- a/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb +++ b/meta-nuvoton/recipes-kernel/linux/linux-nuvoton_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.4" -LINUX_VERSION ?= "5.4.4" +LINUX_VERSION ?= "5.4.32" -SRCREV="6d96543a7ed844fd3923ad30c93db48d3f7f00d0" +SRCREV="7dc9442bbe7d0d1512c64a97b7cc58fed2b38ba4" require linux-nuvoton.inc diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.5.0.bb new file mode 100644 index 000000000..aaaee0dee --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-distro_1.5.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Distro is an OS platform information API" +SECTION = "devel/python" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" + +PYPI_PACKAGE = "distro" + +SRC_URI[md5sum] = "0ed68b4064709bdaaf6cce69780ddc51" +SRC_URI[sha256sum] = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openpower/conf/machine/include/p9.inc b/meta-openpower/conf/machine/include/p9.inc index b0e0bb95e..4c30aac18 100644 --- a/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openpower/conf/machine/include/p9.inc @@ -1,2 +1,2 @@ -OBMC_MACHINE_FEATURES += 'p9-vcs-workaround op-fsi p9-cfam-override' +OBMC_MACHINE_FEATURES += 'op-fsi p9-cfam-override' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" diff --git a/meta-openpower/recipes-bsp/ecmd/croserver_git.bb b/meta-openpower/recipes-bsp/ecmd/croserver_git.bb index 6dd7fae57..60b06ecb1 100644 --- a/meta-openpower/recipes-bsp/ecmd/croserver_git.bb +++ b/meta-openpower/recipes-bsp/ecmd/croserver_git.bb @@ -4,7 +4,7 @@ LICENSE= "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/NOTICE;md5=fee220301a2af3faf8f211524b4248ea" SRC_URI = "git://github.com/open-power/eCMD.git" -SRCREV = "b858b2f212bda2665ad41e821302e8196c7aec07" +SRCREV = "79cadcd0d299cc044791da9b5e3746108290558a" DEPENDS += "zlib" SRC_URI += "file://croserver.service" @@ -12,6 +12,7 @@ SRC_URI += "file://croserver.service" S = "${WORKDIR}/git" inherit python3native +DEPENDS += "${PYTHON_PN}-distro-native" do_configure() { LD="${CXX}" ${PYTHON} ${S}/config.py \ diff --git a/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service b/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service index 77a88e864..825275ae7 100644 --- a/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service +++ b/meta-openpower/recipes-phosphor/host/op-host-control/start_host@.service @@ -8,6 +8,7 @@ Wants=obmc-power-on@%i.target After=obmc-power-on@%i.target Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/host@%i-on +ConditionPathExists=!/run/openbmc/mpreboot@%i [Service] ExecStart=/usr/bin/env openpower-proc-control startHost diff --git a/meta-openpower/recipes-phosphor/host/op-host-control/vcs_workaround@.service b/meta-openpower/recipes-phosphor/host/op-host-control/vcs_workaround@.service deleted file mode 100644 index bd9db809b..000000000 --- a/meta-openpower/recipes-phosphor/host/op-host-control/vcs_workaround@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Run VCS workaround on host%i -Wants=obmc-host-start-pre@%i.target -Before=obmc-host-start-pre@%i.target -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Wants=fsi-scan@%i.service -After=fsi-scan@%i.service -Conflicts=obmc-chassis-poweroff@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -ExecStart=/usr/bin/env openpower-proc-control vcsWorkaround -SyslogIdentifier=openpower-proc-control -Type=oneshot -RemainAfterExit=yes - -[Install] -WantedBy=obmc-chassis-poweron@%i.target diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb index 8185ddf8f..9cb75f33e 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control-systemd-links.bb @@ -14,12 +14,19 @@ ALLOW_EMPTY_${PN} = "1" pkg_postinst_${PN}() { mkdir -p $D$systemd_system_unitdir/obmc-host-stop@0.target.wants mkdir -p $D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires + mkdir -p $D$systemd_system_unitdir/obmc-host-startmin@0.target.requires + mkdir -p $D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires + mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-stop-instructions@0.service" TARGET="../op-stop-instructions@.service" ln -s $TARGET $LINK - LINK="$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/op-cfam-reset.service" + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-cfam-reset.service" + TARGET="../op-cfam-reset.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/op-cfam-reset.service" TARGET="../op-cfam-reset.service" ln -s $TARGET $LINK @@ -30,16 +37,30 @@ pkg_postinst_${PN}() { TARGET="../cfam_override@.service" ln -s $TARGET $LINK fi + + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-continue-mpreboot@0.service" + TARGET="../op-continue-mpreboot@.service" + ln -s $TARGET $LINK + + LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service" + TARGET="../op-enter-mpreboot@.service" + ln -s $TARGET $LINK } pkg_prerm_${PN}() { LINK="$D$systemd_system_unitdir/obmc-host-stop@0.target.wants/op-stop-instructions@0.service" rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/op-cfam-reset.service" + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-cfam-reset.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-chassis-poweron@0.target.requires/op-cfam-reset.service" rm $LINK # Only uninstall cfam override if p9 system if [ "${@bb.utils.contains("MACHINE_FEATURES", "p9-cfam-override", "True", "False", d)}" = True ]; then LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/cfam_override@0.service" rm $LINK fi + LINK="$D$systemd_system_unitdir/obmc-host-startmin@0.target.requires/op-continue-mpreboot@0.service" + rm $LINK + LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/op-enter-mpreboot@0.service" + rm $LINK } diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 01ef6b043..5fdbcaddb 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -11,7 +11,7 @@ inherit autotools obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "7847960506ca4357e267fe05866b38aad236708f" +SRCREV = "c98bab51d0826daeb8cf5fe1725c0e8932cb1996" DEPENDS += " \ autoconf-archive-native \ @@ -34,4 +34,6 @@ SYSTEMD_SERVICE_${PN} += " \ op-stop-instructions@.service \ op-cfam-reset.service \ ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ " diff --git a/meta-openpower/recipes-phosphor/host/p9-host-start.bb b/meta-openpower/recipes-phosphor/host/p9-host-start.bb index 6905f34aa..84dc7b14a 100644 --- a/meta-openpower/recipes-phosphor/host/p9-host-start.bb +++ b/meta-openpower/recipes-phosphor/host/p9-host-start.bb @@ -11,8 +11,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" PROVIDES += 'virtual/obmc-host-ctl' RPROVIDES_${PN} += 'virtual-obmc-host-ctl' -RDEPENDS_${PN} += "p9-vcs-workaround \ - op-proc-control \ +RDEPENDS_${PN} += "op-proc-control \ op-proc-control-systemd-links" S = "${WORKDIR}" diff --git a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb b/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb deleted file mode 100644 index 29167b0e1..000000000 --- a/meta-openpower/recipes-phosphor/host/p9-vcs-workaround.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "POWER9 VCS workaround" -DESCRIPTION = "Apply fixes over FSI to POWER9 CPUs prior to host power on" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit obmc-phosphor-systemd - -FILESEXTRAPATHS_prepend := "${THISDIR}/op-host-control:" -RDEPENDS_${PN} += "virtual-p9-vcs-workaround op-proc-control" - -S = "${WORKDIR}" - -TMPL = "vcs_workaround@.service" -INSTFMT = "vcs_workaround@{0}.service" -TGTFMT = "obmc-chassis-poweron@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" - -SYSTEMD_SERVICE_${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb index 142c09d8d..67350a3d7 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_git.bb @@ -19,7 +19,6 @@ DEPENDS += "${PYTHON_PN}-mako-native" DEPENDS += "${PYTHON_PN}-pyyaml-native" DEPENDS += "phosphor-logging" DEPENDS += "phosphor-dbus-interfaces phosphor-dbus-interfaces-native" -DEPENDS += "openpower-dbus-interfaces openpower-dbus-interfaces-native" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" TARGET_CFLAGS += "-fpic" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index be11e2c43..673729b66 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SYSTEMD_SERVICE_${PN} = "attn_handler.service" PV = "0.1+git${SRCPV}" -SRCREV = "cf0e074e5793890920bc77075f207e21bef175fa" +SRCREV = "72feadcff8f5ebcb3ad1ae2aa6877b512b106135" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index f064d1270..668bef8a8 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "3d7b4fe107d210fb300ae8dccf07252ccda4c00c" +SRCREV = "ee72ab53e95318f247d2f791a3d9eb10824d430b" diff --git a/meta-phosphor/classes/image_types_phosphor.bbclass b/meta-phosphor/classes/image_types_phosphor.bbclass index 0259cf634..0d2ed898c 100644 --- a/meta-phosphor/classes/image_types_phosphor.bbclass +++ b/meta-phosphor/classes/image_types_phosphor.bbclass @@ -315,6 +315,22 @@ do_mk_static_nor_image() { mk_empty_image ${IMGDEPLOYDIR}/${IMAGE_NAME}.static.mtd ${FLASH_SIZE} } +do_generate_image_uboot_file() { + image_dst="$1" + uboot_offset=${FLASH_UBOOT_OFFSET} + + if [ ! -z ${SPL_BINARY} ]; then + dd bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} \ + if=${DEPLOY_DIR_IMAGE}/u-boot-spl.${UBOOT_SUFFIX} \ + of=${image_dst} + uboot_offset=${FLASH_UBOOT_SPL_SIZE} + fi + + dd bs=1k conv=notrunc seek=${uboot_offset} \ + if=${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} \ + of=${image_dst} +} + python do_generate_static() { import subprocess @@ -379,9 +395,9 @@ do_mk_static_symlinks() { ln -sf ${IMAGE_NAME}.static.mtd ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.static.mtd # Maintain non-standard legacy links + do_generate_image_uboot_file ${IMGDEPLOYDIR}/image-u-boot ln -sf ${IMAGE_NAME}.static.mtd ${IMGDEPLOYDIR}/flash-${MACHINE} ln -sf ${IMAGE_NAME}.static.mtd ${IMGDEPLOYDIR}/image-bmc - ln -sf u-boot.${UBOOT_SUFFIX} ${IMGDEPLOYDIR}/image-u-boot ln -sf ${FLASH_KERNEL_IMAGE} ${IMGDEPLOYDIR}/image-kernel ln -sf ${IMAGE_LINK_NAME}.${IMAGE_BASETYPE} ${IMGDEPLOYDIR}/image-rofs ln -sf ${IMAGE_LINK_NAME}.${OVERLAY_BASETYPE} ${IMGDEPLOYDIR}/image-rwfs @@ -437,7 +453,7 @@ make_image_links() { # Create some links to help make the tar archive in the format # expected by phosphor-bmc-code-mgmt. - ln -sf ${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} image-u-boot + do_generate_image_uboot_file image-u-boot ln -sf ${DEPLOY_DIR_IMAGE}/${FLASH_KERNEL_IMAGE} image-kernel ln -sf ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$rofs image-rofs ln -sf ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.$rwfs image-rwfs diff --git a/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass index 16dbc58dc..e69126365 100644 --- a/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-py-daemon.bbclass @@ -3,7 +3,7 @@ inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "python-dbus python-pygobject" +RDEPENDS_${PN} += "python3-dbus python3-pygobject" INSTALL_NAME ?= "${PN}" SCRIPT_NAME ?= "${INSTALL_NAME}.py" diff --git a/meta-phosphor/classes/skeleton-python.bbclass b/meta-phosphor/classes/skeleton-python.bbclass index 83fef5405..b81edac9c 100644 --- a/meta-phosphor/classes/skeleton-python.bbclass +++ b/meta-phosphor/classes/skeleton-python.bbclass @@ -1,4 +1,4 @@ -inherit setuptools +inherit setuptools3 do_compile_class-native() { : diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc index 86cc54ca9..31e669b65 100644 --- a/meta-phosphor/conf/distro/include/phosphor-base.inc +++ b/meta-phosphor/conf/distro/include/phosphor-base.inc @@ -74,7 +74,6 @@ ERROR_QA_append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/no-static-libs.inc require conf/distro/include/yocto-uninative.inc -DISTRO = "openbmc-phosphor" DISTRO_NAME = "Phosphor OpenBMC (Phosphor OpenBMC Project Reference Distro)" DISTRO_VERSION = "0.1.0" TARGET_VENDOR="-openbmc" diff --git a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend index de1aa2e1d..5aef993a2 100644 --- a/meta-phosphor/recipes-core/systemd/systemd_%.bbappend +++ b/meta-phosphor/recipes-core/systemd/systemd_%.bbappend @@ -2,13 +2,14 @@ FILES_${PN}-catalog-extralocales = \ "${exec_prefix}/lib/systemd/catalog/*.*.catalog" PACKAGES =+ "${PN}-catalog-extralocales" PACKAGECONFIG = "pam hostnamed networkd randomseed resolved sysusers timedated \ - timesyncd xz kmod coredump" + timesyncd xz kmod coredump sysvinit" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://default.network" SRC_URI += "file://0001-sd-bus-Don-t-automatically-add-ObjectManager.patch" FILES_${PN} += "${systemd_unitdir}/network/default.network" +EXTRA_OEMESON += "-Ddns-servers=''" do_install_append() { install -m 644 ${WORKDIR}/default.network ${D}${systemd_unitdir}/network/ diff --git a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb index 1274c1240..a0383d5fd 100644 --- a/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb +++ b/meta-phosphor/recipes-devtools/python/pyphosphor_git.bb @@ -7,8 +7,8 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit allarch -inherit setuptools -inherit python-dir +inherit setuptools3 +inherit python3-dir PACKAGE_BEFORE_PN = " \ ${PN}-ns \ diff --git a/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend b/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend deleted file mode 100644 index 020bdd6ab..000000000 --- a/meta-phosphor/recipes-devtools/python/python-mako_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# python-mako installs /usr/bin/mako-render for both python2 and python3, -# which causes a bitbake QA failure. Remove it from installation for the -# native target to avoid the collision. -# -# We don't currently use this as a target package and if we did, we shouldn't -# install both python2 and python3 variants. -# -# Once we are done with python2, we can delete this. - -do_install_append_class-native() { - rm ${D}${bindir}/mako-render -} diff --git a/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch b/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch deleted file mode 100644 index 9e251a37a..000000000 --- a/meta-phosphor/recipes-devtools/python/python-pygobject/obsolete_automake_macros.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9de1bb6f37c4aedb9b21640003db46927d25b30b Mon Sep 17 00:00:00 2001 -From: Marko Lindqvist <cazfi74@gmail.com> -Date: Wed, 22 Jun 2016 16:30:42 -0500 -Subject: [PATCH] python-pygobject: Backport 2.28.3 - -Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691101] - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f5ba355..ac5547a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -35,7 +35,7 @@ AC_SUBST(PYGOBJECT_MINOR_VERSION, pygobject_minor_version) - AC_DEFINE(PYGOBJECT_MICRO_VERSION, pygobject_micro_version, [pygobject micro version]) - AC_SUBST(PYGOBJECT_MICRO_VERSION, pygobject_micro_version) - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) - AM_INIT_AUTOMAKE(foreign) - AM_MAINTAINER_MODE -@@ -82,7 +82,6 @@ dnl when using libtool 2.x create libtool early, because it's used in configure - m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - AC_ISC_POSIX - AC_PROG_CC --AM_PROG_CC_STDC - AM_PROG_CC_C_O - - # check that we have the minimum version of python necessary to build diff --git a/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb b/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb deleted file mode 100644 index c6fb6fe26..000000000 --- a/meta-phosphor/recipes-devtools/python/python-pygobject_2.28.7.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "Python GObject bindings" -SECTION = "devel/python" -LICENSE = "LGPLv2.1" - -RECIPE_NO_UPDATE_REASON = "Newer versions of python-pygobject depend on gobject-introspection which doesn't cross-compile" - -LIC_FILES_CHKSUM = "file://COPYING;md5=a916467b91076e631dd8edb7424769c7" -DEPENDS = "python python-pygobject-native libffi glib-2.0" -DEPENDS_class-native = "python-native libffi-native glib-2.0-native" -RDEPENDS_class-native = "" - -MAJ_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" - -SRC_URI = "${GNOME_MIRROR}/pygobject/${MAJ_VER}/pygobject-${PV}.tar.xz \ - file://obsolete_automake_macros.patch \ -" - -# libtool-native doesn't have fixinstall.patch applied which means -# that libs get relinked at installation time. This triggers a -# relinking along the lines of: -# gcc -L/tmp/foo/media/build1/poky/build/tmp/sysroots/x86_64-linux/usr/lib -lpyglib-2.0-python -o .libs/_glib.so -# where /tmp/foo is DESTDIR and pyglib-2.0-python may be installed/reinstalled -# at the same time as the gcc command runs. -# If this happens between the handoff between gcc and ld, you can see: -# /bin/ld: cannot find -lpyglib-2.0-python -# Adding a dependency rule like install-pyglibLTLIBRARIES: install-libLTLIBRARIES -# would be ideal but automake can't cope with that without manually -# defining the whole function. Give up and disable parallel make in native builds. -PARALLEL_MAKEINST_class-native = "" - -SRC_URI[md5sum] = "ae48b60c690c4aa894e69e0c97802745" -SRC_URI[sha256sum] = "bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a" -S = "${WORKDIR}/pygobject-${PV}" - -EXTRA_OECONF += "--disable-introspection" - -inherit autotools distutils-base pkgconfig - -# necessary to let the call for python-config succeed -export BUILD_SYS -export HOST_SYS -export STAGING_INCDIR -export STAGING_LIBDIR - -PACKAGES += "${PN}-lib" - -RDEPENDS_${PN} += "python-textutils" - -FILES_${PN} = "${libdir}/python*" -FILES_${PN}-lib = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir} ${datadir}" - -BBCLASSEXTEND = "native" diff --git a/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend b/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend deleted file mode 100644 index e8dd736ef..000000000 --- a/meta-phosphor/recipes-devtools/python/python-pytest_%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# python-pytest installs /usr/bin/pytest for both python2 and python3, -# which causes a bitbake QA failure. Remove it from installation for the -# native target to avoid the collision. -# -# We don't currently use this as a target package and if we did, we shouldn't -# install both python2 and python3 variants. -# -# Once we are done with python2, we can delete this. - -do_install_append_class-native() { - rm ${D}${bindir}/py.test - rm ${D}${bindir}/pytest -} diff --git a/meta-phosphor/recipes-devtools/python/python3_%.bbappend b/meta-phosphor/recipes-devtools/python/python3_%.bbappend new file mode 100644 index 000000000..69f4e9ab0 --- /dev/null +++ b/meta-phosphor/recipes-devtools/python/python3_%.bbappend @@ -0,0 +1,20 @@ +inherit update-alternatives + +ALTERNATIVE_${PN}-core += "python" +ALTERNATIVE_LINK_NAME[python] = "${bindir}/python" +ALTERNATIVE_TARGET[python] = "${bindir}/python3" + +# python3 takes up a lot of space that most embedded systems +# do not have, so remove some un-needed files from the rootfs +do_install_append_class-target() { + # Even though python3 is built with --without-ensurepip, it still installs + # a large, compressed version of pip. Remove it to free up the space. + rm -rf ${D}${libdir}/python${PYTHON_MAJMIN}/ensurepip + + # Remove all python .py files from python recipe. Only the .pyc + # files are required. + # The _sysconfigdata*.py files are system configuration files generated + # during build time. It's used in the yocto packaging process so + # it is required to remain in the image. + find ${D}${libdir}/python${PYTHON_MAJMIN} -name \*.py ! -name _sysconfigdata*.py -exec rm {} \; +} diff --git a/meta-phosphor/recipes-devtools/python/python_2.%.bbappend b/meta-phosphor/recipes-devtools/python/python_2.%.bbappend deleted file mode 100644 index 0db91f179..000000000 --- a/meta-phosphor/recipes-devtools/python/python_2.%.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -# Remove all python .py files from python recipe. Only the .pyc -# files are required. Only do this if the openbmc-phosphor-tiny -# distro feature is enabled -do_install_append_openbmc-phosphor-tiny() { - # The _sysconfigdata.py is a system configuration file generated - # during build time. It's used in the yocto packaging process so - # it is required to remain in the image. - find ${D}${libdir}/python${PYTHON_MAJMIN} -name \*.py ! -name _sysconfigdata.py -exec rm {} \; -} diff --git a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb index abe19d24e..57b27d29f 100644 --- a/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/configuration/entity-manager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Entity Manager provides d-bus configuration data \ and configures system sensors" SRC_URI = "git://github.com/openbmc/entity-manager.git" -SRCREV = "ba5424ae0ae7bb76ee770068efbd05214a0e3b53" +SRCREV = "b1728ca01e23de1f2a676d445a478e34f2456bda" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb index baa7c8c1f..195b276df 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb +++ b/meta-phosphor/recipes-phosphor/console/obmc-console_git.bb @@ -26,7 +26,7 @@ DEPENDS += "autoconf-archive-native \ SRC_URI += "git://github.com/openbmc/obmc-console" SRC_URI += "file://${BPN}.conf" -SRCREV = "fdf1a7102f800711daadfc3895fc8feeffa73c0e" +SRCREV = "d802b11942abc8a4641976e70d567758ef0bbd58" PV = "1.0+git${SRCPV}" REGISTERED_SERVICES_${PN} += "obmc_console:tcp:2200:" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 30453c8ad..9705ecd0a 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -14,7 +14,7 @@ DEPENDS += "autoconf-archive-native" DEPENDS += "${PYTHON_PN}-sdbus++-native" SRC_URI = "git://github.com/openbmc/phosphor-dbus-interfaces" -SRCREV = "1362ce345867b4bc380f1d0b1c9ca77e5d5c996d" +SRCREV = "00c8527a40650650d2826d77b6e4e6d48f68f622" PACKAGECONFIG ??= "libphosphor_dbus" PACKAGECONFIG[libphosphor_dbus] = " \ diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index 2d03080f2..df8e636b3 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -26,7 +26,7 @@ SYSTEMD_SERVICE_${PN} += " \ " SRC_URI += "git://github.com/openbmc/phosphor-objmgr" -SRCREV = "c52be0d21755e23d67128fbcaec17e5952f4af9e" +SRCREV = "5592202fa6f28040518391c2ef2b7d55ce2da16b" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc index f8566791e..8fff4874c 100644 --- a/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc +++ b/meta-phosphor/recipes-phosphor/dump/phosphor-debug-collector.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-debug-collector" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "719c5f08214f5571d51ec273eaa71d1b9817f79e" +SRCREV = "638b43f50c3bda234a77bd8d3ccc2ea2b346a316" diff --git a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb index 9a6106320..67bf6cca0 100644 --- a/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb +++ b/meta-phosphor/recipes-phosphor/fans/phosphor-pid-control_git.bb @@ -14,7 +14,7 @@ inherit systemd S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-pid-control" -SRCREV = "3660b3888af789266b6c84714b4e161a32e6ea54" +SRCREV = "298a95cbb192ecc678b1a496acc954a3b2adf450" # Each platform will need a service file that starts # at an appropriate time per system. For instance, if diff --git a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb index 4d12a9688..8bb8f6408 100644 --- a/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb +++ b/meta-phosphor/recipes-phosphor/host/phosphor-host-postd_git.bb @@ -9,6 +9,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit autotools pkgconfig inherit systemd +PACKAGECONFIG ?= "" +PACKAGECONFIG[7seg] = "--enable-7seg,--disable-7seg,,udev" + DEPENDS += "autoconf-archive-native" DEPENDS += "sdbusplus" DEPENDS += "sdeventplus" @@ -17,7 +20,7 @@ DEPENDS += "systemd" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-host-postd" -SRCREV = "ad2a08c7de9198246fec77c457d4c14f7bc4c1fb" +SRCREV = "66efa632e25854ed5fba0166fe5c3bdd6761f20b" SNOOP_DEVICE ?= "aspeed-lpc-snoop0" POST_CODE_BYTES ?= "1" @@ -31,3 +34,10 @@ EXTRA_OECONF = " \ POST_CODE_BYTES="${POST_CODE_BYTES}" \ SYSTEMD_TARGET="multi-user.target" \ " + +POSTCODE_SEVENSEG_DEVICE ?= "seven_seg_disp_val" +SERVICE_FILE_7SEG = " \ + postcode-7seg@.service \ + postcode-7seg@${POSTCODE_SEVENSEG_DEVICE}.service \ +" +SYSTEMD_SERVICE_${PN} += "${@bb.utils.contains('PACKAGECONFIG', '7seg', '${SERVICE_FILE_7SEG}', '', d)}" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index c74419ee0..742f497d2 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/bmcweb.git" PV = "1.0+git${SRCPV}" -SRCREV = "043a05366c1fe54d7b9ef883292d0cd2d01c66b2" +SRCREV = "2a5689a752d31a4a5758d3827c7ca6302bc0acc7" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb index 7037ef92b..8db94b0c3 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/rest-dbus_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" inherit allarch inherit obmc-phosphor-systemd -inherit setuptools +inherit setuptools3 RDEPENDS_${PN} += " \ python-netserver \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb index d8a170474..85ccaf36a 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-flash_git.bb @@ -45,7 +45,7 @@ EXTRA_OECONF_append = " MAPPED_ADDRESS=${IPMI_FLASH_BMC_ADDRESS}" S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/phosphor-ipmi-flash" -SRCREV = "01593f96589c0381599e2feaa2981eb8ede9728f" +SRCREV = "c8445aaa291eb720a8698765421822dea265dba7" SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} += "phosphor-ipmi-flash-bmc-prepare.target \ diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc index 9c304afb0..c0909c94c 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host.inc @@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-host-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid" -SRCREV = "0e2dbee2d19ee6865d6e95b07398943b8f536336" +SRCREV = "074f64d42d7fa7538d320ab1f0c91e641641a961" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb index 3cb163077..15d08efce 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-kcs_git.bb @@ -30,4 +30,4 @@ DEPENDS += " \ S = "${WORKDIR}/git" SRC_URI = "git://github.com/openbmc/kcsbridge.git" -SRCREV = "46525ae48db23333493ac927c12ed13a0e663de5" +SRCREV = "58d596ad9625790b5e06804360aa161579364425" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index fb489acd5..6b0d4da90 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -16,7 +16,7 @@ DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "9979e9971e17c974f29ec9ab720f5482308c119c" +SRCREV = "a6ad5e161e5e5db4258b04254b19796f154b8533" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb index 1f5513114..6707707b5 100644 --- a/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/ffdc_git.bb @@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/phosphor-debug-collector" -SRCREV = "719c5f08214f5571d51ec273eaa71d1b9817f79e" +SRCREV = "638b43f50c3bda234a77bd8d3ccc2ea2b346a316" do_install() { install -d ${D}${bindir} diff --git a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb index 7844a44ef..7140ad7f4 100644 --- a/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb +++ b/meta-phosphor/recipes-phosphor/logging/phosphor-logging_git.bb @@ -56,7 +56,7 @@ FILES_phosphor-rsyslog-config += " \ " SRC_URI += "git://github.com/openbmc/phosphor-logging" -SRCREV = "182071455a82b22e8111217d624c25f4c86dce43" +SRCREV = "d03d3d91bc39dcae72d07cd59ecbcbe530a7a9ed" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb index 2b8d806a4..29658e303 100644 --- a/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb +++ b/meta-phosphor/recipes-phosphor/mboxd/mboxd_git.bb @@ -18,7 +18,7 @@ SRC_URI += "git://github.com/openbmc/mboxbridge.git" SRC_URI += "file://99-aspeed-lpc-ctrl.rules" -SRCREV="ca5eda8032e1e0cbaeb713186262c50ae4489f7c" +SRCREV="dfbeae251c8ebe9939c6eb7241380d8cf4313169" PROVIDES += "mboxctl" diff --git a/meta-phosphor/recipes-phosphor/pldm/pldm.inc b/meta-phosphor/recipes-phosphor/pldm/pldm.inc index 65149a717..640bcb89f 100644 --- a/meta-phosphor/recipes-phosphor/pldm/pldm.inc +++ b/meta-phosphor/recipes-phosphor/pldm/pldm.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/pldm" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/openbmc/pldm" -SRCREV = "a556eb2cf3aa08085c94f433b889066347234b71" +SRCREV = "6f4e9040f6dd7cd05cba920170ac24771a5b7bc4" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc index 92ed524f6..96e09db97 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power.inc +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "9af855569ec2d9dc9afe60542cf606b82b47141b" +SRCREV = "84807b96facd36d4fbf93c16fe1f6ee9988dc4cf" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb index 730335a0f..cf853d254 100644 --- a/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb +++ b/meta-phosphor/recipes-phosphor/power/phosphor-power_git.bb @@ -48,11 +48,14 @@ SEQ_PGOOD_SVC = "pseq-monitor-pgood.service" PSU_MONITOR_TMPL = "power-supply-monitor@.service" PSU_MONITOR_SVC = "phosphor-psu-monitor.service" REGS_SVC = "phosphor-regulators.service" +REGS_CONF_SVC = "phosphor-regulators-config.service" +REGS_MON_ENA_SVC = "phosphor-regulators-monitor-enable.service" +REGS_MON_DIS_SVC = "phosphor-regulators-monitor-disable.service" SYSTEMD_SERVICE_${PN}-sequencer = "${SEQ_MONITOR_SVC} ${SEQ_PGOOD_SVC}" SYSTEMD_SERVICE_${PN}-monitor = "${PSU_MONITOR_TMPL}" SYSTEMD_SERVICE_${PN}-psu-monitor = "${PSU_MONITOR_SVC}" -SYSTEMD_SERVICE_${PN}-regulators = "${REGS_SVC}" +SYSTEMD_SERVICE_${PN}-regulators = "${REGS_SVC} ${REGS_CONF_SVC} ${REGS_MON_ENA_SVC} ${REGS_MON_DIS_SVC}" # TODO: cold-redundancy is not installed in the repo yet @@ -61,5 +64,6 @@ SYSTEMD_SERVICE_${PN}-regulators = "${REGS_SVC}" FILES_${PN}-monitor = "${bindir}/psu-monitor" FILES_${PN}-psu-monitor = "${bindir}/phosphor-psu-monitor ${datadir}/phosphor-psu-monitor" FILES_${PN}-regulators = "${bindir}/phosphor-regulators ${datadir}/phosphor-regulators" +FILES_${PN}-regulators += "${bindir}/regsctl" FILES_${PN}-sequencer = "${bindir}/pseq-monitor" FILES_${PN}-utils = "${bindir}/psutils" diff --git a/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb new file mode 100644 index 000000000..07c7d0d9c --- /dev/null +++ b/meta-phosphor/recipes-phosphor/power/phosphor-psu-software-manager_git.bb @@ -0,0 +1,52 @@ +HOMEPAGE = "https://github.com/openbmc/phosphor-psu-code-mgmt" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" +SRC_URI += "git://github.com/openbmc/phosphor-psu-code-mgmt" +SRCREV = "f356fdc926f654063bcabd4509112282ef3d4dd0" +SUMMARY = "Phosphor PSU software manager" +DESCRIPTION = "Providing PSU firmware version and upgrade" + +PR = "r1" +PV = "1.0+git${SRCPV}" + +inherit meson +inherit pkgconfig +inherit obmc-phosphor-systemd + +S = "${WORKDIR}/git" + +DEPENDS = " \ + phosphor-logging \ + phosphor-dbus-interfaces \ + sdbusplus \ + openssl \ + " + +# The default config of this repo depends on utils from phosphor-power. +# If your system does not depend on phosphor-power, please use +# RDEPENDS_${PN}_remove to remove the dependency. +RDEPENDS_${PN} += "phosphor-power" + +# The below configs are expected to be overriden by machine layer + +## The psutils here comes from phosphor-power repo where +## * PSU_VERSION_UTIL accepts a PSU inventory path and returns the PSU +## firmware version string +## * PSU_VERSION_COMPARE_UTIL accepts several PSU inventory paths and return +## the newest version string +PSU_VERSION_UTIL ?= "-DPSU_VERSION_UTIL='/usr/bin/psutils --raw --get-version'" +PSU_VERSION_COMPARE_UTIL ?= "-DPSU_VERSION_COMPARE_UTIL='/usr/bin/psutils --raw --compare'" + +## The psu-update@.service from repo is an example service that only prints a log and fails +## Override it in a machine layer to invoke the psu update util +PSU_UPDATE_SERVICE ?= "-DPSU_UPDATE_SERVICE=psu-update@.service" + +EXTRA_OEMESON = " \ + -Dtests=disabled \ + ${PSU_VERSION_UTIL} \ + ${PSU_VERSION_COMPARE_UTIL} \ + ${PSU_UPDATE_SERVICE} \ + " + +SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.Software.Psu.Updater.service" +SYSTEMD_SERVICE_${PN} += "psu-update@.service" diff --git a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb index 460c49be8..c7757be16 100644 --- a/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb +++ b/meta-phosphor/recipes-phosphor/sensors/dbus-sensors_git.bb @@ -2,7 +2,7 @@ SUMMARY = "dbus-sensors" DESCRIPTION = "Dbus Sensor Services Configured from D-Bus" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" -SRCREV = "17aba776373e14851a04e6b9ac518622b117b2a1" +SRCREV = "10306bd5032fda014628487665d8000c0db49177" PV = "0.1+git${SRCPV}" diff --git a/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb new file mode 100644 index 000000000..3ba8c4a7a --- /dev/null +++ b/meta-phosphor/recipes-phosphor/sensors/phosphor-nvme_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "NVMe Drive Manager" +DESCRIPTION = "Daemon to monitor and report the status of NVMe drives" +HOMEPAGE = "https://github.com/openbmc/phosphor-nvme" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" + +inherit meson pkgconfig +inherit systemd + +DEPENDS += "sdbusplus" +DEPENDS += "phosphor-dbus-interfaces" +DEPENDS += "sdeventplus" +DEPENDS += "phosphor-logging" +DEPENDS += "nlohmann-json" + +SRC_URI = "git://github.com/openbmc/phosphor-nvme.git;protocol=git" +SRCREV = "e41b2e4c6c579f451b8d01ffff7abc46f0f7c6b2" +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE_${PN} = "xyz.openbmc_project.nvme.manager.service" diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb index 10fcdd747..f94b8758b 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb @@ -17,6 +17,7 @@ STATE_MGR_PACKAGES = " \ ${PN}-reset-sensor-states \ ${PN}-systemd-target-monitor \ ${PN}-obmc-targets \ + ${PN}-scheduled-host-transition \ " PACKAGE_BEFORE_PN += "${STATE_MGR_PACKAGES}" ALLOW_EMPTY_${PN} = "1" @@ -78,6 +79,9 @@ FILES_${PN}-systemd-target-monitor = " \ " SYSTEMD_SERVICE_${PN}-systemd-target-monitor += "phosphor-systemd-target-monitor.service" +FILES_${PN}-scheduled-host-transition = "${bindir}/phosphor-scheduled-host-transition" +DBUS_SERVICE_${PN}-scheduled-host-transition += "xyz.openbmc_project.State.ScheduledHostTransition.service" + RESET_CHECK_TMPL = "phosphor-reset-host-check@.service" RESET_CHECK_TGTFMT = "obmc-host-reset@{1}.target" RESET_CHECK_INSTFMT = "phosphor-reset-host-check@{0}.service" @@ -262,6 +266,6 @@ SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'FAN_LINK_FMT', 'OBMC_CHA SYSTEMD_LINK_${PN}-obmc-targets += "${@compose_list(d, 'QUIESCE_FMT', 'HOST_ERROR_TARGETS', 'OBMC_HOST_INSTANCES')}" SRC_URI += "git://github.com/openbmc/phosphor-state-manager" -SRCREV = "4ca6f3f4fe136a593df8e3a61adf6620cd4ca45c" +SRCREV = "dc059399bca5d459fb82b6a28e7f547745a251a1" S = "${WORKDIR}/git" diff --git a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb index 1c1805757..0758cecf2 100644 --- a/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/phosphor-webui_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/phosphor-webui.git" -SRCREV = "6a8d180f284e513da2f3d8e0a76769e8b4108abf" +SRCREV = "4a16a026b60a3bf54161ed4e4bc34885b4e3e6c3" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb index af476abb3..6d74e84a4 100644 --- a/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb +++ b/meta-phosphor/recipes-phosphor/webui/webui-vue_git.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI = "git://github.com/openbmc/webui-vue.git" -SRCREV = "532a4b033669497d972683320e3d1d6dde1943f6" +SRCREV = "f2b3e6c1ef4909f523477c1f839be05eea3e4604" S = "${WORKDIR}/git" DEPENDS_prepend = "nodejs-native " diff --git a/meta-quanta/conf/layer.conf b/meta-quanta/conf/layer.conf index 81759fe51..f8c3cf485 100644 --- a/meta-quanta/conf/layer.conf +++ b/meta-quanta/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "quanta-layer" BBFILE_PATTERN_quanta-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_quanta-layer = "warrior zeus" +LAYERSERIES_COMPAT_quanta-layer = "warrior zeus dunfell" diff --git a/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf new file mode 100644 index 000000000..bc3f31bf9 --- /dev/null +++ b/meta-quanta/meta-gsj/conf/distro/openbmc-gsj.conf @@ -0,0 +1,5 @@ +require conf/distro/openbmc-phosphor.conf + +DISTRO_FEATURES_remove = "avahi" +DISTRO_FEATURES_remove = "ldap" +DISTRO_FEATURES_remove = "slp" diff --git a/meta-quanta/meta-gsj/conf/layer.conf b/meta-quanta/meta-gsj/conf/layer.conf index 1da7654b5..a01837919 100644 --- a/meta-quanta/meta-gsj/conf/layer.conf +++ b/meta-quanta/meta-gsj/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "gsj-layer" BBFILE_PATTERN_gsj-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_gsj-layer = "warrior zeus" +LAYERSERIES_COMPAT_gsj-layer = "warrior zeus dunfell" diff --git a/meta-quanta/meta-gsj/conf/local.conf.sample b/meta-quanta/meta-gsj/conf/local.conf.sample index 12e42fba6..f4488a4c1 100644 --- a/meta-quanta/meta-gsj/conf/local.conf.sample +++ b/meta-quanta/meta-gsj/conf/local.conf.sample @@ -1,5 +1,5 @@ MACHINE ??= "gsj" -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "openbmc-gsj" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks" diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf index 328796aa0..4db114585 100644 --- a/meta-quanta/meta-gsj/conf/machine/gsj.conf +++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf @@ -15,11 +15,12 @@ OBMC_MACHINE_FEATURES += "\ obmc-phosphor-fan-mgmt \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ - obmc-host-ipmi \ obmc-host-state-mgmt \ obmc-chassis-state-mgmt \ obmc-bmc-state-mgmt \ " +# Remove unneeded binaries from image +IMAGE_FEATURES_remove = "obmc-debug-collector" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-gsj-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-gsj-apps" diff --git a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb index 69172383d..c1a7c1c10 100644 --- a/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb +++ b/meta-quanta/meta-gsj/recipes-gsj/packagegroups/packagegroup-gsj-apps.bb @@ -19,16 +19,12 @@ RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" SUMMARY_${PN}-chassis = "GSJ Chassis" -RDEPENDS_${PN}-chassis = " \ - obmc-control-chassis \ - " +RDEPENDS_${PN}-chassis = "" SUMMARY_${PN}-fans = "GSJ Fans" RDEPENDS_${PN}-fans = "" SUMMARY_${PN}-flash = "GSJ Flash" RDEPENDS_${PN}-flash = " \ - obmc-flash-bmc \ - obmc-mgr-download \ - obmc-control-bmc \ + phosphor-ipmi-flash \ " 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 4ceec7d2f..1ad5f9d78 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 @@ -1,4 +1,3 @@ -OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-ipmi-flash" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " phosphor-pid-control" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " detect-fan-fail" OBMC_IMAGE_EXTRA_INSTALL_append_gsj = " google-ipmi-sys" diff --git a/meta-yadro/conf/layer.conf b/meta-yadro/conf/layer.conf index 794ada888..0a5f6f2f3 100644 --- a/meta-yadro/conf/layer.conf +++ b/meta-yadro/conf/layer.conf @@ -1,8 +1,12 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" +# We have recipes-* directories, add to BBFILES +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ + ${LAYERDIR}/recipes-*/*/*.bbappend" + BBFILE_COLLECTIONS += "yadro-layer" BBFILE_PATTERN_yadro-layer = "^${LAYERDIR}/" BBFILE_PATTERN_IGNORE_EMPTY_yadro-layer = "1" -LAYERSERIES_COMPAT_yadro-layer = "warrior zeus" +LAYERSERIES_COMPAT_yadro-layer = "warrior zeus dunfell" diff --git a/meta-yadro/meta-nicole/conf/layer.conf b/meta-yadro/meta-nicole/conf/layer.conf index c70d673a7..722185cbe 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 = "warrior zeus" +LAYERSERIES_COMPAT_nicole-layer = "warrior zeus dunfell" diff --git a/meta-yadro/meta-nicole/conf/machine/nicole.conf b/meta-yadro/meta-nicole/conf/machine/nicole.conf index 11b35417d..d815ef330 100644 --- a/meta-yadro/meta-nicole/conf/machine/nicole.conf +++ b/meta-yadro/meta-nicole/conf/machine/nicole.conf @@ -3,8 +3,6 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" UBOOT_MACHINE = "ast_g5_ncsi_config" -PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' - require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc diff --git a/meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch b/meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch new file mode 100644 index 000000000..4daa354d6 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-bsp/u-boot/files/0001-Add-system-reset-status-support.patch @@ -0,0 +1,186 @@ +From cf39fde2c1cfb55aa756bfb551c4087ba2fd4b6c Mon Sep 17 00:00:00 2001 +From: Alexander Filippov <a.filippov@yadro.com> +Date: Tue, 7 Apr 2020 16:45:41 +0300 +Subject: [PATCH] Add system reset status support + +This is backport of patch file from intel-bmc/openbmc repository. + https://github.com/Intel-BMC/openbmc/blob/intel/meta-openbmc-mods/meta-common/recipes-bsp/u-boot/files/0020-Add-system-reset-status-support.patch + +Will display the reset reasons in u-boot, +and save the reset reasons into kernel command line, +for applications to query. + +Signed-off-by: Alexander Filippov <a.filippov@yadro.com> + +--- + arch/arm/include/asm/arch-aspeed/ast_g5_platform.h | 1 + + arch/arm/include/asm/arch-aspeed/ast_scu.h | 2 +- + arch/arm/mach-aspeed/ast-scu.c | 6 +- + board/aspeed/ast-g5/ast-g5.c | 98 ++++++++++++++++++++++ + 4 files changed, 105 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h b/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h +index 4210873..d2a4268cd 100644 +--- a/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h ++++ b/arch/arm/include/asm/arch-aspeed/ast_g5_platform.h +@@ -188,5 +188,6 @@ + #define AST_FORMATTER_MEM_SIZE 0xC00000 /* 12MB */ + #define AST_FORMATTER_MEM_BASE (AST_H264_MEM_BASE + AST_H264_MEM_SIZE) + ++#define CONFIG_BOARD_LATE_INIT 1 /* Call board_late_init */ + + #endif +diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h +index dcbc673..b428f38 100644 +--- a/arch/arm/include/asm/arch-aspeed/ast_scu.h ++++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h +@@ -29,7 +29,7 @@ + #define __AST_SCU_H + + extern void ast_scu_show_system_info (void); +-extern void ast_scu_sys_rest_info(void); ++extern u32 ast_scu_sys_rest_info(void); + extern void ast_scu_security_info(void); + extern u32 ast_scu_revision_id(void); + extern u32 ast_scu_get_vga_memsize(void); +diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c +index 12de9b8..5afd379 100644 +--- a/arch/arm/mach-aspeed/ast-scu.c ++++ b/arch/arm/mach-aspeed/ast-scu.c +@@ -482,22 +482,26 @@ void ast_scu_security_info(void) + } + } + +-void ast_scu_sys_rest_info(void) ++u32 ast_scu_sys_rest_info(void) + { + u32 rest = ast_scu_read(AST_SCU_SYS_CTRL); + + if (rest & SCU_SYS_EXT_RESET_FLAG) { + printf("RST : External\n"); + ast_scu_write(SCU_SYS_EXT_RESET_FLAG, AST_SCU_SYS_CTRL); ++ rest = SCU_SYS_EXT_RESET_FLAG; + } else if (rest & SCU_SYS_WDT_RESET_FLAG) { + printf("RST : Watchdog\n"); + ast_scu_write(SCU_SYS_WDT_RESET_FLAG, AST_SCU_SYS_CTRL); ++ rest = SCU_SYS_WDT_RESET_FLAG; + } else if (rest & SCU_SYS_PWR_RESET_FLAG) { + printf("RST : Power On\n"); + ast_scu_write(SCU_SYS_PWR_RESET_FLAG, AST_SCU_SYS_CTRL); ++ rest = SCU_SYS_PWR_RESET_FLAG; + } else { + printf("RST : CLK en\n"); + } ++ return rest; + } + + u32 ast_scu_get_vga_memsize(void) +diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c +index 12496ce..42d7496 100644 +--- a/board/aspeed/ast-g5/ast-g5.c ++++ b/board/aspeed/ast-g5/ast-g5.c +@@ -105,3 +105,104 @@ void hw_watchdog_reset(void) + writel(0x4755, AST_WDT2_BASE + 0x08); + } + #endif /* CONFIG_WATCHDOG */ ++ ++#ifdef CONFIG_BOARD_LATE_INIT ++static void update_bootargs_cmd(const char *key, const char *value) ++{ ++ int buf_len; ++ char *buf; ++ char *cmdline; ++ char *end = NULL; ++ ++ if (!key || (key[0] == '\0')) ++ { ++ printf("%s: Empty key not allowed\n", __func__); ++ return; ++ } ++ ++ cmdline = getenv("bootargs"); ++ ++ /* Allocate space for maximum possible new command line */ ++ buf_len = (cmdline ? strlen(cmdline) : 0) ++ + 1 /* spacebar as delimiter */ ++ + strlen(key) ++ + (value ? 1 /* equal sign */ + strlen(value) : 0) ++ + 1 /* terminating null */; ++ ++ buf = calloc(buf_len, sizeof(char)); ++ if (!buf) ++ { ++ printf("%s: out of memory\n", __func__); ++ return; ++ } ++ ++ if (cmdline) ++ { ++ char *start = strstr(cmdline, key); ++ ++ /* Check for full word match. Match should be start of cmdline ++ * or there should be space before match */ ++ if (start && ((start == cmdline) || (*(start - 1) == ' '))) ++ { ++ strncat(buf, cmdline, (start - cmdline)); ++ ++ /* Find the end of the keyword[=value] pair, ++ * including a single training space character, if any. ++ * Skip the found substring, mark the tail of cmdline. ++ */ ++ end = strchr(start, ' '); ++ if (end) ++ { ++ end++; ++ } ++ } ++ else ++ { ++ strcat(buf, cmdline); ++ strcat(buf, " "); ++ } ++ } ++ ++ strcat(buf, key); ++ if (value) ++ { ++ strcat(buf, "="); ++ strcat(buf, value); ++ } ++ ++ if (end) ++ { ++ strcat(buf, " "); ++ strcat(buf, end); ++ } ++ ++ setenv("bootargs", buf); ++ free(buf); ++} ++ ++int board_late_init(void) ++{ ++ u32 reset_reason = ast_scu_sys_rest_info(); ++ ++ if (reset_reason & SCU_SYS_EXT_RESET_FLAG) ++ { ++ update_bootargs_cmd("resetreason", "external"); ++ } ++ else if (reset_reason & SCU_SYS_WDT_RESET_FLAG) ++ { ++ update_bootargs_cmd("resetreason", "watchdog"); ++ } ++ else if (reset_reason & SCU_SYS_PWR_RESET_FLAG) ++ { ++ update_bootargs_cmd("resetreason", "power"); ++ } ++ else ++ { ++ char value[32]; ++ snprintf(value, sizeof(value) - 1, "0x%x", reset_reason); ++ update_bootargs_cmd("resetreason", value); ++ } ++ ++ return 0; ++} ++#endif /* CONFIG_BOARD_LATE_INIT */ diff --git a/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend new file mode 100644 index 000000000..f0ff09e02 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_append := "${THISDIR}/files:" + +SRC_URI_append = " \ + file://0001-Add-system-reset-status-support.patch \ + " diff --git a/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts b/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts index 0c8a9e783..91dced7e7 100644 --- a/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts +++ b/meta-yadro/meta-nicole/recipes-kernel/linux/linux-aspeed/arch/arm/boot/dts/aspeed-bmc-opp-nicole.dts @@ -56,18 +56,22 @@ compatible = "gpio-leds"; power { + label = "platform:green:power"; gpios = <&gpio ASPEED_GPIO(AA, 4) GPIO_ACTIVE_HIGH>; }; identify { + label = "platform:blue:indicator"; gpios = <&gpio ASPEED_GPIO(AA, 7) GPIO_ACTIVE_HIGH>; }; - alarm_red { + fault { + label = "platform:red:fault"; gpios = <&gpio ASPEED_GPIO(AA, 3) GPIO_ACTIVE_HIGH>; }; - alarm_yellow { + attention { + label = "platform:yellow:alarm"; gpios = <&gpio ASPEED_GPIO(AA, 1) GPIO_ACTIVE_HIGH>; }; }; @@ -98,6 +102,11 @@ linux,code = <ASPEED_GPIO(J, 2)>; }; }; + + iio-hwmon-battery { + compatible = "iio-hwmon"; + io-channels = <&adc 12>; + }; }; &fmc { @@ -171,24 +180,24 @@ }; }; -&i2c1 { - status = "okay"; -}; - &i2c2 { status = "okay"; + /* CPU0 characterization connector */ }; &i2c3 { status = "okay"; + /* CLK GEN SI5338 */ }; &i2c4 { status = "okay"; + /* Voltage regulators for CPU0 */ }; &i2c5 { status = "okay"; + /* Voltage regulators for CPU1 */ }; &i2c6 { @@ -202,52 +211,67 @@ &i2c7 { status = "okay"; -}; - -&i2c8 { - status = "okay"; -}; - -&i2c9 { - status = "okay"; -}; - -&i2c10 { - status = "okay"; -}; - -&i2c11 { - status = "okay"; -}; - -&i2c12 { - status = "okay"; + /* CPLD */ }; &gpio { - nic_func_mode0 { + gpio-line-names = + /*A0-A7*/ "","cfam-reset","","","","","fsi-mux","", + /*B0-B7*/ "","","","","","","","", + /*C0-C7*/ "","","","","","","","", + /*D0-D7*/ "fsi-enable","bmc_power_up","sys_pwrok_buf", + "func_mode0","func_mode1","func_mode2","","", + /*E0-E7*/ "","ncsi_cfg","","","","","","", + /*F0-F7*/ "","","","","","","","", + /*G0-G7*/ "","","","","","","","", + /*H0-H7*/ "","","","","","","","", + /*I0-I7*/ "","","","","","","","", + /*J0-J7*/ "","","checkstop","","","","","", + /*K0-K7*/ "","","","","","","","", + /*L0-L7*/ "","","","","","","","", + /*M0-M7*/ "","","","","","","","", + /*N0-N7*/ "","","","","","","","", + /*O0-O7*/ "","","power-button","","","","","", + /*P0-P7*/ "","fsi-trans","pm_rtc_adc_en","","","","","", + /*Q0-Q7*/ "","","","","","","","id-button", + /*R0-R7*/ "","software_pwrgood","","","","","","", + /*S0-S7*/ "","","","","","","","seq_cont", + /*T0-T7*/ "","","","","","","","", + /*U0-U7*/ "","","","","","","","", + /*V0-V7*/ "","","","","","","","", + /*W0-W7*/ "","","","","","","","", + /*X0-X7*/ "","","","","","","","", + /*Y0-Y7*/ "","","","","","","","", + /*Z0-Z7*/ "","","","","","","","", + /*AA0-AA7*/ "fsi-clock","led-attention","fsi-data","led-fault", + "led-power","","","led-identify", + /*AB0-AB7*/ "","","","","","","","", + /*AC0-AC7*/ "","","","","","","",""; + + func_mode0 { gpio-hog; gpios = <ASPEED_GPIO(D, 3) GPIO_ACTIVE_HIGH>; output-low; - line-name = "nic_func_mode0"; }; - nic_func_mode1 { + func_mode1 { gpio-hog; gpios = <ASPEED_GPIO(D, 4) GPIO_ACTIVE_HIGH>; output-low; - line-name = "nic_func_mode1"; + }; + func_mode2 { + gpio-hog; + gpios = <ASPEED_GPIO(D, 5) GPIO_ACTIVE_HIGH>; + output-low; }; seq_cont { gpio-hog; gpios = <ASPEED_GPIO(S, 7) GPIO_ACTIVE_HIGH>; output-low; - line-name = "seq_cont"; }; ncsi_cfg { gpio-hog; input; gpios = <ASPEED_GPIO(E, 1) GPIO_ACTIVE_HIGH>; - line-name = "ncsi_cfg"; }; }; @@ -274,6 +298,24 @@ &adc { status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_adc0_default + &pinctrl_adc1_default + &pinctrl_adc2_default + &pinctrl_adc3_default + &pinctrl_adc4_default + &pinctrl_adc5_default + &pinctrl_adc6_default + &pinctrl_adc7_default + &pinctrl_adc8_default + &pinctrl_adc9_default + &pinctrl_adc10_default + &pinctrl_adc11_default + &pinctrl_adc12_default + &pinctrl_adc13_default + &pinctrl_adc14_default + &pinctrl_adc15_default>; }; &video { diff --git a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-fru-properties.yaml b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-fru-properties.yaml index ba2c91818..472679d76 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-fru-properties.yaml +++ b/meta-yadro/meta-nicole/recipes-phosphor/configuration/nicole-yaml-config/nicole-ipmi-fru-properties.yaml @@ -43,3 +43,5 @@ <<: *DEFAULTS /system/chassis/motherboard/dimm15: <<: *DEFAULTS +/system/chassis/motherboard/opfw: + <<: *DEFAULTS diff --git a/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend index 83ef5455a..d26a4d696 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/host/p9-host-start.bbappend @@ -1,2 +1 @@ RDEPENDS_${PN}_append = " avsbus-control" -RDEPENDS_${PN}_remove = " p9-vcs-workaround" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 5ac83a8c1..16d815ade 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -2,4 +2,5 @@ DEPENDS_append = " nicole-yaml-config" EXTRA_OECONF = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-fru-read.yaml \ + PROP_YAML=${STAGING_DIR_HOST}${datadir}/nicole-yaml-config/ipmi-extra-properties.yaml \ " diff --git a/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml b/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml index 9ce2e2989..beb8c9870 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml +++ b/meta-yadro/meta-nicole/recipes-phosphor/leds/nicole-led-manager-config/led.yaml @@ -1,17 +1,27 @@ +# +# If the LED has a label in DTS like: +# label = "device:color:function"; +# the D-Bus name looks like: +# device_function_color +# +bmc_booted: + platform_power_green: + Action: 'Blink' + Priority: 'On' power_on: - power: + platform_power_green: Action: 'On' Priority: 'On' enclosure_identify: - identify: + platform_indicator_blue: Action: 'Blink' Priority: 'Blink' enclosure_fault: &SYS_FAULT - alarm_red: + platform_fault_red: Action: 'Blink' Priority: 'Blink' enclosure_warning: &FRU_FAULT - alarm_yellow: + platform_alarm_yellow: Action: 'Blink' Priority: 'Blink' diff --git a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index ce3a6494d..8ad3a91eb 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,6 @@ RDEPENDS_${PN}-inventory_append = " openpower-occ-control" -RDEPENDS_${PN}-extras += " phosphor-hostlogger openpower-esel-parser" +RDEPENDS_${PN}-extras_append = " \ + phosphor-hostlogger \ + openpower-esel-parser \ + obmc-yadro-fwupdate \ +" 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 new file mode 100644 index 000000000..290a72252 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/iio-hwmon-battery.conf @@ -0,0 +1,9 @@ +LABEL_in1=vbat +GAIN_in1=2.25 + +# GPIOP2 needs to be pulled high for battery voltage reading +GPIOCHIP_in1=0 +GPIO_in1=122 + +# Read it every day so it does not impact battery life +INTERVAL=86400000000 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 d03b2c40f..58e0c90b3 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -2,6 +2,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" EXTRA_OECONF_append = " --enable-negative-errno-on-fail" +ITEMS = "iio-hwmon-battery.conf" + OCCS = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ 00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ @@ -11,4 +13,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'ITEMS')}" SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json index 96644622b..cfc3b4a75 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json +++ b/meta-yadro/meta-nicole/recipes-phosphor/skeleton/obmc-libobmc-intf/gpio_defs.json @@ -29,11 +29,6 @@ "direction": "in" }, { - "name": "BMC_WD_CLEAR_PULSE_N", - "pin": "N5", - "direction": "falling" - }, - { "name": "CHECKSTOP", "pin": "J2", "direction": "falling" @@ -42,6 +37,11 @@ "name": "POWER_BUTTON", "pin": "O2", "direction": "both" + }, + { + "name": "ID_BTN", + "pin": "Q7", + "direction": "out" } ] } diff --git a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager/resetreason.conf b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager/resetreason.conf new file mode 100644 index 000000000..828d98b8e --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager/resetreason.conf @@ -0,0 +1,2 @@ +[Unit] +ConditionKernelCommandLine=resetreason=power diff --git a/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend new file mode 100644 index 000000000..dcf8cac00 --- /dev/null +++ b/meta-yadro/meta-nicole/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPS_CFG = "resetreason.conf" +DEPS_TGT = "phosphor-discover-system-state@.service" +SYSTEMD_OVERRIDE_${PN}-discover_append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" diff --git a/meta-yadro/meta-vesnin/conf/layer.conf b/meta-yadro/meta-vesnin/conf/layer.conf index 75d9c0f69..d5c27d4aa 100644 --- a/meta-yadro/meta-vesnin/conf/layer.conf +++ b/meta-yadro/meta-vesnin/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "vesnin-layer" BBFILE_PATTERN_vesnin-layer = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_vesnin-layer = "warrior zeus" +LAYERSERIES_COMPAT_vesnin-layer = "warrior zeus dunfell" diff --git a/meta-yadro/recipes-phosphor/flash/obmc-yadro-fwupdate_git.bb b/meta-yadro/recipes-phosphor/flash/obmc-yadro-fwupdate_git.bb new file mode 100644 index 000000000..ae2f7c97a --- /dev/null +++ b/meta-yadro/recipes-phosphor/flash/obmc-yadro-fwupdate_git.bb @@ -0,0 +1,22 @@ +SUMMARY = "YADRO Firmware update tool" +DESCRIPTION = "Command line tool for update firmware" +HOMEPAGE = "https://github.com/YADRO-KNS/obmc-yadro-fwupdate" +PR = "r1" +PV = "1.0+git${SRCPV}" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" + +inherit meson + +DEPENDS += " \ + sdbusplus \ + openssl \ +" + +EXTRA_OEMESON_df-openpower = " \ + -Dopenpower-support=true \ +" + +SRC_URI = "git://github.com/YADRO-KNS/obmc-yadro-fwupdate" +SRCREV = "b922eb474447b76fb72cc615c025e3845b7c4b7e" +S = "${WORKDIR}/git" @@ -31,7 +31,7 @@ machine() { local target=$1 local build_dir=$2 local cfg name tmpl - for cfg in meta-*/meta-*/conf/machine/*.conf; do + for cfg in meta-*/meta-*/conf/machine/*.conf meta-*/conf/machine/*.conf; do name=${cfg##*/} name=${name%.conf} tmpl=${cfg%/machine/*.conf} @@ -40,6 +40,7 @@ machine() { if [ -n "$target" ]; then if [ "${name}" = "${target}" ]; then echo "Machine ${target} found in ${tmpl%/conf}" + mkdir -p ${build_dir} TEMPLATECONF="${tmpl}" source \ oe-init-build-env ${build_dir} @@ -68,7 +69,7 @@ elif [ "$1" = "qemuarm" ]; then else bld_dir=$2 if [ -z "$2" ]; then - bld_dir="build" + bld_dir="build/$1" fi machine $1 $bld_dir fi |