From b7cfdf300f467f376e986e55d3a8c6ba6160b325 Mon Sep 17 00:00:00 2001 From: Lei YU Date: Mon, 18 Feb 2019 14:52:23 +0800 Subject: 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 Signed-off-by: Brad Bishop --- meta-ibm/meta-romulus/conf/distro/openbmc-romulus.conf | 1 - meta-ibm/meta-witherspoon/conf/distro/openbmc-witherspoon.conf | 1 - 2 files changed, 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 -- cgit v1.2.3