diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2017-08-09 17:09:13 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-08-10 17:04:21 +0000 |
| commit | befcd7db78dc9af99e936543e6af51b22ee63615 (patch) | |
| tree | 27849bb8ab03e8dc6a1dca178b50809c7c238bd5 /meta-openbmc-machines | |
| parent | 7e4506f11d9f9bda9a4225f585275bc58c698def (diff) | |
| download | talos-openbmc-befcd7db78dc9af99e936543e6af51b22ee63615.tar.gz talos-openbmc-befcd7db78dc9af99e936543e6af51b22ee63615.zip | |
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>
Diffstat (limited to 'meta-openbmc-machines')
3 files changed, 1 insertions, 3 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 \ |
