Merge remote-tracking branch 'origin/master' into master-enea

2 files changed, 0 insertions, 34 deletions

diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
deleted file mode 100644
index e6cc2a02..00000000
--- a/meta-crownbay/conf/layer.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-        ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "crownbay"
-BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
-BBFILE_PRIORITY_crownbay = "6"
-
-LAYERDEPENDS_crownbay = "intel"
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
deleted file mode 100644
index 9f0aa300..00000000
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: crownbay-noemgd
-
-#@WEBTITLE: Intel Atom E6xx Processor With Intel EG20T Controller Hub Development Kit (Crown Bay) With Open Source VESA Graphics
-
-#@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits
-# i.e. E660 + EG20T
-
-PREFERRED_VERSION_linux-yocto ?= "3.19%"
-
-require conf/machine/include/meta-intel.inc
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/intel-common-pkgarch.inc
-
-MACHINE_FEATURES += "intel-ucode"
-
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_VESA} \
-           "
-
-APPEND += "video=vesafb vga=0x318"