meta-crownbay: tidy up layer configuration

* We can't use machine overrides in layer.conf because MACHINE is not
  defined yet (local.conf has not yet been parsed) so remove these
* In light of the above having a separate collection configured for
  crownbay-noemgd no longer does anything, so remove it as well.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
index 4ffeb2ce..9c3794b1 100644
--- a/meta-crownbay/conf/layer.conf
+++ b/meta-crownbay/conf/layer.conf
@@ -7,10 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
         ${LAYERDIR}/../common/recipes-*/*/*.bb \
         ${LAYERDIR}/../common/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS_append_crownbay += "crownbay"
+BBFILE_COLLECTIONS += "crownbay"
 BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
 BBFILE_PRIORITY_crownbay = "6"
-
-BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
-BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
-BBFILE_PRIORITY_crownbay-noemgd = "6"