meta-intel: EMGD 1.8 and 3.0 kernel upgrade, v4

index 0219bd1..30c575a 100644
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0%"
+
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"

index 323c8c1..581b976 100644
@@ -12,6 +12,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 KERNEL_IMAGETYPE = "bzImage"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.0%"
+
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"

new file mode 100644
index 0000000..c9aef72
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_crownbay = "crownbay"
+KMACHINE_crownbay  = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd  = "yocto/standard/crownbay"
+KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_crownbay ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
+
+SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"

new file mode 100644
index 0000000..e69de29

new file mode 100644
index 0000000..8f309c9
@@ -0,0 +1,35 @@
+SUMMARY = "EMGD 1.8 xserver binaries"
+DESCRIPTION = "EMGD 1.8 includes some userspace binaries that use non-free \
+licensing.  Intel Open Source Technology Center unfortunately has no power \
+to change that, but tries to make their use as painless as possible.  Please \
+see the README in meta-crownbay/ for instructions on the (simple) manual \
+steps necessary to make the necessary binaries available to this recipe.  \
+Please do that before building an image."
+LICENSE = "Intel-binary-only"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://${WORKDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
+
+FILESPATH = "${FILE_DIRNAME}/emgd-driver-bin-1.8"
+
+SRC_URI = "file://lib \
+           file://License.txt"
+
+FILES_${PN} += "${libdir}/dri ${libdir}/xorg/modules/drivers ${libdir}/*.so"
+FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
+
+S = "${WORKDIR}"
+
+do_install () {
+    install -d -m 0755                    ${D}/${libdir}/dri
+    install -d -m 0755                    ${D}/${libdir}/xorg/modules/drivers
+    install -m 0755 ${S}/lib/*.so.*       ${D}${libdir}/
+    install -m 0755 ${S}/lib/dri/*        ${D}${libdir}/dri/
+    install -m 0755 ${S}/lib/xorg/modules/drivers/* ${D}${libdir}/xorg/modules/drivers/
+
+    ln -sf libEGl.so.1                    ${D}${libdir}/libEGl.so
+    ln -sf libGLES_CM.so.1                ${D}${libdir}/libGLES_CM.so
+    ln -sf libGLESv2.so.2                 ${D}${libdir}/libGLESv2.so
+}
+
+LEAD_SONAME = "libEGL.so"

index 581b976..96dc784 100644
@@ -28,7 +28,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-video-vesa"
 
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.6"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 

index f78a538..fce58f8 100644
@@ -26,11 +26,12 @@ Section "Device"
     Option     "ALL/1/General/PortOrder"      "40000"
     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"           "1"
+    Option     "ALL/1/Port/4/General/Edid"           "0"
 EndSection
 
 Section "ServerLayout"

index 4b8d0e6..1461431 100644
@@ -1,3 +1,4 @@
 THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:"
 
+PR := "${PR}.1"

new file mode 100644
index 0000000..a871529
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: fri2
+
+#@DESCRIPTION: Machine configuration for Fish River Island II systems
+# i.e. E660 + EG20T
+
+include conf/machine/include/tune-atom.inc
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
+                    acpi serial usbgadget wifi 3g"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0%"
+
+PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
+PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+XSERVER ?= "xserver-xf86-dri-lite \
+           xf86-input-mouse \
+           xf86-input-keyboard \
+           xf86-input-evdev \
+           xf86-input-synaptics \
+           xf86-video-vesa"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"

index a871529..4b81fab 100644
@@ -24,7 +24,10 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
-           xf86-video-vesa"
+           emgd-driver-bin"
+
+PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 

new file mode 100644
index 0000000..ffce012
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1

index 5accb2e..aa50c91 100644
@@ -1,2 +1,3 @@
 RRECOMMENDS_task-core-tools-profile_append_fri2 = " systemtap"
+RRECOMMENDS_task-core-tools-profile_append_fri2-noemgd = " systemtap"
 

new file mode 100644
index 0000000..da4fc3c
@@ -0,0 +1,26 @@
+Section "Device"
+    Identifier	"Generic VESA"
+    Driver	"vesa"
+EndSection
+
+Section "Monitor"
+    Identifier    "Generic Monitor"
+    Option        "DPMS"
+EndSection
+
+Section "Screen"
+    Identifier    "Default Screen"
+    Device	  "Generic VESA"
+    Monitor       "Generic Monitor"
+    DefaultDepth  24
+EndSection
+
+Section "ServerLayout"
+    Identifier     "Default Layout"
+    Screen         "Default Screen"
+EndSection
+
+Section "ServerFlags"
+    Option        "DontZap"  "0"
+    Option        "AutoAddDevices"  "False"
+EndSection

58 lines not on this page · raw message

index 739e799..0719ded 100644
@@ -1,6 +1,15 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "yocto/standard/fri2"
+KERNEL_FEATURES_append_fri2 += " cfg/smp.scc"
+
+COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
+KMACHINE_fri2-noemgd  = "yocto/standard/fri2"
+KERNEL_FEATURES_append_fri2-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto_fri2 ?= "f1167dd736c4a4aea834b853d73c51f9863151b4"
+SRCREV_meta_pn-linux-yocto_fri2 ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"
 
-SRCREV_machine_pn-linux-yocto_fri2 ?= "493b09ef2c7124f977421a40955750743a5293d3"
-SRCREV_meta_pn-linux-yocto_fri2 ?= "d588bdafc0d9b4d2386144b7d76a1d379e2d16c0"
+SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "f1167dd736c4a4aea834b853d73c51f9863151b4"
+SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"

similarity index 100%
rename from meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore
rename to common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8/.gitignore

similarity index 100%
rename from meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb
rename to common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb

deleted file mode 100644
index aaf5614..0000000
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
-KMACHINE_crownbay-noemgd = "crownbay"
-
-KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
-
-# Update the following to use a different BSP branch or meta SRCREV
-#KBRANCH_crownbay-noemgd = "yocto/standard/preempt-rt/base"
-#SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX
-#SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX

index b30e776..261cccc 100644
@@ -3,7 +3,9 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
+	${LAYERDIR}/recipes-*/*/*.bbappend \
+	${LAYERDIR}/../common/recipes-graphics/*/*.bb \
+	${LAYERDIR}/../common/recipes-graphics/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "fri2"
 BBFILE_PATTERN_fri2 := "^${LAYERDIR}/"

index c9aef72..9f63b7d 100644
@@ -8,8 +8,8 @@ COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
 KMACHINE_crownbay-noemgd  = "yocto/standard/crownbay"
 KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
 
-SRCREV_machine_pn-linux-yocto_crownbay ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
-SRCREV_meta_pn-linux-yocto_crownbay ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
+SRCREV_machine_pn-linux-yocto_crownbay ?= "6b4b9acde5fb0ff66ae58fa98274bfe631501499"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"
 
-SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "9a259cf4f6d404db2820642df755a295bbfb7fe7"
-SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "fe8eac15e144a35a716cd32c9d2b296ecd5202ac"
+SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "6b4b9acde5fb0ff66ae58fa98274bfe631501499"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"

index 89056ed..439b8c7 100644
@@ -6,7 +6,7 @@ The Crown Bay platform consists of the Intel Atom Z6xx 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) 1.6 Gold Driver.
+Embedded Media and Graphics Driver (EMGD) 1.8 Driver.
 
 Table of Contents
 =================

