diff options
Diffstat (limited to 'meta-openpower/recipes-phosphor')
6 files changed, 20 insertions, 20 deletions
diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc index 9c522c1cd..b252e6c11 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector-systemd-links.inc @@ -15,7 +15,7 @@ pkg_postinst:${PN}:append() { TARGET="../openpower-debug-collector-watchdog@.service" ln -s $TARGET $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" TARGET="../openpower-debug-collector-watchdog-timeout@.service" ln -s $TARGET $LINK @@ -29,7 +29,7 @@ pkg_prerm:${PN}:append() { fi LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog@0.service" rm $LINK - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" != 'phal' ]; then LINK="$D$systemd_system_unitdir/obmc-host-timeout@0.target.wants/openpower-debug-collector-watchdog-timeout@0.service" rm $LINK fi diff --git a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb index 68965af0a..cdb1da621 100644 --- a/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb +++ b/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_git.bb @@ -24,7 +24,7 @@ S = "${WORKDIR}/git" APPS = " \ checkstop \ watchdog \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', '', 'watchdog-timeout', d)} \ " DEBUG_TMPL = "openpower-debug-collector-{0}@.service" 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 8cedb62a5..f3c63adad 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 @@ -48,7 +48,7 @@ pkg_postinst:${PN}() { ln -s $TARGET $LINK # Only install certain units if phal enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then mkdir -p $D$systemd_system_unitdir/obmc-host-start@0.target.requires LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.service" TARGET="../phal-reinit-devtree.service" @@ -115,7 +115,7 @@ pkg_prerm:${PN}() { rm $LINK # Remove phal specific units if enabled - if [ "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" = phal ]; then + if [ "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" = phal ]; then LINK="$D$systemd_system_unitdir/obmc-host-start@0.target.requires/phal-reinit-devtree.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 32a7d4778..92287f529 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -31,16 +31,16 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "${TEMPLATE} ${INSTANCES}" SYSTEMD_SERVICE:${PN} += " \ - xyz.openbmc_project.Control.Host.NMI.service \ - 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 \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ - ${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ - " + op-cfam-reset.service \ + op-continue-mpreboot@.service \ + op-enter-mpreboot@.service \ + op-stop-instructions@.service \ + xyz.openbmc_project.Control.Host.NMI.service \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-check@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'op-reset-host-clear.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-export-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-import-devtree@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'phal-reinit-devtree.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'proc-pre-poweroff@.service', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'phal', 'set-spi-mux.service', '', d)} \ + " 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 4a61ba3bd..fc7c39dfc 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -30,6 +30,6 @@ DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ RDEPENDS:${PN} += "openpower-libhei" # Conditionally pull in PHAL APIs, if available. -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb index b78b85bfb..804084e1d 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control_git.bb @@ -43,7 +43,7 @@ EXTRA_OEMESON = " \ -Dyamldir=${STAGING_DATADIR_NATIVE}/${PN} \ -Dps-derating-factor=${POWER_SUPPLY_DERATING_FACTOR} \ " -EXTRA_OEMESON:append = "${@bb.utils.contains('OBMC_MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" +EXTRA_OEMESON:append = "${@bb.utils.contains('MACHINE_FEATURES', 'i2c-occ', ' -Di2c-occ=enabled', '', d)}" OCC_ENABLE = "enable" OCC_DISABLE = "disable" |