summaryrefslogtreecommitdiffstats
path: root/meta-ibm
diff options
context:
space:
mode:
authorLei YU <mine260309@gmail.com>2019-02-18 14:52:23 +0800
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-04-07 14:19:48 -0400
commitb7cfdf300f467f376e986e55d3a8c6ba6160b325 (patch)
tree5e27c15b3af8230765677361ce0f140f8bc3c844 /meta-ibm
parentee2b77a9e5d427fc92244038724dbd0b5144a76d (diff)
downloadtalos-openbmc-b7cfdf300f467f376e986e55d3a8c6ba6160b325.tar.gz
talos-openbmc-b7cfdf300f467f376e986e55d3a8c6ba6160b325.zip
meta-ibm: remove phosphor-isolation from witherspoon and romulus
The distro feature phosphor-isolation is added into openbmc-openpower distro feature and becomes common for all openpower machines. So remove them from meta-witherspoon and meta-romulus. This shall be merged after the commit of adding phosphor-isolation in openbmc-openpower is merged. Tested: Verify the Romulus build picks phosphor-isolation distro feature (From meta-ibm rev: 90f4ccb72200c26d13d3bbd70b6eb7cd90c3dff7) Change-Id: I8e64bee92eaa7c69928399ceedec6f889a713156 Signed-off-by: Lei YU <mine260309@gmail.com> Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm')
-rw-r--r--meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf1
-rw-r--r--meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf1
2 files changed, 0 insertions, 2 deletions
diff --git a/meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf b/meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf
index 9a5920a66..2570a9a19 100644
--- a/meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf
+++ b/meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf
@@ -1,2 +1 @@
require conf/distro/openbmc-openpower.conf
-require conf/distro/include/phosphor-isolation.inc
diff --git a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
index 76be4aef7..1ccdeb3f5 100644
--- a/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
+++ b/meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf
@@ -3,4 +3,3 @@ require conf/distro/include/phosphor-ubi.inc
require conf/distro/include/phosphor-tiny.inc
require conf/distro/include/openpower-mrw.inc
require conf/distro/include/openpower-ubi.inc
-require conf/distro/include/phosphor-isolation.inc
OpenPOWER on IntegriCloud