@@ -33,10 +33,10 @@ bblayers.conf e.g.:
 The meta-crownbay layer contains support for two different machine
 configurations. These configurations are identical except for the fact
 that the one prefixed with 'crownbay' makes use of the
-Intel-proprietary EMGD 1.6 graphics driver, while the one prefixed
+Intel-proprietary EMGD 1.8 graphics driver, while the one prefixed
 with 'crownbay-noemgd' does not.
 
-If you want to enable the layer that supports EMGD graphics add
+If you want to enable the layer that supports EMGD graphics add the
 following to the local.conf file:
 
   MACHINE ?= "crownbay"

@@ -48,8 +48,8 @@ add the following to the local.conf file:
 
 You should then be able to build a crownbay image as such:
 
-  $ source poky-init-build-env
-  $ bitbake poky-image-sato-live
+  $ 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

@@ -59,10 +59,11 @@ 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.  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.
+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. Special notes for building the meta-crownbay BSP layer

@@ -73,39 +74,33 @@ userspace drivers when building the "crownbay" machine (but not when
 building the "crownbay-noemgd" machine).  If you got the BSP from the
 'BSP Downloads' section of the Yocto website, the EMGD binaries needed
 to perform the build will already be present in the BSP, located in
-the recipes-graphics/xorg-xserver/emgd-driver-bin-1.6 directory, and
-you can ignore the rest of this section.
+the meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
+directory, and you can ignore the rest of this section.
 
 If you didn't get the BSP from the 'BSP Downloads' section of the
