Remove older platform specific BSPs

The intel-core* BSPs supercede these older BSPs therefore it's time to remove these older platform specific bsps. Bump LAYERVERSION to 3 to allow the Autobuilder to know that these BSPs have been removed. Signed-off-by: Saul Wold <sgw@linux.intel.com>
author: Saul Wold <sgw@linux.intel.com> 2015-08-25 16:39:01 -0700
committer: Saul Wold <sgw@linux.intel.com> 2015-08-28 14:25:29 -0700
commit: 4172351baa285b83eb54d54368fe2f037c48159b (patch)
tree: c2c1991e05b0260615b83abf59acee81a534ec10
parent: 44df7ddf395f82c28c494b92fb3f627f81e2e627 (diff)
download: meta-intel-4172351baa285b83eb54d54368fe2f037c48159b.tar.gz
64 files changed, 3 insertions, 2101 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 64019636..233fa2eb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18,8 +18,8 @@ Descriptions of section entries:
        M: Mail patches to: FullName <address@domain>
        F: Files and directories with wildcard patterns.
           A trailing slash includes all files and subdirectory files.
-           F:   meta-crownbay/  all files in and below meta-crownbay
+           F:   common/  all files in and below common
-           F:   meta-crownbay/* all files in meta-crownbay, but not below
+           F:   common/* all files in common, but not below
           One pattern per line.  Multiple F: lines acceptable.
 Please keep this list in alphabetical order.
@@ -31,34 +31,14 @@ COMMON
 M:      Saul Wold <sgw@linux.intel.com>
 F:      common/
-CROWNBAY
-M:      Saul Wold <sgw@linux.intel.com>
-F:      meta-crownbay/
 CRYSTALFOREST
 M:      Wu Chia Chuan <chia.chuan.wu@intel.com>
 F:      meta-crystalforest/
-EMENLOW
-M:      Saul Wold <sgw@linux.intel.com>
-F:      meta-emenlow/
-FRI2
-M:      Darren Hart <dvhart@linux.intel.com>
-F:      meta-fri2/
-JASPERFOREST
-M:      Saul Wold <sgw@linux.intel.com>
-F:      meta-jasperforest/
 ROMLEY
 M:      Wu Chia Chuan <chia.chuan.wu@intel.com>
 F:      meta-romley/
-SUGARBAY
-M:      Saul Wold <sgw@linux.intel.com>
-F:      meta-sugarbay/
 TLK
 M:      Saul Wold <sgw@linux.intel.com>
 F:      meta-tlk/
diff --git a/conf/layer.conf b/conf/layer.conf
index 3b7de9aa..f419fe63 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -14,4 +14,4 @@ LICENSE_PATH += "${LAYERDIR}/common/custom-licenses"
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
-LAYERVERSION_intel = "2"
+LAYERVERSION_intel = "3"
diff --git a/meta-crownbay/COPYING.MIT b/meta-crownbay/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-crownbay/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
diff --git a/meta-crownbay/README b/meta-crownbay/README
deleted file mode 100644
index 03dafb40..00000000
--- a/meta-crownbay/README
+++ /dev/null
@@ -1,140 +0,0 @@
-This README file contains information on building the meta-crownbay
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-The Crown Bay platform consists of the Intel Atom E6xx processor,
-plus the Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff).
-Further information on the platforms supported by this BSP can be
-found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware/atom-e6xx/overview
-And information on all Intel® embedded platforms can be found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware
-Yocto Project Compatible
-========================
-This BSP is compatible with the Yocto Project as per the requirements
-listed here:
-  https://www.yoctoproject.org/webform/yocto-project-compatible-registration
-Dependencies
-============
-This layer depends on:
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-Patches
-=======
-Please submit any patches against this BSP to the meta-intel mailing list
-(meta-intel@yoctoproject.org) and cc: the maintainer:
-Maintainer: Saul Wold <sgw@linux.intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-Table of Contents
-=================
-  I. Building the meta-crownbay BSP layer
- II. Booting the images in /binary
-I. Building the meta-crownbay BSP layer
-=======================================
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a crownbay
-image by adding the location of the meta-crownbay layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-  yocto/meta-intel \
-  yocto/meta-intel/meta-crownbay \
-The meta-crownbay layer contains support for the crownbay-noemgd machine
-configuration. The previously supported crownbay machine with the
-proprietary EMGD graphics driver has been retired. The 'crownbay-noemgd'
-machine configuration uses the open source 'vesa' kernel driver.
-To enable the layer add the following to the local.conf file:
-  MACHINE ?= "crownbay-noemgd"
-You should then be able to build a crownbay image as such:
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-At the end of a successful build, you should have a live image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the images from /binary').
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting
-a BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-II. Booting the images in /binary
-=================================
-This BSP contains bootable live images, which can be used to directly
-boot Yocto off of a USB flash drive.
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the live image to it.  For
-example:
-# dd if=core-image-sato-crownbay-noemgd.hddimg of=/dev/sdf
-# sync
-# eject /dev/sdf
-This should give you a bootable USB flash device.  Insert the device
-into a bootable USB socket on the target, and power on.  This should
-result in a system booted to the Sato graphical desktop.
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
----
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-# dd if=/dev/zero of=/dev/sdf bs=1M count=512
diff --git a/meta-crownbay/README.sources b/meta-crownbay/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-crownbay/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-http://downloads.yoctoproject.org/mirror/sources/
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
diff --git a/meta-crownbay/binary/.gitignore b/meta-crownbay/binary/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/meta-crownbay/binary/.gitignore
+++ /dev/null
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"
diff --git a/meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay-noemgd/machconfig b/meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay-noemgd/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-crownbay/recipes-bsp/formfactor/formfactor/crownbay-noemgd/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-crownbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-crownbay/recipes-kernel/kmod/kmod_git.bbappend b/meta-crownbay/recipes-kernel/kmod/kmod_git.bbappend
deleted file mode 100644
index 56d8fcb0..00000000
--- a/meta-crownbay/recipes-kernel/kmod/kmod_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-do_install_append () {
-        echo "blacklist gma500_gfx" > ${D}${sysconfdir}/modprobe.d/prohibit_gma500_gfx.conf
-}
diff --git a/meta-emenlow/COPYING.MIT b/meta-emenlow/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-emenlow/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
diff --git a/meta-emenlow/README b/meta-emenlow/README
deleted file mode 100644
index eccc9f33..00000000
--- a/meta-emenlow/README
+++ /dev/null
@@ -1,148 +0,0 @@
-This README file contains information on building the meta-emenlow
-BSP layer using any of the supported machine configurations, and
-booting the images contained in the /binary directory.
-The 'eMenlow' platform consists of the Intel Atom Z5xx processor,
-plus the Intel US15W System Controller Hub.
-Further information on the platform supported by this BSP can be
-found here:
-  http://www.portwell.com/products/detail.asp?CUSTCHAR1=WEBS-2120
-Information on all Intel® embedded platforms can be found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware
-If you're only interested in booting the images in the /binary
-directory of a BSP tarball you've downloaded, there's nothing special
-to do - the appropriate images are already in the /binary directory
-depending on which BSP tarball you downloaded.
-Please see the corresponding sections below for details.
-Yocto Project Compatible
-========================
-This BSP is compatible with the Yocto Project as per the requirements
-listed here:
-  https://www.yoctoproject.org/webform/yocto-project-compatible-registration
-Dependencies
-============
-This layer depends on:
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-Patches
-=======
-Please submit any patches against this BSP to the meta-intel mailing list
-(meta-intel@yoctoproject.org) and cc: the maintainer:
-Maintainer: Saul Wold <sgw@linux.intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-Table of Contents
-=================
- I. Building the meta-emenlow BSP layer
-II. Booting the images in /binary
-I. Building the meta-emenlow BSP layer
-=======================================
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build an emenlow
-image by adding the location of the meta-emenlow layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-  yocto/meta-intel \
-  yocto/meta-intel/meta-emenlow \
-The meta-emenlow layer contains support for emenlow-noemgd machine
-configuration. The previously supported emenlow machine with the
-proprietary EMGD graphics driver has been retired. The 'emenlow-noemgd'
-machine configuration uses the open source 'gma500' kernel DRM driver
-along with the 'modesetting' X driver.
-To enable the layer add the following to the local.conf file:
-  MACHINE ?= "emenlow-noemgd"
-You should then be able to build an emenlow image as such:
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-At the end of a successful build, you should have a live image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the images from /binary').
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting a
-BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-II. Booting the images in /binary
-=================================
-This BSP contains bootable live images, which can be used to directly
-boot Yocto off of a USB flash drive.
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the live image to it.  For
-example:
-# dd if=core-image-sato-emenlow-noemgd.hddimg of=/dev/sdf
-# sync
-# eject /dev/sdf
-This should give you a bootable USB flash device.  Insert the device
-into a bootable USB socket on the target, and power on.  This should
-result in a system booted to the Sato graphical desktop.
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
----
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-# dd if=/dev/zero of=/dev/sdf bs=1M count=512
diff --git a/meta-emenlow/README.sources b/meta-emenlow/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-emenlow/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-http://downloads.yoctoproject.org/mirror/sources/
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
diff --git a/meta-emenlow/binary/.gitignore b/meta-emenlow/binary/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/meta-emenlow/binary/.gitignore
+++ /dev/null
diff --git a/meta-emenlow/conf/layer.conf b/meta-emenlow/conf/layer.conf
deleted file mode 100644
index b5832e4f..00000000
--- a/meta-emenlow/conf/layer.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-        ${LAYERDIR}/recipes-*/*/*.bbappend"
-BBFILE_COLLECTIONS += "emenlow"
-BBFILE_PATTERN_emenlow := "^${LAYERDIR}/"
-BBFILE_PRIORITY_emenlow = "6"
-LAYERDEPENDS_emenlow = "intel"
diff --git a/meta-emenlow/conf/machine/emenlow-noemgd.conf b/meta-emenlow/conf/machine/emenlow-noemgd.conf
deleted file mode 100644
index 0a92845c..00000000
--- a/meta-emenlow/conf/machine/emenlow-noemgd.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: emenlow-noemgd
-#@WEBTITLE: Intel Atom Z5xx Processor With Intel US15W Controller Hub (eMenlow) with open source graphics
-#@DESCRIPTION: Machine configuration for eMenlow based systems, like the Webs-2120 box, without the Intel-proprietary graphics bits
-PREFERRED_VERSION_linux-yocto ?= "3.19%"
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/intel-common-pkgarch.inc
-require conf/machine/include/meta-intel.inc
-MACHINE_FEATURES += "intel-ucode"
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_MODESETTING} \
-           "
-APPEND += "reboot=pci"
diff --git a/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/machconfig b/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow-noemgd/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-emenlow/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
deleted file mode 100644
index 3316e541..00000000
--- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-Section "Device"
-    Identifier    "gma500"
-    Driver        "modesetting"
-    Option        "SWCursor"       "ON"
-EndSection
-Section "Monitor"
-    Identifier    "Generic Monitor"
-    Option        "DPMS"
-EndSection
-Section "Screen"
-    Identifier    "Default Screen"
-    Device        "gma500"
-    Monitor       "Generic Monitor"
-    DefaultDepth  24
-EndSection
-Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen         "Default Screen"
-EndSection
diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
deleted file mode 100644
index e6c4c7ec..00000000
--- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR := "${PR}.2"
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 61aed2f4..00000000
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
-KMACHINE_emenlow-noemgd = "emenlow"
-KBRANCH_emenlow-noemgd = "standard/emenlow"
-KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
-# NOTE: We do not set SRCREVs here as -dev is intended to be built with AUTOREV
-# and setting them here breaks the default mechanism to use AUTOREV if the
-# default SRCREV is set and linux-yocto-dev is the preferred provider.
diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend
deleted file mode 100644
index a2b8d67c..00000000
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_emenlow-noemgd = "emenlow-noemgd"
-KMACHINE_emenlow-noemgd = "emenlow"
-KBRANCH_emenlow-noemgd = "standard/base"
-KERNEL_FEATURES_append_emenlow-noemgd = " features/drm-gma500/drm-gma500"
-LINUX_VERSION_emenlow-noemgd = "3.14.36"
-SRCREV_machine_emenlow-noemgd = "4434aa71ff7043c570f9eae493df1ccadbda9b85"
-SRCREV_meta_emenlow-noemgd = "c33d39561807e1073ca412f1c771f43e4da75994"
diff --git a/meta-fri2/COPYING.MIT b/meta-fri2/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-fri2/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
diff --git a/meta-fri2/README b/meta-fri2/README
deleted file mode 100644
index 6e90c335..00000000
--- a/meta-fri2/README
+++ /dev/null
@@ -1,339 +0,0 @@
-This README file contains information on building the meta-fri2 BSP
-layer and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-The Fish River Island II BSP supports the Kontron M2M Smart Services
-Developer Kit, as described here:
-http://us.kontron.com/products/systems+and+platforms/m2m/m2m+smart+services+developer+kit.html
-The 'Queens Bay' platform consists of the Intel Atom E640T processor plus the
-Intel EG20T Platform Controller Hub (Tunnel Creek + Topcliff). The Fish River
-Island II includes a variety of communications options and other
-machine-to-machine (m2m) capabilities.
-Information on all Intel embedded platforms can be found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware
-Yocto Project Compatible
-========================
-This BSP is compatible with the Yocto Project as per the requirements
-listed here:
-  https://www.yoctoproject.org/webform/yocto-project-compatible-registration
-Dependencies
-============
-This layer depends on:
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-Patches
-=======
-Please submit any patches against this BSP to the meta-intel mailing list
-(meta-intel@yoctoproject.org) and cc: the maintainer:
-Maintainer: Darren Hart <dvhart@linux.intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-Table of Contents
-=================
-  I. Building the meta-fri2 BSP layer
- II. Booting the images in /binary
-III. Device Notes
-     a. BIOS and Firmware
-     b. Serial Port
-     c. HDMI
-     d. Power Reset
-     e. Accelerometer
-     f. GPIO
-     g. MMC
-     h. 802.11
-     i. 802.15.4
-     j. Audio
-     k. Optional Devices
- IV. Known Issues
-     a. EFI boot fails
-     b. Client USB is disabled
-     c. Audio over secondary HDMI port only
-  V. Additional Resources
-I. Building the meta-fri2 BSP layer
-===================================
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build an fri2 image
-by adding the location of the meta-intel and meta-fri2 layers to
-bblayers.conf, e.g.:
-  yocto/meta-intel \
-  yocto/meta-intel/meta-fri2 \
-The meta-fri2 layer contains support for fri2-noemgd machine configuration.
-The previously supported fri2 machine with the proprietary EMGD graphics
-driver has been retired. The 'fri2-noemgd' machine configuration uses
-the open source 'vesa' kernel driver.
-To enable the layer add the following to the local.conf file:
-  MACHINE ?= "fri2-noemgd"
-You should then be able to build an fri2 image as such:
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-At the end of a successful build, you should have a live image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the images from /binary').
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting a
-BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-II. Booting the images in /binary
-=================================
-This BSP contains bootable live images, which can be used to directly
-boot Yocto off of a USB flash drive.
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the live image to it.  For
-example:
-# dd if=core-image-sato-fri2-noemgd.hddimg of=/dev/sdf
-# sync
-# eject /dev/sdf
-This should give you a bootable USB flash device.  Insert the device
-into one of the USB host ports on the target, and power on.  This
-should result in a system booted to the Sato graphical desktop.
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
-If instead of a live image, you would like to prepare an EFI bootable
-partitioned image, use the mkefidisk.sh script provided in the scripts
-directory of this BSP. Future versions of the images have an EFI
-installer integrated into the live image.
----
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-# dd if=/dev/zero of=/dev/sdf bs=1M count=512
-III. Device Notes
-================================
-a. BIOS and Firmware
-Units provided from the Yocto Project Fish River Island 2 Giveaway
-Program are preconfigured with the Intel provided Fast Boot EFI
-firmware. This firmware will search the available devices (USB, SD,
-and mSATA) for a valid EFI payload at "EFI\BOOT\BOOTIA32.EFI". If it
-fails to find one, it will launch the EFI shell and optionally execute
-a "startup.nsh" script if it finds the script on the available storage
-devices. It searches the devices in the following order: USB, SD,
-mSATA.
-Units acquired via other channels may have the Kontron supplied APTIO
-(AMI) BIOS. This is a PCBIOS and EFI firmware with a traditional BIOS
-configuration menu which can be used to define a variety of boot
-configurations.
-b. Serial Port
--------------
-The FRI2 has an optional serial daughter card providing a serial
-console via the micro-USB port on the top of the device adjacent the
-SIM card slot.
-The UART from the EG20T is connected to a TI UART-to-USB device
-(TUSB3410) which appears as a serial port on the host computer. From a
-Linux host, load the driver with the following options:
-# modprobe ti_usb_3410_5052 vendor_3410=0x0451 product_3410=0x5053
-In future versions of the Linux kernel (3.4 and later), the
-vendor and product codes are detected automatically.
-When you power on your FRI2, your host will discover a serial device
-and name it /dev/ttyUSB0 (or similar). You can communicate with this
-device at 115200 8N1 using your preferred terminal emulator.
-If using the Intel provided Fast Boot EFI firmware, no additional
-configuration is required. If using the APTIO (AMI) BIOS, use the
-following settings to configure console redirection in the BIOS menu:
-  Advanced
-    Serial Port Console Redirection
-      COM2
-      Console Redirection [Enabled]
-      Console Redirection Settings
-        Terminal Type         [ANSI]
-        Bits per second       [115200]
-        Data Bits             [8]
-        Parity                [None]
-        Stop Bits             [1]
-        Flow Control          [None]
-        Recorder Mode         [Disabled]
-        Resolution 100x31     [Disabled]
-        Legacy OS Redirection [80x24]
-c. HDMI
-------
-The FRI2 has two micro HDMI ports. For the Intel provided Fast Boot
-EFI firmware, the one closest to the bottom of the device is the
-primary display. For the APTIO (AMI) BIOS, the jack nearest the 1/8"
-audio jacks is the primary display.
-d. Power Reset
--------------
-The recessed button adjacent the LEDs on the top of the device is a
-power reset button.
-e. Accelerometer
----------------
-The LIS331DLH accelerometer is connected to the I2C bus on the CPLD on
-the compute module. The driver for this chip is under active
-development and will be included in the BSP once completed.
-f. GPIO
-------
-The FRI2 has two I2C PCA555x GPIO devices used for internal control
-signals. These have not been exposed in the current release of the
-BSP, but may be in the future. Regardless, these would not provide
-general purpose IO with which to read or drive additional signals.
-g. MMC
------
-The FRI2 provides two microSD card MMC devices. One is located
-adjacent the 1/8" audio jacks, another is located on the board inside
-the chassis. These devices can be used to boot the device, or as
-secondary storage.
-h. 802.11
---------
-The Intel Corporation Centrino Advanced-N 6205 that ships with the
-FRI2 is supported. You can use connman-gnome to configures the
-interface.
-i. 802.15.4
-----------
-The TI CC2531 802.15.4 radio is a USB ACM modem. The MAC is enabled by
-issuing the following command:
-# echo J > /dev/ttyACM0
-The bank of 3 LEDs nearest the power reset button will change if this
-command is executed successfully. If you have a 3G modem installed,
-the 802.15.4 device may appear as /dev/ttyACM3 instead.
-No further testing or integration has been done.
-j. Audio
--------------------
-The FRI2 has an 1/8" analog output (nearest the antennae), a line-in
-input below that, as well as SPDIF over HDMI. These can be tested
-using the alsa-utils package. The aplay -l command will list both
-playback devices:
-# aplay -l
-**** List of PLAYBACK Hardware Devices ****
-card 0: MID [HDA Intel MID], device 0: ALC262 Analog [ALC262 Analog]
-  Subdevices: 1/1
-  Subdevice #0: subdevice #0
-card 0: MID [HDA Intel MID], device 3: ALC262 Digital [ALC262 Digital]
-  Subdevices: 1/1
-  Subdevice #0: subdevice #0
-Using a sample WAV file, you can use aplay to play to either device:
-Over analog:
-# aplay -D plughw:0,0 sample.wav
-Over HDMI:
-# aplay -D plughw:0,3 sample.wav
-k. Optional Devices
-------------------
-The FRI2 has two mini-PCIe slots internally. The device ships with a
-half-length wireless card installed. This can be replaced with a
-wireless + bluetooth card. The other slot is available for use with
-cellular cards or mSATA SSDs.
-The Ericsson F5521gw 3G modem has been verifed with the FRI2 images.
-Note that the connman-gnome UI does not allow for configuring the
-cellular interface. The ofono-tests package can be used to configure
-the modem and bring up an interface.
-IV. Known Issues
----------------
-a. EFI
------
-The APTIO (AMI) BIOS does not yet boot the EFI payload provided on the
-FRI2 live image. This is a known issue under investigation. If using
-this firmware, boot using PCBIOS mode, rather than EFI.  The Intel
-provided Fast Boot EFI firmware will boot the EFI payload.
-b. Client USB is disabled
-------------------------
-The micro-USB port adjacent the primary HDMI port is intended for Client
-USB functionality, but is not supported on current revisions of the
-device.
-c. Audio over secondary HDMI port only
--------------------------------------
-While audio over HDMI has been shown to work, it seems to only work over
-the secondary (bottom-most) HDMI port. There does not appear to be a
-deterministic way of getting the device to output the signal (video and
-audio) over the secondary port.
-V. Additional Resources
-----------------------
-In addition to this README, please see the following wiki page for tips
-on using the FRI2 with the Yocto Project:
-https://wiki.yoctoproject.org/wiki/BSPs/FRI2
diff --git a/meta-fri2/README.sources b/meta-fri2/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-fri2/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-http://downloads.yoctoproject.org/mirror/sources/
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
diff --git a/meta-fri2/binary/.gitignore b/meta-fri2/binary/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/meta-fri2/binary/.gitignore
+++ /dev/null
diff --git a/meta-fri2/conf/layer.conf b/meta-fri2/conf/layer.conf
deleted file mode 100644
index 0bb29a13..00000000
--- a/meta-fri2/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 += "fri2"
-BBFILE_PATTERN_fri2 := "^${LAYERDIR}/"
-BBFILE_PRIORITY_fri2 = "6"
-LAYERDEPENDS_fri2 = "intel"
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
deleted file mode 100644
index bdf4b0dd..00000000
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#@TYPE: Machine
-#@NAME: fri2
-#@WEBTITLE: Intel Atom E640T Processor with Intel EG20T Controller Hub Development Kit (Queens Bay) with Open Source VESA Graphics for Fish River Island II systems
-#@DESCRIPTION: Machine configuration for Fish River Island II systems, without Intel-proprietary graphics bits
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/intel-common-pkgarch.inc
-require conf/machine/include/meta-intel.inc
-MACHINE_FEATURES += "wifi 3g pcbios efi"
-MACHINE_FEATURES += "intel-ucode"
-MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.19%"
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_FBDEV} \
-           "
-# Syslinux does not know about the 64MHz uart clock and it does not detect the
-# serial device by number. Use the IO port directly and divide the baud down to
-# trick syslinux into configuring a 115200 baud.
-SYSLINUX_OPTS = "serial 0xb060 3318"
-SERIAL_CONSOLE = "115200 ttyPCH1"
-APPEND += "console=ttyPCH1,115200 console=tty0"
-# EFI boot will ignore this and use the EFI framebuffer at 800x600
-APPEND += "video=vesafb vga=0x318"
-# MSI interrupts fail for the HDA device when using the EFI firmware
-APPEND += "snd_hda_intel.enable_msi=0"
diff --git a/meta-fri2/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-fri2/recipes-bsp/alsa-state/alsa-state.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-fri2/recipes-bsp/alsa-state/alsa-state.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-fri2/recipes-bsp/alsa-state/alsa-state/fri2-noemgd/asound.state b/meta-fri2/recipes-bsp/alsa-state/alsa-state/fri2-noemgd/asound.state
deleted file mode 100644
index 8a89f0bc..00000000
--- a/meta-fri2/recipes-bsp/alsa-state/alsa-state/fri2-noemgd/asound.state
+++ /dev/null
@@ -1,411 +0,0 @@
-state.MID {
-        control.1 {
-                iface MIXER
-                name 'PCM Playback Volume'
-                value.0 24
-                value.1 24
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 30'
-                        dbmin -4500
-                        dbmax 0
-                        dbvalue.0 -900
-                        dbvalue.1 -900
-                }
-        }
-        control.2 {
-                iface MIXER
-                name 'PCM Playback Switch'
-                value.0 true
-                value.1 true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.3 {
-                iface MIXER
-                name 'Headphone Playback Volume'
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 30'
-                        dbmin -4500
-                        dbmax 0
-                        dbvalue.0 -4500
-                        dbvalue.1 -4500
-                }
-        }
-        control.4 {
-                iface MIXER
-                name 'Headphone Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.5 {
-                iface MIXER
-                name 'Rear Mic Playback Volume'
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -3450
-                        dbmax 1200
-                        dbvalue.0 -3450
-                        dbvalue.1 -3450
-                }
-        }
-        control.6 {
-                iface MIXER
-                name 'Rear Mic Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.7 {
-                iface MIXER
-                name 'Front Mic Playback Volume'
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -3450
-                        dbmax 1200
-                        dbvalue.0 -3450
-                        dbvalue.1 -3450
-                }
-        }
-        control.8 {
-                iface MIXER
-                name 'Front Mic Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.9 {
-                iface MIXER
-                name 'Line Playback Volume'
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -3450
-                        dbmax 1200
-                        dbvalue.0 -3450
-                        dbvalue.1 -3450
-                }
-        }
-        control.10 {
-                iface MIXER
-                name 'Line Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.11 {
-                iface MIXER
-                name 'CD Playback Volume'
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -3450
-                        dbmax 1200
-                        dbvalue.0 -3450
-                        dbvalue.1 -3450
-                }
-        }
-        control.12 {
-                iface MIXER
-                name 'CD Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.13 {
-                iface MIXER
-                name 'Auto-Mute Mode'
-                value Disabled
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 Disabled
-                        item.1 Enabled
-                }
-        }
-        control.14 {
-                iface MIXER
-                name 'Rear Mic Boost Volume'
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 3'
-                        dbmin 0
-                        dbmax 3000
-                        dbvalue.0 0
-                        dbvalue.1 0
-                }
-        }
-        control.15 {
-                iface MIXER
-                name 'Front Mic Boost Volume'
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 3'
-                        dbmin 0
-                        dbmax 3000
-                        dbvalue.0 0
-                        dbvalue.1 0
-                }
-        }
-        control.16 {
-                iface MIXER
-                name 'Capture Switch'
-                value.0 true
-                value.1 true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.17 {
-                iface MIXER
-                name 'Capture Switch'
-                index 1
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.18 {
-                iface MIXER
-                name 'Capture Switch'
-                index 2
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.19 {
-                iface MIXER
-                name 'Capture Volume'
-                value.0 25
-                value.1 25
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -1200
-                        dbmax 3450
-                        dbvalue.0 2550
-                        dbvalue.1 2550
-                }
-        }
-        control.20 {
-                iface MIXER
-                name 'Capture Volume'
-                index 1
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -1200
-                        dbmax 3450
-                        dbvalue.0 -1200
-                        dbvalue.1 -1200
-                }
-        }
-        control.21 {
-                iface MIXER
-                name 'Capture Volume'
-                index 2
-                value.0 0
-                value.1 0
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -1200
-                        dbmax 3450
-                        dbvalue.0 -1200
-                        dbvalue.1 -1200
-                }
-        }
-        control.22 {
-                iface MIXER
-                name 'Input Source'
-                value Line
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 'Rear Mic'
-                        item.1 'Front Mic'
-                        item.2 Line
-                        item.3 CD
-                }
-        }
-        control.23 {
-                iface MIXER
-                name 'Input Source'
-                index 1
-                value 'Rear Mic'
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 'Rear Mic'
-                        item.1 'Front Mic'
-                        item.2 Line
-                        item.3 CD
-                }
-        }
-        control.24 {
-                iface MIXER
-                name 'Input Source'
-                index 2
-                value 'Rear Mic'
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 'Rear Mic'
-                        item.1 'Front Mic'
-                        item.2 Line
-                        item.3 CD
-                }
-        }
-        control.25 {
-                iface MIXER
-                name 'IEC958 Playback Con Mask'
-                value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-                comment {
-                        access read
-                        type IEC958
-                        count 1
-                }
-        }
-        control.26 {
-                iface MIXER
-                name 'IEC958 Playback Pro Mask'
-                value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-                comment {
-                        access read
-                        type IEC958
-                        count 1
-                }
-        }
-        control.27 {
-                iface MIXER
-                name 'IEC958 Playback Default'
-                value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-                comment {
-                        access 'read write'
-                        type IEC958
-                        count 1
-                }
-        }
-        control.28 {
-                iface MIXER
-                name 'IEC958 Playback Switch'
-                value true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.29 {
-                iface MIXER
-                name 'IEC958 Default PCM Playback Switch'
-                value true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.30 {
-                iface MIXER
-                name 'Master Playback Volume'
-                value 24
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 1
-                        range '0 - 30'
-                        dbmin -4500
-                        dbmax 0
-                        dbvalue.0 -900
-                }
-        }
-        control.31 {
-                iface MIXER
-                name 'Master Playback Switch'
-                value true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-}
diff --git a/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig b/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-fri2/recipes-bsp/formfactor/formfactor/fri2-noemgd/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-fri2/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend b/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend
deleted file mode 100644
index f6105711..00000000
--- a/meta-fri2/recipes-bsp/grub/grub-efi_2.00.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-# The Intel provided Fast Boot Firmware may not initialize the USB keyboard
-# before launching the grub.efi payload. Ensure GRUB has keyboard control by
-# building in the usb, usb_keyboard, and ohci modules.
-do_deploy() {
-        # Search for the grub.cfg on the local boot media by using the
-        # built in cfg file provided via this recipe
-        grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \
-                       -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
-                       boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search \
-                       usb usb_keyboard ohci
-        install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR}
-}
diff --git a/meta-fri2/recipes-core/init-ifupdown/files/fri2-noemgd/interfaces b/meta-fri2/recipes-core/init-ifupdown/files/fri2-noemgd/interfaces
deleted file mode 100644
index f5bb9468..00000000
--- a/meta-fri2/recipes-core/init-ifupdown/files/fri2-noemgd/interfaces
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
-# The loopback interface
-auto lo
-iface lo inet loopback
-# Wired or wireless interfaces
-auto eth0
-iface eth0 inet dhcp
diff --git a/meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
deleted file mode 100644
index 81fe7b79..00000000
--- a/meta-fri2/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/meta-fri2/recipes-kernel/kmod/kmod_git.bbappend b/meta-fri2/recipes-kernel/kmod/kmod_git.bbappend
deleted file mode 100644
index 56d8fcb0..00000000
--- a/meta-fri2/recipes-kernel/kmod/kmod_git.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-do_install_append () {
-        echo "blacklist gma500_gfx" > ${D}${sysconfdir}/modprobe.d/prohibit_gma500_gfx.conf
-}
diff --git a/meta-jasperforest/COPYING.MIT b/meta-jasperforest/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-jasperforest/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
diff --git a/meta-jasperforest/README b/meta-jasperforest/README
deleted file mode 100644
index d82b2af0..00000000
--- a/meta-jasperforest/README
+++ /dev/null
@@ -1,137 +0,0 @@
-This README file contains information on building the
-meta-jasperforest BSP layer, and booting the images contained in the
-/binary directory.  Please see the corresponding sections below for
-details.
-'Jasper Forest' refers to the Intel Xeon C5500/C3500 processors, which
-combined with the Intel 3420 PCH chipset (Ibex Peak) make up the
-'Picket Post' CRB this BSP was developed on.
-Further information on the platforms supported by this BSP can be
-found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware/xeon-c5500-c3500-3420/overview
-Information on all Intel®  embedded platforms can be found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware
-Yocto Project Compatible
-========================
-This BSP is compatible with the Yocto Project as per the requirements
-listed here:
-  https://www.yoctoproject.org/webform/yocto-project-compatible-registration
-Dependencies
-============
-This layer depends on:
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-Patches
-=======
-Please submit any patches against this BSP to the meta-intel mailing list
-(meta-intel@yoctoproject.org) and cc: the maintainer:
-Maintainer: Saul Wold <sgw@linux.intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-Table of Contents
-=================
-  I. Building the meta-jasperforest BSP layer
- II. Booting the images in /binary
-I. Building the meta-jasperforest BSP layer
-=======================================
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a
-jasperforest image by adding the location of the meta-jasperforest
-layer to bblayers.conf, along with the meta-intel layer itself (to
-access common metadata shared between BSPs) e.g.:
-  yocto/meta-intel \
-  yocto/meta-intel/meta-jasperforest \
-To enable the jasperforest layer, add the jasperforest MACHINE to local.conf:
-  MACHINE ?= "jasperforest"
-You should then be able to build a jasperforest image as such:
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-At the end of a successful build, you should have a live image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the images from /binary').
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting a
-BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-II. Booting the images in /binary
-=================================
-This BSP contains bootable live images, which can be used to directly
-boot Yocto off of a USB flash drive.
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the live image to it.  For
-example:
-# dd if=core-image-sato-jasperforest.hddimg of=/dev/sdf
-# sync
-# eject /dev/sdf
-This should give you a bootable USB flash device.  Insert the device
-into a bootable USB socket on the target, and power on.  This should
-result in a system booted to the Sato graphical desktop.
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
----
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-# dd if=/dev/zero of=/dev/sdf bs=1M count=512
diff --git a/meta-jasperforest/README.sources b/meta-jasperforest/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-jasperforest/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-http://downloads.yoctoproject.org/mirror/sources/
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
diff --git a/meta-jasperforest/binary/.gitignore b/meta-jasperforest/binary/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/meta-jasperforest/binary/.gitignore
+++ /dev/null
diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
deleted file mode 100644
index 6d096e7e..00000000
--- a/meta-jasperforest/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 += "jasperforest"
-BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
-BBFILE_PRIORITY_jasperforest = "6"
-LAYERDEPENDS_jasperforest = "intel"
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
deleted file mode 100644
index e0948eb0..00000000
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-#@TYPE: Machine
-#@NAME: jasperforest
-#@WEBTITLE: Intel Xeon C5500/C3500 Series Processors With Intel 3420 PCH Chipset (Jasper Forest)
-#@DESCRIPTION: Machine configuration for Jasper Forest Picket Post
-# systems i.e. Xeon C5500/C3500 (Nehalem) + Intel 3420 chipset (Ibex Peak)
-PREFERRED_VERSION_linux-yocto ?= "3.19%"
-require conf/machine/include/meta-intel.inc
-require conf/machine/include/intel-corei7-64-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"
diff --git a/meta-jasperforest/recipes-bsp/formfactor/formfactor/jasperforest/machconfig b/meta-jasperforest/recipes-bsp/formfactor/formfactor/jasperforest/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-jasperforest/recipes-bsp/formfactor/formfactor/jasperforest/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-jasperforest/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-nuc/COPYING.MIT b/meta-nuc/COPYING.MIT
deleted file mode 100644
index 89de3547..00000000
--- a/meta-nuc/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/meta-nuc/README b/meta-nuc/README
deleted file mode 100644
index 7753755e..00000000
--- a/meta-nuc/README
+++ /dev/null
@@ -1,156 +0,0 @@
-This README file contains information on building the meta-nuc
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-This BSP is made specifically for "Next Unit of Computing Kit DC3217IYE"
-with Intel Centrino Advanced-N 6235 Wireless mini PCI Express card.
-Further information on this NUC platform can be found here:
-  http://www.intel.com/content/www/us/en/motherboards/desktop-motherboards/desktop-boards-d33217gke-dc3217iye.html
-Information on all Intel® embedded platforms can be found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware
-Yocto Project Compatible
-========================
-This BSP is compatible with the Yocto Project as per the requirements
-listed here:
-  https://www.yoctoproject.org/webform/yocto-project-compatible-registration
-Dependencies
-============
-This layer depends on:
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-Patches
-=======
-Please submit any patches against this BSP to the meta-intel mailing list
-(meta-intel@yoctoproject.org) and cc: the maintainer:
-Maintainer: Saul Wold <sgw@linux.intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-Table of Contents
-=================
-  I. Building the meta-nuc BSP layer
- II. Booting the images in /binary
-I. Building the meta-nuc BSP layer
-=========================================
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a nuc
-image by adding the location of the meta-nuc layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-  yocto/meta-intel \
-  yocto/meta-intel/meta-nuc \
-To enable the nuc layer, add the nuc MACHINE to local.conf:
-  MACHINE ?= "nuc"
-You should then be able to build a nuc image as such:
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-At the end of a successful build, you should have a live image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the images from /binary').
-NOTE: The 'nuc' machine will include support for hardware video
-acceleration via gstreamer if and only if the "commercial" string is
-added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
-For example:
-  LICENSE_FLAGS_WHITELIST = "commercial"
-The reason this is needed is to prevent the image from including
-anything that might violate the license terms of the packages used to
-implement the the video acceleration feature, such as gst-ffmpeg and
-ffmpeg.  As always, please consult the licenses included in the
-specific packages for details if you use packages that require
-particular LICENSE_FLAGS.
-The xf86-video-intel recipe depends on Xorg's dri and glx modules,
-which are built only when 'opengl' is listed in DISTRO_FEATURES. So
-if the distro doesn't list 'opengl' in the DISTRO_FEATURES, then you
-would need this additional line in your local.conf:
-  DISTRO_FEATURES_append = " opengl"
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting a
-BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-II. Booting the images in /binary
-=================================
-This BSP contains bootable live images, which can be used to directly
-boot Yocto off of a USB flash drive.
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the live image to it.  For
-example:
-# dd if=core-image-sato-nuc.hddimg of=/dev/sdf
-# sync
-# eject /dev/sdf
-This should give you a bootable USB flash device.  Insert the device
-into a bootable USB socket on the target, and power on.  This should
-result in a system booted to the Sato graphical desktop.
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
----
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-# dd if=/dev/zero of=/dev/sdf bs=1M count=512
diff --git a/meta-nuc/README.sources b/meta-nuc/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-nuc/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-http://downloads.yoctoproject.org/mirror/sources/
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
diff --git a/meta-nuc/conf/layer.conf b/meta-nuc/conf/layer.conf
deleted file mode 100644
index 174411ff..00000000
--- a/meta-nuc/conf/layer.conf
+++ /dev/null
@@ -1,10 +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 += "nuc"
-BBFILE_PATTERN_nuc := "^${LAYERDIR}/"
-BBFILE_PRIORITY_nuc = "6"
diff --git a/meta-nuc/conf/machine/nuc.conf b/meta-nuc/conf/machine/nuc.conf
deleted file mode 100644
index bdc4bca1..00000000
--- a/meta-nuc/conf/machine/nuc.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-#@TYPE: Machine
-#@NAME: chiefriver
-#@WEBTITLE: Intel Next Unit of Computing (NUC) Model: DC3217IYE
-#@DESCRIPTION: Machine configuration for Intel NUC model DC3217IYE
-# i.e. Ivy Bridge + Panther Point
-PREFERRED_VERSION_linux-yocto ?= "3.19%"
-MACHINE_FEATURES += "va-impl-intel wifi efi"
-MACHINE_FEATURES += "intel-ucode"
-require conf/machine/include/meta-intel.inc
-require conf/machine/include/intel-corei7-64-common.inc
-require conf/machine/include/intel-common-pkgarch.inc
-MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_I965} \
-           "
-MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2b-6 lms8"
-# disable the serial port configuration
-SERIAL_CONSOLE = ""
diff --git a/meta-nuc/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-nuc/recipes-bsp/alsa-state/alsa-state.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-nuc/recipes-bsp/alsa-state/alsa-state.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-nuc/recipes-bsp/alsa-state/alsa-state/nuc/asound.conf b/meta-nuc/recipes-bsp/alsa-state/alsa-state/nuc/asound.conf
deleted file mode 100644
index 1defe77d..00000000
--- a/meta-nuc/recipes-bsp/alsa-state/alsa-state/nuc/asound.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-pcm.!default {
-    type plug
-    slave.pcm "dmixer"
-}
-pcm.dmixer {
-    type dmix
-    ipc_key 1024
-    ipc_key_add_uid 0
-    ipc_perm 0666
-    slave {
-        pcm "hw:0,3"    # HDMI CARD AND DEVICE
-        period_time 0
-        period_size 1024
-        buffer_size 8192
-        rate 48000 #or 44100
-    }
-}
-ctl.dmixer {
-    type hw
-    card 0
-}
diff --git a/meta-nuc/recipes-bsp/formfactor/formfactor/nuc/machconfig b/meta-nuc/recipes-bsp/formfactor/formfactor/nuc/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-nuc/recipes-bsp/formfactor/formfactor/nuc/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-nuc/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-nuc/recipes-core/initscripts/initscripts/hdmi_port_audio.sh b/meta-nuc/recipes-core/initscripts/initscripts/hdmi_port_audio.sh
deleted file mode 100644
index 69d8a53f..00000000
--- a/meta-nuc/recipes-core/initscripts/initscripts/hdmi_port_audio.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:
-# Required-Start:
-# Required-Stop:
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Configure ALSA audio output to the connected HDMI port
-### END INIT INFO
-#
-# If both HDMI ports are connected then use HDMI0 for default ALSA audio out..
-ALSA_CONF_FILE="/etc/asound.conf"
-HDMI0_STATUS_FILE="/sys/class/drm/card0-HDMI-A-1/status"
-HDMI1_STATUS_FILE="/sys/class/drm/card0-HDMI-A-2/status"
-HDMI0_ALSA_CONF="hw:0,3"
-HDMI1_ALSA_CONF="hw:0,7"
-if [ -f "${HDMI0_STATUS_FILE}" ] && [ "`cat ${HDMI0_STATUS_FILE}`" == "connected" ]
-then
-        sed -i "s/pcm *\"hw:[0-9]*,[0-9]*\"/pcm \"${HDMI0_ALSA_CONF}\"/" ${ALSA_CONF_FILE}
-elif [ -f "${HDMI1_STATUS_FILE}" ] && [ "`cat ${HDMI1_STATUS_FILE}`" == "connected" ]
-then
-        sed -i "s/pcm \"hw:[0-9]*,[0-9]*\"/pcm \"${HDMI1_ALSA_CONF}\"/" ${ALSA_CONF_FILE}
-fi
diff --git a/meta-nuc/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-nuc/recipes-core/initscripts/initscripts_1.0.bbappend
deleted file mode 100644
index abc5fe01..00000000
--- a/meta-nuc/recipes-core/initscripts/initscripts_1.0.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://hdmi_port_audio.sh"
-PR .= ".1"
-do_install_append() {
-        install -m 0755    ${WORKDIR}/hdmi_port_audio.sh       ${D}${sysconfdir}/init.d
-        ln -sf          ../init.d/hdmi_port_audio.sh   ${D}${sysconfdir}/rcS.d/S66hdmi_port_audio.sh
-}
diff --git a/meta-sugarbay/COPYING.MIT b/meta-sugarbay/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-sugarbay/COPYING.MIT
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
diff --git a/meta-sugarbay/README b/meta-sugarbay/README
deleted file mode 100644
index 52835196..00000000
--- a/meta-sugarbay/README
+++ /dev/null
@@ -1,158 +0,0 @@
-This README file contains information on building the meta-sugarbay
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-The 'Sugar Bay' platform consists of the Intel Sandy Bridge processor,
-plus the Cougar Point PCH (Q67 Express or B65 Express chipsets).  This
-BSP assumes that the Sandy Bridge integrated graphics are being used.
-Further information on the platforms supported by this BSP can be
-found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware/core-q67-b65/overview
-And information on all Intel® embedded platforms can be found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware
-Yocto Project Compatible
-========================
-This BSP is compatible with the Yocto Project as per the requirements
-listed here:
-  https://www.yoctoproject.org/webform/yocto-project-compatible-registration
-Dependencies
-============
-This layer depends on:
-  URI: git://git.openembedded.org/bitbake
-  branch: master
-  URI: git://git.openembedded.org/openembedded-core
-  layers: meta
-  branch: master
-  URI: git://git.yoctoproject.org/meta-intel
-  layers: intel
-  branch: master
-Patches
-=======
-Please submit any patches against this BSP to the meta-intel mailing list
-(meta-intel@yoctoproject.org) and cc: the maintainer:
-Maintainer: Saul Wold <sgw@linux.intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-Table of Contents
-=================
-  I. Building the meta-sugarbay BSP layer
- II. Booting the images in /binary
-I. Building the meta-sugarbay BSP layer
-=======================================
-In order to build an image with BSP support for a given release, you
-need to download the corresponding BSP tarball from the 'Board Support
-Package (BSP) Downloads' page of the Yocto Project website.
-Having done that, and assuming you extracted the BSP tarball contents
-at the top-level of your yocto build tree, you can build a sugarbay
-image by adding the location of the meta-sugarbay layer to
-bblayers.conf, along with the meta-intel layer itself (to access
-common metadata shared between BSPs) e.g.:
-  yocto/meta-intel \
-  yocto/meta-intel/meta-sugarbay \
-To enable the sugarbay layer, add the sugarbay MACHINE to local.conf:
-  MACHINE ?= "sugarbay"
-You should then be able to build a sugarbay image as such:
-  $ source oe-init-build-env
-  $ bitbake core-image-sato
-At the end of a successful build, you should have a live image that
-you can boot from a USB flash drive (see instructions on how to do
-that below, in the section 'Booting the images from /binary').
-NOTE: The 'sugarbay' machine will include support for hardware video
-acceleration via gstreamer if and only if the "commercial" string is
-added to the the LICENSE_FLAGS_WHITELIST variable in your local.conf.
-For example:
-  LICENSE_FLAGS_WHITELIST = "commercial"
-The reason this is needed is to prevent the image from including
-anything that might violate the license terms of the packages used to
-implement the the video acceleration feature, such as gst-ffmpeg and
-ffmpeg.  As always, please consult the licenses included in the
-specific packages for details if you use packages that require
-particular LICENSE_FLAGS.
-The xf86-video-intel recipe depends on Xorg's dri and glx modules,
-which are built only when 'opengl' is listed in DISTRO_FEATURES. So
-if the distro doesn't list 'opengl' in the DISTRO_FEATURES, then you
-would need this additional line in your local.conf:
-  DISTRO_FEATURES_append = " opengl"
-As an alternative to downloading the BSP tarball, you can also work
-directly from the meta-intel git repository.  For each BSP in the
-'meta-intel' repository, there are multiple branches, one
-corresponding to each major release starting with 'laverne' (0.90), in
-addition to the latest code which tracks the current master (note that
-not all BSPs are present in every release).  Instead of extracting a
-BSP tarball at the top level of your yocto build tree, you can
-equivalently check out the appropriate branch from the meta-intel
-repository at the same location.
-II. Booting the images in /binary
-=================================
-This BSP contains bootable live images, which can be used to directly
-boot Yocto off of a USB flash drive.
-Under Linux, insert a USB flash drive.  Assuming the USB flash drive
-takes device /dev/sdf, use dd to copy the live image to it.  For
-example:
-# dd if=core-image-sato-sugarbay.hddimg of=/dev/sdf
-# sync
-# eject /dev/sdf
-This should give you a bootable USB flash device.  Insert the device
-into a bootable USB socket on the target, and power on.  This should
-result in a system booted to the Sato graphical desktop.
-If you want a terminal, use the arrows at the top of the UI to move to
-different pages of available applications, one of which is named
-'Terminal'.  Clicking that should give you a root terminal.
-If you want to ssh into the system, you can use the root terminal to
-ifconfig the IP address and use that to ssh in.  The root password is
-empty, so to log in type 'root' for the user name and hit 'Enter' at
-the Password prompt: and you should be in.
----
-If you find you're getting corrupt images on the USB (it doesn't show
-the syslinux boot: prompt, or the boot: prompt contains strange
-characters), try doing this first:
-# dd if=/dev/zero of=/dev/sdf bs=1M count=512
diff --git a/meta-sugarbay/README.sources b/meta-sugarbay/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-sugarbay/README.sources
+++ /dev/null
@@ -1,17 +0,0 @@
-The sources for the packages comprising the images shipped with this
-BSP can be found at the following location:
-http://downloads.yoctoproject.org/mirror/sources/
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can be found at the
-following location:
-http://downloads.yoctoproject.org/releases/yocto/yocto-1.3/poky-danny-8.0.tar.bz2
-The metadata used to generate the images shipped with this BSP, in
-addition to the code contained in this BSP, can also be found at the
-following locations:
-git://git.yoctoproject.org/poky.git
-git://git.yoctoproject.org/meta-intel
diff --git a/meta-sugarbay/binary/.gitignore b/meta-sugarbay/binary/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/meta-sugarbay/binary/.gitignore
+++ /dev/null
diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
deleted file mode 100644
index 9576330b..00000000
--- a/meta-sugarbay/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 += "sugarbay"
-BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
-BBFILE_PRIORITY_sugarbay = "6"
-LAYERDEPENDS_sugarbay = "intel"
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
deleted file mode 100644
index a3357370..00000000
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-#@TYPE: Machine
-#@NAME: sugarbay
-#@WEBTITLE: Intel 2nd Generation Core Platforms: Core i3, i5, i7 (Sandy Bridge)
-#@DESCRIPTION: Machine configuration for Sugar Bay systems
-# i.e. Sandy Bridge + Cougar Point
-MACHINE_FEATURES += "va-impl-intel"
-PREFERRED_VERSION_linux-yocto ?= "3.19%"
-require conf/machine/include/meta-intel.inc
-require conf/machine/include/intel-corei7-64-common.inc
-require conf/machine/include/intel-common-pkgarch.inc
-MACHINE_HWCODECS ?= "va-intel gstreamer-vaapi-1.0"
-MACHINE_EXTRA_RRECOMMENDS += "linux-firmware"
-MACHINE_FEATURES += "wifi"
-MACHINE_FEATURES += "intel-ucode"
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_I965} \
-           "
diff --git a/meta-sugarbay/recipes-bsp/formfactor/formfactor/sugarbay/machconfig b/meta-sugarbay/recipes-bsp/formfactor/formfactor/sugarbay/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-sugarbay/recipes-bsp/formfactor/formfactor/sugarbay/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
diff --git a/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-sugarbay/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
author	Saul Wold <sgw@linux.intel.com>	2015-08-25 16:39:01 -0700
committer	Saul Wold <sgw@linux.intel.com>	2015-08-28 14:25:29 -0700
commit	4172351baa285b83eb54d54368fe2f037c48159b (patch)
tree	c2c1991e05b0260615b83abf59acee81a534ec10
parent	44df7ddf395f82c28c494b92fb3f627f81e2e627 (diff)
download	meta-intel-4172351baa285b83eb54d54368fe2f037c48159b.tar.gz