42 files changed, 4 insertions, 1563 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0c868f22..b7cd2a3d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -27,10 +27,6 @@ Please keep this list in alphabetical order.
 Maintainers List (try to look for most precise areas first)
                -----------------------------------
-CHIEFRIVER
-M:      Nitin A Kamble<nitin.a.kamble@intel.com>
-F:      meta-chiefriver/
 COMMON
 M:      Nitin A Kamble<nitin.a.kamble@intel.com>
 F:      common/
@@ -55,10 +51,6 @@ JASPERFOREST
 M:      Nitin A Kamble<nitin.a.kamble@intel.com>
 F:      meta-jasperforest/
-N450
-M:      Darren Hart <dvhart@linux.intel.com>
-F:      meta-n450/
 ROMLEY
 M:      Haw Foo Chien <foo.chien.haw@intel.com>
 F:      meta-romley/
@@ -67,10 +59,6 @@ SUGARBAY
 M:      Nitin A Kamble <nitin.a.kamble@intel.com>
 F:      meta-sugarbay/
-SYS940X
-M:      Darren Hart <dvhart@linux.intel.com>
-F:      meta-sys940x/
 TLK
 M:      Saul Wold <saul.wold@intel.com>
 F:      meta-tlk/
diff --git a/conf/layer.conf b/conf/layer.conf
index 31132ab0..cd1f2430 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -11,3 +11,7 @@ BBFILE_PRIORITY_intel = "5"
 # Additional license directories.
 LICENSE_PATH += "${LAYERDIR}/common/custom-licenses"
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_intel = "1"
diff --git a/meta-chiefriver/COPYING.MIT b/meta-chiefriver/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-chiefriver/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-chiefriver/README b/meta-chiefriver/README
deleted file mode 100644
index f846be6b..00000000
--- a/meta-chiefriver/README
+++ /dev/null
@@ -1,158 +0,0 @@
-This README file contains information on building the meta-chiefriver
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-The 'Chief River' platform consists of the Intel Ivy Bridge processor,
-plus the Panther Point PCH.  This BSP assumes that the Ivy 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-hm76/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 Yocto mailing list
-(yocto@yoctoproject.org) and cc: the maintainer:
-Maintainer: Nitin A Kamble <nitin.a.kamble@intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-Table of Contents
-=================
-  I. Building the meta-chiefriver BSP layer
- II. Booting the images in /binary
-I. Building the meta-chiefriver 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 chiefriver
-image by adding the location of the meta-chiefriver 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-chiefriver \
-To enable the chiefriver layer, add the chiefriver MACHINE to local.conf:
-  MACHINE ?= "chiefriver"
-You should then be able to build a chiefriver 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 'chiefriver' 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-chiefriver.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-chiefriver/README.sources b/meta-chiefriver/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-chiefriver/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-chiefriver/conf/layer.conf b/meta-chiefriver/conf/layer.conf
deleted file mode 100644
index 6164f995..00000000
--- a/meta-chiefriver/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 += "chiefriver"
-BBFILE_PATTERN_chiefriver := "^${LAYERDIR}/"
-BBFILE_PRIORITY_chiefriver = "6"
diff --git a/meta-chiefriver/conf/machine/chiefriver.conf b/meta-chiefriver/conf/machine/chiefriver.conf
deleted file mode 100644
index 89a2afcc..00000000
--- a/meta-chiefriver/conf/machine/chiefriver.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: chiefriver
-#@WEBTITLE: Intel 3rd Generation Core Platforms: Core i3, i5, i7 (Ivy Bridge)
-#@DESCRIPTION: Machine configuration for Chief River systems
-# i.e. Ivy Bridge + Panther Point
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-MACHINE_FEATURES += "va-impl-intel"
-require conf/machine/include/intel-corei7-64-common.inc
-MACHINE_HWCODECS ?= "va-intel gst-va-intel"
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_I965} \
-           "
-MACHINE_EXTRA_RRECOMMENDS += "lms7"
diff --git a/meta-chiefriver/recipes-bsp/formfactor/formfactor/chiefriver/machconfig b/meta-chiefriver/recipes-bsp/formfactor/formfactor/chiefriver/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-chiefriver/recipes-bsp/formfactor/formfactor/chiefriver/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-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-chiefriver/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index a370cbd9..00000000
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_chiefriver = "chiefriver"
-KMACHINE_chiefriver = "chiefriver"
-KBRANCH_chiefriver = "standard/common-pc-64/chiefriver"
-KERNEL_FEATURES_append_chiefriver = " features/amt/mei"
-SRCREV_machine_chiefriver = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_chiefriver = "fe20c99783387dab779472ff50a88666da1c6391"
diff --git a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 000f5d1d..00000000
--- a/meta-chiefriver/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_chiefriver = "chiefriver"
-KMACHINE_chiefriver = "chiefriver"
-KBRANCH_chiefriver = "standard/common-pc-64/chiefriver"
-KERNEL_FEATURES_append_chiefriver = " features/amt/mei/mei.scc"
-LINUX_VERSION = "3.10.19"
-SRCREV_meta_chiefriver = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_chiefriver = "a9ec82e355130160f9094e670bd5be0022a84194"
diff --git a/meta-n450/COPYING.MIT b/meta-n450/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-n450/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-n450/README b/meta-n450/README
deleted file mode 100644
index 2f652dbb..00000000
--- a/meta-n450/README
+++ /dev/null
@@ -1,134 +0,0 @@
-This README file contains information on building the meta-n450
-BSP layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-The Luna Pier platform consists of the Intel Atom E4xx processor (Pineview),
-plus the Intel 82801Hm I/O Controller.
-Further information on the platforms supported by this BSP can be
-found here:
-  http://www.intel.com/p/en_US/embedded/hwsw/hardware/atom-400-500/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 Yocto mailing list
-(yocto@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-n450 BSP layer
- II. Booting the images in /binary
-I. Building the meta-n450 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 n450
-image by adding the location of the meta-n450 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-n450 \
-Configure your build to build for the n450 machine in your local.conf file:
-  MACHINE ?= "n450"
-You should then be able to build an n450 image as such:
-  $ 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-n450.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-n450/README.sources b/meta-n450/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-n450/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-n450/ReleaseNotes b/meta-n450/ReleaseNotes
deleted file mode 100644
index 67e3ff20..00000000
--- a/meta-n450/ReleaseNotes
+++ /dev/null
@@ -1,148 +0,0 @@
-Poky Laverne Release 4.0
- Dependencies
- Features and Updates
- Known Issues
-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
-  URI: git://git.yoctoproject.org/poky
-  layers: meta-yocto
-  branch: master
-NOTE: n450 currently depends on meta-yocto due to atom-pc
-dependencies.  The plan is to move atom-pc to meta-intel as soon as
-the layer tooling comes online and meta-yocto becomes its own
-repository.  At that point, meta-yocto will no longer be required.
-Note also that the layering with respect to the poky repository is in
-transition; it currently contains both meta from openembedded-core and
-bitbake along with some other files and directories which will
-eventually be contained in standalone repositories once the ongoing
-layering work has been completed.  As such, the master branch of the
-poky repository can at the present time be used to satisfy all
-meta-intel dependencies.
-PATCHES
-=======
-Please submit any patches against this BSP to the Yocto mailing list
-(yocto@yoctoproject.org) and cc: the maintainer:
-Maintainer: Darren Hart <dvhart@linux.intel.com>
-Please see the meta-intel/MAINTAINERS file for more details.
-FEATURES AND UPDATES
-====================
- Poky Build System Updates
-        * Saved State / Checksumming
-        * Working prebuilt packages
-        * If a cache of prebuilt packages is present, these should be
-          used to accelerate the build
-        * Task based prebuilts
-        * Meta Directory Update
-        * Debug symbols into sysroot
-        * Builds outside Poky TMPDIR 
-        * Can install to a readonly directory
-        * Ability to Build GPL v2 only target images
-        * Swapper integrated to detect host contamination
- Prelink Tool Integration
-        * Integration of cross prelink tools into Poky
- Toolchain Update
-        * GCC 4.5.0 now default compiler
-        * EGLIBC is default libc provider
- New and Updated Recipes
-        * Major update of core recipes
-        * Add additional packages to get initial lsb support
-        * Add QT4 Libraries and demo code
- Packaging
-        * rootfs creating done with RPM
-        * Use pseudo for setting ownership and permissions
-        * Software package Management now use RPM5 and Zypper
- Standalone Yocto Linux SDK Generator 
-        * Enable other SW development   
-        * Output from Poky 
-        * Cof a sysroot representing a target system 
-        * Includes a standalone cross compiler and cross build tools to isolate the two systems
- Yocto Linux SDK Generator IDE Plug-ins
-        * Work within IDE using Yocto sysroot environment and cross platform toolchains
-        * Remote user spacke tool suite interaction
-        * Eclipse       
-        * Anjuta
- Yocto Linux SDK Generator remote agent
-        * Runs on a "device"
-        * Manage tasks e.g. deployment, launching remote tools, setup cross debugging session
- Yocto Linux SDK Generator remote tasks support
-        * Remote deploy support
-        * Remote debug suppport
-        * Remote tools interaction 
- Qemu basic system simulation/emulation
-        * Enhanced with GL passthrough
-        * Support user mode NFS
- User space tool suite for target device tuning, analyzing and optimizing
-        * OProfile
-        * Powertop      
-        * Latencytop
-        * Perf
-        * ftrace/lttng user space
- Host side clients for tools on target devices and IDE interaction     
-        * ProfileUI
-        * Lttv-viewer
- Updated Documentation 
-        * Core Reference Manunal Updated
-        * BSP standard document
-        * Quick Start Guide
-        * FAQs
-KNOWN ISSUES
-============
-See bugzilla.yoctoproject.org
-382 - oprofile-server on PPC is built big-endian while oprofile-viewer 
-      on host system may built with little-endian, but oprofile-server
-      and oprofile-viewer are not implemented to correctly handle
-      conversion between host byte order and network byte order, so
-      oprofile-server and oprofile-viewer may run into connection issue.
-439 - No audio from the Blacksand board Front Channel auido jack.
-      Workaround: run the following cmd: 'amixer sset "Front" 30 on'
-467 - Issues building with Fedora 14, this distribution provided a version
-      of make that is not compatible with the Poky build system, the
-      workaround it to build a native version of make via the build system.
-      Users of Fedora 14 will need to do a 'bitbake make-native' before
-      running any other targets.
-429 - Building poky from scratch with /opt/poky in your path cause host
-      contamination issues, be sure that /opt/poky is not in your path
-      if building from scratch
-160 - The Emenlow Hardware gets stuck in the HW Reboot sequence and needs
-      to be power cycled.
-Zypper / RPM Issues
-489/490/491 - Due to some archetectual difference between Zypper and RPM5.0,
-      there are some compatibility issues that prevent zypper from
-      working correctly. 
-      Packages can still be managed with the rpm commands.
diff --git a/meta-n450/conf/layer.conf b/meta-n450/conf/layer.conf
deleted file mode 100644
index ee53e543..00000000
--- a/meta-n450/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 += "n450"
-BBFILE_PATTERN_n450 = "^${LAYERDIR}/"
-BBFILE_PRIORITY_n450 = "6"
-LAYERDEPENDS_n450 = "intel"
diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf
deleted file mode 100644
index fa45ecb6..00000000
--- a/meta-n450/conf/machine/n450.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: n450
-#@WEBTITLE: Intel Atom N450 Processor with Intel 82801 HM I/O Controller Compute Module (Luna Pier) with Intel Compute Module Mini-ITX Carrier
-#@DESCRIPTION: Machine configuration for Intel Embedded Development Board 1-N450
-PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/intel-common-pkgarch.inc
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_I915} \
-           "
-SYSLINUX_OPTS = "serial 0 115200"
-SERIAL_CONSOLE = "115200 ttyS0" 
-APPEND += "console=ttyS0,115200 console=tty0" 
diff --git a/meta-n450/docs/blacksand.pdf b/meta-n450/docs/blacksand.pdf
deleted file mode 100644
index 971e6df2..00000000
--- a/meta-n450/docs/blacksand.pdf
+++ /dev/null
Binary files differ
diff --git a/meta-n450/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-n450/recipes-bsp/alsa-state/alsa-state.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-n450/recipes-bsp/alsa-state/alsa-state.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-n450/recipes-bsp/alsa-state/alsa-state/n450/asound.state b/meta-n450/recipes-bsp/alsa-state/alsa-state/n450/asound.state
deleted file mode 100644
index 03a0bee7..00000000
--- a/meta-n450/recipes-bsp/alsa-state/alsa-state/n450/asound.state
+++ /dev/null
@@ -1,450 +0,0 @@
-state.Intel {
-        control.1 {
-                iface MIXER
-                name 'Front Playback Volume'
-                value.0 36
-                value.1 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                        dbvalue.1 -450
-                }
-        }
-        control.2 {
-                iface MIXER
-                name 'Front Playback Switch'
-                value.0 true
-                value.1 true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.3 {
-                iface MIXER
-                name 'Surround Playback Volume'
-                value.0 36
-                value.1 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                        dbvalue.1 -450
-                }
-        }
-        control.4 {
-                iface MIXER
-                name 'Surround Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.5 {
-                iface MIXER
-                name 'Center Playback Volume'
-                value 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 1
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                }
-        }
-        control.6 {
-                iface MIXER
-                name 'LFE Playback Volume'
-                value 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 1
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                }
-        }
-        control.7 {
-                iface MIXER
-                name 'Center Playback Switch'
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.8 {
-                iface MIXER
-                name 'LFE Playback Switch'
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.9 {
-                iface MIXER
-                name 'Side Playback Volume'
-                value.0 36
-                value.1 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                        dbvalue.1 -450
-                }
-        }
-        control.10 {
-                iface MIXER
-                name 'Side Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.11 {
-                iface MIXER
-                name 'Mic Playback Volume'
-                value.0 28
-                value.1 28
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -3450
-                        dbmax 1200
-                        dbvalue.0 750
-                        dbvalue.1 750
-                }
-        }
-        control.12 {
-                iface MIXER
-                name 'Mic Playback Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.13 {
-                iface MIXER
-                name 'Mic Boost Volume'
-                value.0 2
-                value.1 2
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 3'
-                        dbmin 0
-                        dbmax 3000
-                        dbvalue.0 2000
-                        dbvalue.1 2000
-                }
-        }
-        control.14 {
-                iface MIXER
-                name 'Analog Mix Playback Volume'
-                value.0 28
-                value.1 28
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 31'
-                        dbmin -4650
-                        dbmax 0
-                        dbvalue.0 -450
-                        dbvalue.1 -450
-                }
-        }
-        control.15 {
-                iface MIXER
-                name 'Analog Mix Playback Switch'
-                value.0 true
-                value.1 true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.16 {
-                iface MIXER
-                name 'Capture Volume'
-                value.0 48
-                value.1 48
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 54'
-                        dbmin -5850
-                        dbmax 2250
-                        dbvalue.0 1350
-                        dbvalue.1 1350
-                }
-        }
-        control.17 {
-                iface MIXER
-                name 'Capture Switch'
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.18 {
-                iface MIXER
-                name 'Capture Volume'
-                index 1
-                value.0 48
-                value.1 48
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 54'
-                        dbmin -5850
-                        dbmax 2250
-                        dbvalue.0 1350
-                        dbvalue.1 1350
-                }
-        }
-        control.19 {
-                iface MIXER
-                name 'Capture Switch'
-                index 1
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.20 {
-                iface MIXER
-                name 'Capture Volume'
-                index 2
-                value.0 48
-                value.1 48
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 54'
-                        dbmin -5850
-                        dbmax 2250
-                        dbvalue.0 1350
-                        dbvalue.1 1350
-                }
-        }
-        control.21 {
-                iface MIXER
-                name 'Capture Switch'
-                index 2
-                value.0 false
-                value.1 false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 2
-                }
-        }
-        control.22 {
-                iface MIXER
-                name 'Input Source'
-                value Mic
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 Mic
-                        item.1 Mix
-                }
-        }
-        control.23 {
-                iface MIXER
-                name 'Input Source'
-                index 1
-                value Mic
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 Mic
-                        item.1 Mix
-                }
-        }
-        control.24 {
-                iface MIXER
-                name 'Input Source'
-                index 2
-                value Mic
-                comment {
-                        access 'read write'
-                        type ENUMERATED
-                        count 1
-                        item.0 Mic
-                        item.1 Mix
-                }
-        }
-        control.25 {
-                iface MIXER
-                name 'IEC958 Playback Volume'
-                value.0 36
-                value.1 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                        dbvalue.1 -450
-                }
-        }
-        control.26 {
-                iface MIXER
-                name 'HDMI Playback Volume'
-                value.0 36
-                value.1 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 2
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                        dbvalue.1 -450
-                }
-        }
-        control.27 {
-                iface MIXER
-                name 'IEC958 Playback Con Mask'
-                value '0fff000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-                comment {
-                        access read
-                        type IEC958
-                        count 1
-                }
-        }
-        control.28 {
-                iface MIXER
-                name 'IEC958 Playback Pro Mask'
-                value '0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-                comment {
-                        access read
-                        type IEC958
-                        count 1
-                }
-        }
-        control.29 {
-                iface MIXER
-                name 'IEC958 Playback Default'
-                value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-                comment {
-                        access 'read write'
-                        type IEC958
-                        count 1
-                }
-        }
-        control.30 {
-                iface MIXER
-                name 'IEC958 Playback Switch'
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.31 {
-                iface MIXER
-                name 'IEC958 Default PCM Playback Switch'
-                value true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.32 {
-                iface MIXER
-                name 'IEC958 Capture Switch'
-                value false
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-        control.33 {
-                iface MIXER
-                name 'IEC958 Capture Default'
-                value '0400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'
-                comment {
-                        access read
-                        type IEC958
-                        count 1
-                }
-        }
-        control.34 {
-                iface MIXER
-                name 'Master Playback Volume'
-                value 36
-                comment {
-                        access 'read write'
-                        type INTEGER
-                        count 1
-                        range '0 - 39'
-                        dbmin -5850
-                        dbmax 0
-                        dbvalue.0 -450
-                }
-        }
-        control.35 {
-                iface MIXER
-                name 'Master Playback Switch'
-                value true
-                comment {
-                        access 'read write'
-                        type BOOLEAN
-                        count 1
-                }
-        }
-}
diff --git a/meta-n450/recipes-bsp/formfactor/formfactor/n450/machconfig b/meta-n450/recipes-bsp/formfactor/formfactor/n450/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-n450/recipes-bsp/formfactor/formfactor/n450/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-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-n450/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-sys940x/COPYING.MIT b/meta-sys940x/COPYING.MIT
deleted file mode 100644
index fb950dc6..00000000
--- a/meta-sys940x/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-sys940x/README b/meta-sys940x/README
deleted file mode 100644
index 57f64f23..00000000
--- a/meta-sys940x/README
+++ /dev/null
@@ -1,178 +0,0 @@
-This README file contains information on building the meta-sys940x BSP
-layer, and booting the images contained in the /binary directory.
-Please see the corresponding sections below for details.
-The 'Queens Bay' platform consists of the Intel Atom E6xx
-processor, plus the Intel EG20T Platform Controller Hub (Tunnel Creek
-+ Topcliff).
-It also supports the E6xx embedded on-chip graphics via the Intel
-Embedded Media and Graphics Driver (EMGD).
-More details available on the product page:
-  http://www.inforcecomputing.com/SYS940X_ECX.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 Yocto mailing list
-(yocto@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-sys940x BSP layer
- II. Booting the images in /binary
-I. Building the meta-sys940x 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 sys940x image
-by adding the location of the meta-sys940x 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-sys940x \
-The meta-sys940x layer contains support for two different machine
-configurations. These configurations are identical except for the fact
-that the one prefixed with 'sys940x' makes use of the Intel-proprietary
-EMGD graphics driver, while the one prefixed with 'sys940x-noemgd'
-does not.
-If you want to enable the layer that supports EMGD graphics add the
-following to the local.conf file:
-  MACHINE ?= "sys940x"
-The 'sys940x' machine includes the emgd-driver-bin package, which has a
-proprietary license that must be whitelisted by adding the string
-"license_emgd-driver-bin" to the LICENSE_FLAGS_WHITELIST variable
-in your local.conf.  For example:
-  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin"
-The emgd 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 you would need this
-additional line to your local.conf:
-  DISTRO_FEATURES_append = " opengl"
-If you want to enable the layer that does not support EMGD graphics
-add the following to the local.conf file:
-  MACHINE ?= "sys940x-noemgd"
-You should then be able to build an sys940x 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 'sys940x' 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 = "license_emgd-driver-bin 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.
-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-sys940x.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-sys940x/README.sources b/meta-sys940x/README.sources
deleted file mode 100644
index 0d4d849a..00000000
--- a/meta-sys940x/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-sys940x/binary/.gitignore b/meta-sys940x/binary/.gitignore
deleted file mode 100644
index e69de29b..00000000
--- a/meta-sys940x/binary/.gitignore
+++ /dev/null
diff --git a/meta-sys940x/conf/layer.conf b/meta-sys940x/conf/layer.conf
deleted file mode 100644
index b14be6db..00000000
--- a/meta-sys940x/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 += "sys940x"
-BBFILE_PATTERN_sys940x := "^${LAYERDIR}/"
-BBFILE_PRIORITY_sys940x = "6"
-LAYERDEPENDS_sys940x = "intel"
diff --git a/meta-sys940x/conf/machine/sys940x-noemgd.conf b/meta-sys940x/conf/machine/sys940x-noemgd.conf
deleted file mode 100644
index ed6c7f49..00000000
--- a/meta-sys940x/conf/machine/sys940x-noemgd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-#@TYPE: Machine
-#@NAME: sys940x-noemgd
-#@WEBTITLE: Intel Atom E6xx Processor with Intel EG20T Controller Hub Development Kit (Queens Bay) with Open Source VESA Graphics for Inforce SYS940X systems.
-#@DESCRIPTION: Machine configuration for Inforce SYS940X systems, without Intel-proprietary graphics bits
-require conf/machine/include/intel-core2-32-common.inc
-# Add "pcbios" if you have a non-efi version of the firmware
-MACHINE_FEATURES += "efi pcbios"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_VESA} \
-           "
-SERIAL_CONSOLE = "115200 ttyS0"
-APPEND += "console=ttyS0,115200 console=tty0"
diff --git a/meta-sys940x/conf/machine/sys940x.conf b/meta-sys940x/conf/machine/sys940x.conf
deleted file mode 100644
index 04e77665..00000000
--- a/meta-sys940x/conf/machine/sys940x.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#@TYPE: Machine
-#@NAME: sys940x
-#@WEBTITLE: Intel Atom E6xx Processor with Intel EG20T Controller Hub Development Kit (Queens Bay) with Proprietary IEMGD Accelerated Graphics
-#@DESCRIPTION: Machine configuration for Inforce SYS940x systems
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/meta-intel.inc
-require conf/machine/include/meta-intel-emgd.inc
-# Add "pcbios" if you have a non-efi version of the firmware
-MACHINE_FEATURES += "efi pcbios gst-va-mixvideo"
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-MACHINE_HWCODECS ?= "va-intel"
-XSERVERCODECS ?= "emgd-driver-video emgd-gst-plugins-va \
-                  emgd-gst-plugins-mixvideo gst-va-intel"
-XSERVER ?= "${XSERVER_X86_BASE} \
-           ${XSERVER_X86_EXT} \
-           ${XSERVER_X86_EMGD} \
-           "
-PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
-PREFERRED_VERSION_xf86-input-synaptics ?= "1.6.3"
-PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.18"
-PREFERRED_VERSION_libva ?= "1.0.16"
-SERIAL_CONSOLE = "115200 ttyS0"
-APPEND += "console=ttyS0,115200 console=tty0"
diff --git a/meta-sys940x/recipes-bsp/formfactor/formfactor/sys940x-noemgd/machconfig b/meta-sys940x/recipes-bsp/formfactor/formfactor/sys940x-noemgd/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-sys940x/recipes-bsp/formfactor/formfactor/sys940x-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-sys940x/recipes-bsp/formfactor/formfactor/sys940x/machconfig b/meta-sys940x/recipes-bsp/formfactor/formfactor/sys940x/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-sys940x/recipes-bsp/formfactor/formfactor/sys940x/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-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-sys940x/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-sys940x/recipes-bsp/genmac/files/genmac b/meta-sys940x/recipes-bsp/genmac/files/genmac
deleted file mode 100644
index 1899e95f..00000000
--- a/meta-sys940x/recipes-bsp/genmac/files/genmac
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          Random MAC address generator
-# Required-Start:    $syslog
-# Required-Stop:     $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Set a random MAC for tagged interfaces
-# Description:       Set a random MAC for interfaces with RANDOM_MAC
-### END INIT INFO
-# Author: Darren Hart <dvhart@linux.intel.com>
-# Based on /etc/init.d/skeleton
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Set a random MAC for tagged interfaces"
-NAME=genmac
-RANPWD=`which ranpwd`
-SCRIPTNAME=/etc/init.d/$NAME
-# Exit if ranpwd is not installed
-[ -x "$RANPWD" ] || exit 0
-do_start() {
-        # Replace every occurence of RANDOM_MAC with a unique locally
-        # administered, unicast, randomly generated MAC address.
-        while grep -q RANDOM_MAC /etc/network/interfaces; do
-                sed -i "1,/RANDOM_MAC/s/RANDOM_MAC/$($RANPWD -m)/" /etc/network/interfaces
-        done
-}
-case "$1" in
-start)
-        echo "$NAME: Setting random MAC addresses"
-        do_start
-        ;;
-stop)
-        ;;
-*)
-        echo "Usage: $SCRIPTNAME {start|stop}" >&2
-        exit 3
-        ;;
-esac
-exit 0
diff --git a/meta-sys940x/recipes-bsp/genmac/genmac.bb b/meta-sys940x/recipes-bsp/genmac/genmac.bb
deleted file mode 100644
index 29276603..00000000
--- a/meta-sys940x/recipes-bsp/genmac/genmac.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-SUMMARY = "Provide a basic init script to generate a random MAC"
-DESCRIPTION = "Set the MAC from the config file."
-SECTION = "base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
-PR = "r0"
-inherit update-rc.d
-RDEPENDS_${PN} = "ranpwd"
-SRC_URI = "file://genmac"
-INITSCRIPT_NAME = "genmac"
-# Run as early as possible to ensure we are before the networking scripts
-INITSCRIPT_PARAMS = "start 39 S ."
-do_install() {
-        install -d ${D}${sysconfdir} \
-                   ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/${INITSCRIPT_NAME} ${D}${sysconfdir}/init.d
-        cat ${WORKDIR}/${INITSCRIPT_NAME} | \
-            sed -e 's,/etc,${sysconfdir},g' \
-                -e 's,/usr/sbin,${sbindir},g' \
-                -e 's,/var,${localstatedir},g' \
-                -e 's,/usr/bin,${bindir},g' \
-                -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-        chmod 755 ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
-}
diff --git a/meta-sys940x/recipes-core/init-ifupdown/files/sys940x-noemgd/interfaces b/meta-sys940x/recipes-core/init-ifupdown/files/sys940x-noemgd/interfaces
deleted file mode 100644
index 754a5d9d..00000000
--- a/meta-sys940x/recipes-core/init-ifupdown/files/sys940x-noemgd/interfaces
+++ /dev/null
@@ -1,10 +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
-    hwaddress ether RANDOM_MAC
diff --git a/meta-sys940x/recipes-core/init-ifupdown/files/sys940x/interfaces b/meta-sys940x/recipes-core/init-ifupdown/files/sys940x/interfaces
deleted file mode 100644
index 754a5d9d..00000000
--- a/meta-sys940x/recipes-core/init-ifupdown/files/sys940x/interfaces
+++ /dev/null
@@ -1,10 +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
-    hwaddress ether RANDOM_MAC
diff --git a/meta-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
deleted file mode 100644
index 6863e1c5..00000000
--- a/meta-sys940x/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-RDEPENDS_${PN}_sys940x_append += "genmac"
-RDEPENDS_${PN}_sys940x-noemgd_append += "genmac"
diff --git a/meta-sys940x/recipes-extended/ranpwd/ranpwd_git.bb b/meta-sys940x/recipes-extended/ranpwd/ranpwd_git.bb
deleted file mode 100644
index b4e0f549..00000000
--- a/meta-sys940x/recipes-extended/ranpwd/ranpwd_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Random password generator"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://ranpwd.c;beginline=1;endline=11;md5=0e8585e19117526efedfaeb50c345d7a"
-SECTION = "console/utils"
-PV = "1.2+git${SRCPV}"
-PR = "r0"
-inherit autotools
-SRC_URI = "git://git.zytor.com/utils/ranpwd.git"
-SRCREV = "b62aab579e288715b82d5575befaa2b8ff210c2b"
-S="${WORKDIR}/git"
-do_configure_prepend () {
-        if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
-                cp aclocal.m4 acinclude.m4
-        fi
-}
-do_install() {
-        install -d ${D}/${bindir}
-        install -m 0755 ${S}/ranpwd ${D}/${bindir}/ranpwd
-}
diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
deleted file mode 100644
index 5266117b..00000000
--- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-##
-## X Config options generated from CED
-## x11 conf skeleton
-## DriverVer=
-##
-Section "Screen"
-    Identifier    "Screen0"
-    Device        "IntelEMGD-0"
-    Monitor       "Monitor0"
-    SubSection    "Display"
-    EndSubSection
-EndSection
-# Primary (First/only) display
-Section "Device"
-    Identifier "IntelEMGD-0"
-    Driver     "emgd"
-    VendorName "Intel(R) DEG"
-    BoardName  "Embedded Graphics"
-    BusID      "0:2:0"
-    Screen      0
-    Option     "PcfVersion"            "1792"
-    Option     "ConfigId"              "1"
-    Option     "ALL/1/name"                   "e6xx"
-    Option     "ALL/1/General/PortOrder"      "32400"
-    Option     "ALL/1/General/DisplayConfig"  "1"
-    Option     "ALL/1/General/DisplayDetect"  "1"
-    Option     "ALL/1/General/TuningWA" "1"
-    Option     "ALL/1/Port/4/General/name"           "lvds"
-    Option     "ALL/1/Port/4/General/EdidAvail"      "3"
-    Option     "ALL/1/Port/4/General/EdidNotAvail"   "1"
-    Option     "ALL/1/Port/4/General/Rotation"       "0"
-    Option     "ALL/1/Port/4/General/Edid"           "0"
-EndSection
-Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen 0       "Screen0" 0 0
-   # InputDevice    "Mouse0" "CorePointer"
-   # InputDevice    "Keyboard0" "CoreKeyboard"
-   # InputDevice    "DevInputMice" "SendCoreEvents"
-EndSection
diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
deleted file mode 100644
index 72d991c7..00000000
--- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 63fc6042..00000000
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-KMETA = "meta"
-COMPATIBLE_MACHINE_sys940x = "sys940x"
-KMACHINE_sys940x = "sys940x"
-KBRANCH_sys940x = "standard/sys940x"
-KERNEL_FEATURES_sys940x = " features/drm-emgd/drm-emgd-1.16"
-COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
-KMACHINE_sys940x-noemgd = "sys940x"
-KBRANCH_sys940x-noemgd = "standard/sys940x"
-KERNEL_FEATURES_sys940x-noemgd = " cfg/vesafb"
-SRCREV_machine_sys940x = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_sys940x = "fe20c99783387dab779472ff50a88666da1c6391"
-SRCREV_emgd_sys940x = "17aacd908ed6035213a6d206cfdb2c0c9fa9e0c1"
-SRCREV_machine_sys940x-noemgd = "60536206ad300ccf5b2be2c2d449f4ab27170238"
-SRCREV_meta_sys940x-noemgd = "fe20c99783387dab779472ff50a88666da1c6391"
-SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-dev.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.16;name=machine,meta,emgd"
diff --git a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 1b71a773..00000000
--- a/meta-sys940x/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-KMETA = "meta"
-LINUX_VERSION = "3.10.19"
-COMPATIBLE_MACHINE_sys940x = "sys940x"
-KMACHINE_sys940x = "sys940x"
-KBRANCH_sys940x = "standard/sys940x"
-KERNEL_FEATURES_sys940x = " features/drm-emgd/drm-emgd-1.18"
-SRCREV_meta_sys940x = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_sys940x = "a9ec82e355130160f9094e670bd5be0022a84194"
-SRCREV_emgd_sys940x = "39c44dd7838bfd228938219cdb21ca30c4d0cbbf"
-SRC_URI_sys940x = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"
-COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
-KMACHINE_sys940x-noemgd = "sys940x"
-KBRANCH_sys940x-noemgd = "standard/sys940x"
-KERNEL_FEATURES_sys940x-noemgd = " cfg/vesafb"
-SRCREV_meta_sys940x-noemgd = "d9cd83c0292bd4e2a6754a96761027252e726a42"
-SRCREV_machine_sys940x-noemgd = "a9ec82e355130160f9094e670bd5be0022a84194"