-Yocto website, you have two choices:
+Yocto website, you can download a tarball containing an rpm that
+contains the binaries and extract the binaries from that, and copy
+them to the proper location in the meta-crownbay layer.
 
-- You can download a tarball containing an rpm that contains the
-  binaries and extract the binaries from that, and copy them to the
-  proper location in the meta-crownbay layer.
+The following subsection describes that process in detail.
 
-- You can download a Windows executable from the official EMGD
-  website, extract the binaries from it, and copy them to the proper
-  location in the meta-crownbay layer.
 
-The following subsections describe each option in detail.
+Downloading and extracting the binaries using the EMGD Linux tarball
+--------------------------------------------------------------------
 
-
-IIa Downloading and extracting the binaries using the EMGD Linux tarball
-------------------------------------------------------------------------
-
-The first step of the process is to download the EMGD 1.6 Gold Driver.
-Here is the current link to the URL which it can be downloaded from:
+The first step of the process is to download the EMGD 1.8 Driver.
+Here is the current link to the URL from which it can be downloaded:
 
 http://edc.intel.com/Software/Downloads/EMGD/
 
 In the Download Now tab, select:
 
 Intel® architecture-based product: Linux Tar Ball
-Operating System: MeeGo 1.0 IVI Linux (kernel 2.6.33.3, X.server 1.8.0)
+Operating System: MeeGo* 1.2 IVI Linux* (kernel 2.6.37, X.server 1.9, Mesa 7.9)
 
-That will give you a large tar file:
+That will give you a large .tgz file:
 
-Lin_EMGD_1_6_RC_1922.tar
+Lin_EMGD_1_8_RC_2032.tgz
 
 Extract the files in the tar file, which will in turn give you a
 directory named IEMGD_HEAD_Linux.

@@ -114,138 +109,24 @@ The binaries are contained in an rpm file; you can extract the
 binaries from the rpm file using rpm2cpio and cpio:
 
 $ cd IEMGD_HEAD_Linux/MeeGo1.2
-$ rpm2cpio emgd-bin-1922-1.6.i586.rpm > emgd-bin-1922-1.6.i586.cpio
+$ rpm2cpio emgd-bin-2032-1.6.i586.rpm > emgd-bin-2032-1.6.i586.cpio
 $ mkdir extracted; cd extracted
-$ cpio -idv < ../poky-image-minimal-initramfs-emenlow.cpio
+$ cpio -idv < ../emgd-bin-2032-1.6.i586.cpio
 
 Finally, you can copy the xorg-xserver binaries to the
-emgd-driver-bin-1.6 directory in the meta-crownbay layer:
+emgd-driver-bin-1.8 directory in meta-intel/common:
 
-$ cp -a usr/lib meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.6
+$ cp -a usr/lib meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
 
 You also need to copy the IEMGD License.txt file to the same directory:
 
-$ cp IEMGD_HEAD_Linux/License/License.txt meta-crownbay/recipes/xorg-xserver/emgd-driver-bin-1.6
+$ cp IEMGD_HEAD_Linux/License/License.txt meta-intel/common/recipes/xorg-xserver/emgd-driver-bin-1.8
 
 At this point, you should be able to build meta-crownbay images as usual.
 
 
