ibm: Remove the openbmc-witherspoon distro

The meta-ibm layer supported two different DISTROs depending on the
machine being built. This caused complexity since the user needed to
remember to specify the DISTRO name, in addition to the CI build scripts
needed to check for the machine name being built to override the default
DISTRO.

For simplification, remove the openbmc-witherspoon DISTRO, which is the
openpower DISTRO plus additional features, and move these features to
the machine configuration files. Make the openpower DISTRO the default.

Tested: Built witherspoon and p10bmc using "source setup <machine> build"
        followed by "bitbake obmc-phosphor-image" without specifying the
        DISTRO. Verified witherspoon built a ubi image and p10bmc built
        a emmc image.

Change-Id: If33441ab4ad2dc0fbedde09f0db91d691d2da4f7
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

5 files changed, 13 insertions, 11 deletions

diff --git a/meta-ibm/conf/conf-notes.txt b/meta-ibm/conf/conf-notes.txt
index d4578dcf4..705a54d7c 100644
--- a/meta-ibm/conf/conf-notes.txt
+++ b/meta-ibm/conf/conf-notes.txt
@@ -1,12 +1,12 @@
 Example build invocations:
 
 mihawk:
-DISTRO=openbmc-witherspoon MACHINE=mihawk bitbake obmc-phosphor-image
+MACHINE=mihawk bitbake obmc-phosphor-image
 p10bmc:
-DISTRO=openbmc-openpower MACHINE=p10bmc bitbake obmc-phosphor-image
+MACHINE=p10bmc bitbake obmc-phosphor-image
 swift:
-DISTRO=openbmc-witherspoon MACHINE=swift bitbake obmc-phosphor-image
+MACHINE=swift bitbake obmc-phosphor-image
 witherspoon:
-DISTRO=openbmc-witherspoon MACHINE=witherspoon bitbake obmc-phosphor-image
+MACHINE=witherspoon bitbake obmc-phosphor-image
 witherspoon-tacoma:
-DISTRO=openbmc-openpower MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image
+MACHINE=witherspoon-tacoma bitbake obmc-phosphor-image
diff --git a/meta-ibm/conf/distro/openbmc-witherspoon.conf b/meta-ibm/conf/distro/openbmc-witherspoon.conf
deleted file mode 100644
index f2caf402b..000000000
--- a/meta-ibm/conf/distro/openbmc-witherspoon.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-require conf/distro/openbmc-openpower.conf
-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-ibm/conf/local.conf.sample b/meta-ibm/conf/local.conf.sample
index 9f2228b80..2ee8833b2 100644
--- a/meta-ibm/conf/local.conf.sample
+++ b/meta-ibm/conf/local.conf.sample
@@ -2,7 +2,7 @@
 #MACHINE ?= "p10bmc"
 #MACHINE ?= "swift"
 MACHINE ??= "witherspoon"
-DISTRO ?= "openbmc-witherspoon"
+DISTRO ?= "openbmc-openpower"
 PACKAGE_CLASSES ?= "package_rpm"
 SANITY_TESTED_DISTROS_append ?= " *"
 EXTRA_IMAGE_FEATURES = "debug-tweaks"
diff --git a/meta-ibm/conf/machine/mihawk.conf b/meta-ibm/conf/machine/mihawk.conf
index efcf7717d..bb54c6a78 100644
--- a/meta-ibm/conf/machine/mihawk.conf
+++ b/meta-ibm/conf/machine/mihawk.conf
@@ -7,11 +7,14 @@ OBMC_POWER_SUPPLY_INSTANCES = "0 1"
 
 PREFERRED_PROVIDER_virtual/openpower-fru-vpd-layout = "mihawk-openpower-fru-vpd-layout-native"
 
+require conf/distro/include/phosphor-aspeednic-use-mac2.inc
+require conf/distro/include/phosphor-ubi.inc
+require conf/distro/include/openpower-mrw.inc
+require conf/distro/include/openpower-ubi.inc
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc
 require conf/machine/include/p9.inc
-require conf/distro/include/phosphor-aspeednic-use-mac2.inc
 
 PHOSPHOR_MRW_LICENSE = "Apache-2.0"
 PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
diff --git a/meta-ibm/conf/machine/witherspoon.conf b/meta-ibm/conf/machine/witherspoon.conf
index acceb478b..c037a78bd 100644
--- a/meta-ibm/conf/machine/witherspoon.conf
+++ b/meta-ibm/conf/machine/witherspoon.conf
@@ -8,6 +8,9 @@ OBMC_POWER_SUPPLY_INSTANCES = "0 1"
 # A machine override for common machine configuration for all of IBM's
 # "Accelerated Computing" class of systems.
 MACHINEOVERRIDES =. "ibm-ac-server:"
+require conf/distro/include/phosphor-ubi.inc
+require conf/distro/include/openpower-mrw.inc
+require conf/distro/include/openpower-ubi.inc
 require conf/machine/include/ast2500.inc
 require conf/machine/include/obmc-bsp-common.inc
 require conf/machine/include/openpower.inc