| commit | 09806a566ce7af38691ec9a9b9c26ebe3463f746 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Fri Mar 09 00:40:41 2018 -0500 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Mon Mar 12 22:51:39 2018 -0400 |
| tree | 1f5211c9109e11e51538f7c956da208e5784bff8 | |
| parent | 8623bbe4d4a187018cc3c265aaca5fa05b78d13b [diff] |
Convert openpower-ubi-fs to a distro feature As with MRW the use of the UBI image scheme is distro policy. Convert the existing machine feature to a distro feature. Enable the new distro feature on the systems that use it(Witherspoon). Add a distro override and fix-up MF checks to use this override instead for improved readability. Change-Id: I57f3bc244523eff5bc043caff8365e334d98cb30 Tested: Built a witherspoon image and validate manifest Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf index c00930a..543e7f9 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -1,3 +1,4 @@ require conf/distro/include/phosphor-base.inc require conf/distro/include/phosphor-ubi.inc require conf/distro/include/openpower-mrw.inc +require conf/distro/include/openpower-ubi.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf index 13831a7..75ef287 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/machine/witherspoon.conf
@@ -3,8 +3,6 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" -OBMC_MACHINE_FEATURES += "openpower-ubi-fs" - OBMC_POWER_SUPPLY_INSTANCES = "0 1" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''