-IIb Extracting the binaries using the graphical ced application
----------------------------------------------------------------
-
-These steps require that you run a graphical application in Windows.
-Windows 7 was used for these instructions, but it shouldn't matter
-which version of Windows you use.
-
-The first step of the process is to download the EMGD 1.6 Gold Driver.
-Here is the current link to the URL which it can be downloaded from:
-
-http://edc.intel.com/Software/Downloads/EMGD/
-
-In the Download Now tab, select:
-
-Intel® architecture-based product: Intel Atom Processor E6XX Series
-Operating System: MeeGo 1.0 IVI Linux (kernel 2.6.33.3, X.server 1.8.0)
-
-That will give you a large zip file:
-
-IEMGD_1_6_GOLD_1922.zip
-
-Extract the files in the zip file, which will in turn give you a large
-.exe file:
-
-IEMGD_1_6_GOLD_ALL_1922.exe
-
-Run IEMGD_1_6_GOLD_ALL_1922.exe to install, accept licenses, etc.
-
-If it says to install watcom, follow the instructions to do that.
-
-When the installation completes, an application named "emgd-ced" will
-be present in the install directory.  Double-click to run it.
-
-Select the menu item: New Configuration
-
-In the tabbed page, make the following selections and/or enter the
-specified data:
-
-Configuration File Name: myconfig
-Platform Chipset: Intel Atom Processor E6xx
-Port Devices: LVDS, sDVO
-
-Hit the 'Next' button.
-
-On the next tabbed page, make the following selections and/or enter
-the specified data:
-
-Readable Port Name: portname0
-Encoder Configuration: Select sDVO Device: Internal LVDS
-
-Hit the 'Finish' button.
-
-Select the menu item: New Package
-
-In the tabbed page, make the following selections and/or enter the
-specified data:
-
-Package File Name: mypackage
-Configurations: selec myconfig.cnfg
-Target OS: Linux operating System
-
-Hit the 'Finish' button.
-
-Select the menu item: Generate Installation
-
-This will create the EMGD installation package:
-
-Generating EMGD installation...
-
-The installation package should now be under the 'workspace'
-subdirectory of the directory you installed to:
-
-workspace/installation/mypackage.pkg_installation/IEMGD_HEAD_Linux/IEMGD_HEAD_Linux.tgz
-
-This is the file you are interested in.  Copy it to your Poky build
-system, and uncompress/untar it:
-
-$ tar cvfz IEMGD_HEAD_Linux.tgz
-
-The binaries are contained in an rpm file; you can extract the
-binaries from the rpm file using rpm2cpio and cpio:
-
-$ cd IEMGD_HEAD_Linux/MeeGo1.2
-$ rpm2cpio emgd-bin-1922-1.6.i586.rpm > emgd-bin-1922-1.6.i586.cpio
-$ mkdir extracted; cd extracted
-$ cpio -idv < ../poky-image-minimal-initramfs-emenlow.cpio
-
-Finally, you can copy the xorg-xserver binaries to the
-emgd-driver-bin-1.6 directory in the meta-crownbay layer:
-
-$ cp -a usr/lib meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin-1.6
-
-You also need to copy the IEMGD License.txt file to the same directory:
-
-$ cp IEMGD_HEAD_Linux/License/License.txt meta-crownbay/recipes/xorg-xserver/emgd-driver-bin-1.6
-
-At this point, you should be able to build meta-crownbay images as usual.
-
-----
-
-For reference, the EMGD Driver documentation is also available at the
-above link.
-
-The specific text of the document is:
-
-User Guide: Intel® Embedded Media and Graphics Driver, EFI Video
-Driver, EPOG, and Video BIOS v1.6 for Windows* XP and Linux* Provides
-installation requirements/procedures & describes the vbios/firmware,
-configuration options, & functionality of Intel® EMGD under Windows* &
-Linux*. Refer to guide for details.
-
-April 2011
-
-
-II. Booting the images in /binary
-=================================
+III. 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.

@@ -254,7 +135,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=poky-image-sato-live-crownbay-20101207053738.hddimg of=/dev/sdf
+# dd if=core-image-sato-crownbay-20101207053738.hddimg of=/dev/sdf
 # sync
 # eject /dev/sdf
 

index 7957a7f..29f2618 100644
@@ -2,36 +2,56 @@ 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 platform consists of the Intel Atom Z6xx
+processor, plus the Intel EG20T Platform Controller Hub (Tunnel Creek
++ Topcliff), along with a varied assortment of communications options
+and various other machine-to-machine (m2m) capabilities.
+
+It also supports the E6xx embedded on-chip graphics via the Intel
+Embedded Media and Graphics Driver (EMGD) 1.8 Driver.
+
 
 Table of Contents
 =================
 
