summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb (renamed from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi.bb)0
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service (renamed from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service)0
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service (renamed from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service)0
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service (renamed from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service)0
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service (renamed from meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service)0
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb2
-rw-r--r--meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc2
7 files changed, 2 insertions, 2 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
index 37a326fd0..37a326fd0 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi.bb
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
index 77c61f414..77c61f414 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-bind@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
index a58af0445..a58af0445 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-disable.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-disable.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
index c5b1ea139..c5b1ea139 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-enable.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-enable.service
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index 8f94e28ab..8f94e28ab 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi/fsi-scan@.service
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index b9d974cc2..cf8ce72a2 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -34,7 +34,7 @@ RDEPENDS_${PN}-chassis = " \
obmc-host-failure-reboots \
"
#Pull in obmc-fsi on all P9 OpenPOWER systems
-RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'obmc-fsi', 'obmc-fsi')}"
+RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'op-fsi', 'op-fsi')}"
SUMMARY_${PN}-fans = "OpenPOWER Fans"
RDEPENDS_${PN}-fans = " \
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc
index 0aa3035bd..a58962351 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc
@@ -1,2 +1,2 @@
-OBMC_MACHINE_FEATURES += 'p9-vcs-workaround obmc-fsi'
+OBMC_MACHINE_FEATURES += 'p9-vcs-workaround op-fsi'
PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start"
OpenPOWER on IntegriCloud