summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2017-08-10 01:09:13 +0300
committerPatrick Williams <patrick@stwcx.xyz>2017-08-10 20:04:21 +0300
commitbefcd7db78dc9af99e936543e6af51b22ee63615 (patch)
tree27849bb8ab03e8dc6a1dca178b50809c7c238bd5
parent7e4506f11d9f9bda9a4225f585275bc58c698def (diff)
downloadopenbmc-befcd7db78dc9af99e936543e6af51b22ee63615.tar.xz
meta-openpower: Convert MACHINE_FEATURE openpower-pflash to openpower-ubi-fs
Since pflash is no longer used when openpower-ubi-fs is enabled and the only use of the openpower-pflash feature was to enable a pflash dependency in obmc-op-flasher, remove obmc-op-flasher when openpower-ubi-fs is enabled (thus removing pflash from the machine). Change-Id: Ia11d2b11ac201a139e1c4d014d539d346e0c2479 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
-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/openpower.inc1
-rw-r--r--meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf1
-rw-r--r--meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb5
4 files changed, 3 insertions, 6 deletions
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 9b48cf15f..2741ef7ff 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
@@ -47,7 +47,7 @@ RDEPENDS_${PN}-flash = " \
obmc-flash-bios \
obmc-flash-bmc \
obmc-mgr-download \
- obmc-op-flasher \
+ ${@mf_enabled(d, 'openpower-ubi-fs', '', 'obmc-op-flasher')} \
obmc-control-bmc \
openpower-software-manager \
"
diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
index 74b3268cd..984a3777b 100644
--- a/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
+++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/openpower.inc
@@ -4,7 +4,6 @@ OBMC_MACHINE_FEATURES += "\
obmc-phosphor-flash-mgmt \
obmc-host-ipmi \
obmc-host-ctl \
- openpower-pflash \
obmc-host-state-mgmt \
obmc-chassis-state-mgmt \
obmc-bmc-state-mgmt \
diff --git a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
index 9f2b25ef1..91bde4e0e 100644
--- a/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ b/meta-openbmc-machines/meta-x86/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -17,7 +17,6 @@ FLASH_SIZE = "32768"
# obmc-phosphor-flash-mgmt \
# obmc-host-ipmi \
# obmc-host-ctl \
-# openpower-pflash \
# obmc-host-state-mgmt \
# obmc-chassis-state-mgmt \
# obmc-bmc-state-mgmt \
diff --git a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb b/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
index 99085002a..d3d129048 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/obmc-op-flasher.bb
@@ -4,8 +4,7 @@ PR = "r1"
inherit skeleton-gdbus
-# DEPEND,RDEPEND on pflash if the openpower-pflash machine feature is set.
-PACKAGECONFIG ??= "${@bb.utils.contains('MACHINE_FEATURES', 'openpower-pflash', 'openpower-pflash', '', d)}"
-PACKAGECONFIG[openpower-pflash] = ",,pflash,pflash"
+DEPENDS += "pflash"
+RDEPENDS_${PN} += "pflash"
SKELETON_DIR = "op-flasher"