[Subtree] Bring openbmc machines to top level

The new subtree model brings the subtrees up from the openbmc-machines
layer.

Change-Id: I58a03ae1be374bc79ae1438e65e888375d12d0c0
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 7d9607d..559f3bf 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
-LCONF_VERSION = "7"
+LCONF_VERSION = "8"
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
diff --git a/conf/distro/include/phosphor-base.inc b/conf/distro/include/phosphor-base.inc
index 9edd238..1908118 100644
--- a/conf/distro/include/phosphor-base.inc
+++ b/conf/distro/include/phosphor-base.inc
@@ -154,3 +154,4 @@
 # make sense on a BMC anyway.
 BAD_RECOMMENDATIONS_pn-obmc-phosphor-image = "udev-hwdb"
 
+LAYER_CONF_VERSION = "8"