5 files changed, 6 insertions, 134 deletions

diff --git a/meta-emenlow/README b/meta-emenlow/README
index 05a04837..0bf0cbcb 100644
--- a/meta-emenlow/README
+++ b/meta-emenlow/README
@@ -82,35 +82,13 @@ common metadata shared between BSPs) e.g.:
   yocto/meta-intel \
   yocto/meta-intel/meta-emenlow \
 
-The meta-emenlow layer contains support for two different machine
-configurations. These configurations are identical except for the fact
-that the one prefixed with 'emenlow' makes use of the
-Intel-proprietary EMGD 1.18 graphics driver, while the one prefixed
-with 'emenlow-noemgd' does not. The 'emenlow-noemgd' machine
-configuration instead uses the open source 'gma500' kernel DRM driver
+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.
 
-If you want to enable the layer that supports EMGD graphics add the
-following to the local.conf file:
-
-  MACHINE ?= "emenlow"
-
-The 'emenlow' machine includes the emgd-driver-bin package, which has
-a proprietary license that must be whitelisted by adding the string
-"license_emgd-driver-bin_1.18" 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:
+To enable the layer add the following to the local.conf file:
 
   MACHINE ?= "emenlow-noemgd"
 
@@ -123,21 +101,6 @@ 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 'emenlow' 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
@@ -159,7 +122,7 @@ 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.hddimg of=/dev/sdf
+# dd if=core-image-sato-emenlow-noemgd.hddimg of=/dev/sdf
 # sync
 # eject /dev/sdf
 
diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf
deleted file mode 100644
index 502d196a..00000000
--- a/meta-emenlow/conf/machine/emenlow.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-#@TYPE: Machine
-#@NAME: emenlow
-
-#@WEBTITLE: Intel Atom Z5xx Processor With Intel US15W Controller Hub (eMenlow)
-
-#@DESCRIPTION: Machine configuration for eMenlow based systems, like the
-# Webs-2120 box.
-
-PREFERRED_VERSION_linux-yocto ?= "3.10%"
-
-require conf/machine/include/intel-core2-32-common.inc
-require conf/machine/include/meta-intel.inc
-require conf/machine/include/meta-intel-emgd.inc
-
-MACHINE_FEATURES += "va-impl-mixvideo"
-
-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"
-
-APPEND += "video=vesafb vga=0x318 vmalloc=256MB reboot=pci"
diff --git a/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow/machconfig b/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow/machconfig
deleted file mode 100644
index ffce0122..00000000
--- a/meta-emenlow/recipes-bsp/formfactor/formfactor/emenlow/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-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
deleted file mode 100644
index 52179631..00000000
--- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/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"      "24000"
-    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-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
index bf3df764..b5ed2146 100644
--- a/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-emenlow/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,23 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-
-COMPATIBLE_MACHINE_emenlow = "emenlow"
-KMACHINE_emenlow = "emenlow"
-KBRANCH_emenlow = "standard/emenlow"
-KERNEL_FEATURES_append_emenlow = " features/drm-emgd/drm-emgd-1.18 cfg/vesafb"
-
 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"
 
-LINUX_VERSION_emenlow = "3.10.38"
-SRCREV_meta_emenlow = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
-SRCREV_machine_emenlow = "02f7e63e56c061617957388c23bd5cf9b05c5388"
-SRCREV_emgd_emenlow = "42d5e4548e8e79e094fa8697949eed4cf6af00a3"
-
 LINUX_VERSION_emenlow-noemgd = "3.10.38"
 SRCREV_meta_emenlow-noemgd = "e1f26aeccfd43bc3d7e95873ceda469b631b8473"
 SRCREV_machine_emenlow-noemgd = "02f7e63e56c061617957388c23bd5cf9b05c5388"
-
-SRC_URI_emenlow = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA},emgd-1.18;name=machine,meta,emgd"