-  I. Special notes on the meta-fri2 BSP layer
- II. Building the meta-fri2 BSP layer
+  I. Building the meta-fri2 BSP layer
+ II. Special notes for building the meta-fri2 BSP layer
 III. Booting the images in /binary
 
 
-II. Building the meta-fri2 BSP layer
-=========================================
+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 a fri2 image
+at the top-level of your yocto build tree, you can build an fri2 image
 by adding the location of the meta-fri2 layer to bblayers.conf e.g.:
 
   yocto/meta-intel/meta-fri2 \
 
-To enable the fri2 layer, add the fri2 MACHINE to local.conf:
+The meta-fri2 layer contains support for two different machine
+configurations. These configurations are identical except for the fact
+that the one prefixed with 'fri2' makes use of the Intel-proprietary
+EMGD 1.8 graphics driver, while the one prefixed with 'fri2-noemgd'
+does not.
+
+If you want to enable the layer that supports EMGD graphics add the
+following to the local.conf file:
 
   MACHINE ?= "fri2"
 
-You should then be able to build a fri2 image as such:
+If you want to enable the layer that does not support EMGD graphics
+add the following to the local.conf file:
+
+  MACHINE ?= "fri2-noemgd"
 
-  $ source poky-init-build-env
-  $ bitbake poky-image-sato-live
+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

@@ -41,10 +61,70 @@ 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.  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.
+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. Special notes for building the meta-fri2 BSP layer
+======================================================
+
+The meta-fri2 layer makes use of the proprietary Intel EMGD userspace
+drivers when building the "fri2" machine (but not when building the
+"fri2-noemgd" machine).  If you got the BSP from the 'BSP Downloads'
+section of the Yocto website, the EMGD binaries needed to perform the
+build will already be present in the BSP, located in the
+meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
+directory, and you can ignore the rest of this section.
+
+If you didn't get the BSP from the 'BSP Downloads' section of the
+Yocto website, you can download a tarball containing an rpm that
+contains the binaries and extract the binaries from that, and copy
+them to the proper location in the meta-fri2 layer.
+
+The following subsection describes that process in detail.
+
+
+Downloading and extracting the binaries using the EMGD Linux tarball
+--------------------------------------------------------------------
+
+The first step of the process is to download the EMGD 1.8 Driver.
+Here is the current link to the URL from which it can be downloaded:
+
+http://edc.intel.com/Software/Downloads/EMGD/
+
+In the Download Now tab, select:
+
+Intel® architecture-based product: Linux Tar Ball
+Operating System: MeeGo* 1.2 IVI Linux* (kernel 2.6.37, X.server 1.9, Mesa 7.9)
+
+That will give you a large .tgz file:
+
+Lin_EMGD_1_8_RC_2032.tgz
+
+Extract the files in the tar file, which will in turn give you a
+directory named IEMGD_HEAD_Linux.
+
+The binaries are contained in an rpm file; you can extract the
+binaries from the rpm file using rpm2cpio and cpio:
+
+$ cd IEMGD_HEAD_Linux/MeeGo1.2
+$ rpm2cpio emgd-bin-2032-1.6.i586.rpm > emgd-bin-2032-1.6.i586.cpio
+$ mkdir extracted; cd extracted
+$ cpio -idv < ../emgd-bin-2032-1.6.i586.cpio
+
+Finally, you can copy the xorg-xserver binaries to the
+emgd-driver-bin-1.8 directory in meta-intel/common:
+
+$ cp -a usr/lib meta-intel/common/recipes-graphics/xorg-xserver/emgd-driver-bin-1.8
+
+You also need to copy the IEMGD License.txt file to the same directory:
+
+$ cp IEMGD_HEAD_Linux/License/License.txt meta-intel/common/recipes/xorg-xserver/emgd-driver-bin-1.8
+
+At this point, you should be able to build meta-fri2 images as usual.
 
 
 III. Booting the images in /binary

@@ -57,7 +137,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=poky-image-sato-live-fri2-20101207053738.hddimg of=/dev/sdf
+# dd if=core-image-sato-fri2-20101207053738.hddimg of=/dev/sdf
 # sync
 # eject /dev/sdf