| commit | b81d4282120dc0c19e0f73833e12a9a5baa7a3a5 | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Thu Mar 08 22:29:25 2018 -0500 |
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | Tue Mar 13 02:51:06 2018 +0000 |
| tree | d33cc40d5b2395efc9992026440c50d1d4c74026 | |
| parent | 3f94605e3a2ba3b89a8a4a8d3ee8946c15ec7b85 [diff] |
Remove obmc-mrw machine feature Using MRW or not is distro policy. As such remove the obmc-mrw machine feature. Do not enable the remaining obmc-mrw distro feature in the base phosphor distro configuration. Create new distro configs for the systems that use MRW today (i.e. Witherspoon) that enables the obmc-mrw distro feature and point the local.conf.sample at the new distro configuration. Change-Id: If4cedc745b3ee942518fbfd4d5cf2cd5b60f346d Tested: Built a Witherspoon image and validate the 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 new file mode 100644 index 0000000..27bf881 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -0,0 +1,2 @@ +require conf/distro/include/phosphor-base.inc +require conf/distro/include/openpower-mrw.inc
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/local.conf.sample b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/local.conf.sample index 6e774ff..ca640ce 100644 --- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/local.conf.sample +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/conf/local.conf.sample
@@ -1,5 +1,5 @@ MACHINE ??= "witherspoon" -DISTRO ?= "openbmc-phosphor" +DISTRO ?= "openbmc-witherspoon" PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS_append ?= " *" EXTRA_IMAGE_FEATURES = "debug-tweaks"
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 806d534..0085a14 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,7 +3,7 @@ UBOOT_MACHINE = "ast_g5_ncsi_config" -OBMC_MACHINE_FEATURES += "obmc-mrw obmc-ubi-fs openpower-ubi-fs" +OBMC_MACHINE_FEATURES += "obmc-ubi-fs openpower-ubi-fs" OBMC_POWER_SUPPLY_INSTANCES = "0 1"