fri2: Update xorg.conf per EMGD 1.14 user guide

Correct the port order to only list SDVOB and LVDS.

Update the Edid flags as appropriate. No EDID over LVDS. Enable built-in
and edid timings as well as DTDs for the SDVOB port.

Force 24-bit mode for LVDS port to work around an apparent bug with EMGD
in which the default 18-bit mode results in a dim display using the
secondary (LVDS) HDMI port (lower port).

Add backlight intensity and inverter frequency specifications for the
LVDS port per the note in the EMGD 1.14 User Guide (p 184) for E6xx
CPUs.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>

common/recipes-multimedia/ffmpeg/ffmpeg_0.7.12.bb

@@ -1,11 +1,11 @@
 require ffmpeg.inc
 
 LICENSE = "LGPLv2.1+ & GPLv2+"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2"
-SRC_URI[md5sum] = "e4d0c32c0a7cc763922ee8c34e688b5a"
-SRC_URI[sha256sum] = "4d383af2614fd55ab9e11ab3d5366b9a1453a4e4edf0ac2a1b1411927d577249"
+SRC_URI[md5sum] = "b4e3653b2dd930cfa2a80722f8b03182"
+SRC_URI[sha256sum] = "786511d75e5a1f95ec16ed9f0b4a3f49f145e134b8f2ccdfa9ecd2d35ff36000"
 
 LIC_FILES_CHKSUM = "file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://libpostproc/postprocess.c;beginline=8;endline=21;md5=3163771dd725805aeda961a4e05173b5 \

common/recipes-support/gnupg/gnupg_2.0.18.bbappend

@@ -0,0 +1,3 @@
+PR .= ".1"
+
+EXTRA_OECONF += "--disable-ccid-driver"

meta-cedartrail/README

@@ -61,7 +61,7 @@ Power VR Graphics user-space driver binaries are covered by a
 "Intel Free Distribution Binary License". The build of this driver
 can be enabled by adding the following line to the local.conf file:
 
-LICENSE_FLAGS_WHITELIST += "license_cdv-pvr-driver_1.0"
+LICENSE_FLAGS_WHITELIST += "license_cdv-pvr-driver_1.0.3"
 
 To enable the layer that does not support Power VR graphics
 add the following to the local.conf file:

meta-cedartrail/conf/machine/cedartrail.conf

@@ -20,3 +20,7 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 SYSLINUX_OPTS = "serial 0 115200"
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"
+
+VA_FEATURES ?= "gst-va-intel va-intel"
+
+MACHINE_EXTRA_RRECOMMENDS += "${VA_FEATURES}"

meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc

@@ -1,37 +0,0 @@
-SUMMARY = "Cedartrail PowerVR Graphics Driver version [Gold] 1.0 binaries"
-DESCRIPTION = "2D, 3D and Media user space driver for Cedartrail platform \
-The binaries are covered by the Intel Free Distribution Binary License. \ 
-The user must make himself/herself aware of the Licensing terms \
-before enabling build of the Cedartrail PowerVR Graphics Driver via \
-this recipe.  Please see the README in meta-cedartrail for instructions \
-for enabling the build of the driver "
- 
-LICENSE_FLAGS = "license_${PN}_${PV}"
-LICENSE = "Intel Free Distribution Binary License"
-
-LIC_FILES_CHKSUM = " \
-    file://${S}/usr/share/doc/psb-video-cdv-0.16/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65  \
-    file://${S}/usr/share/doc/pvr-bin-cdv-1.7.788837_10/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65"
-
-INC_PR = "r1"
-
-DEPENDS = "rpm-native"
-
-FILES_${PN} += "${libdir}/dri ${libdir}/pvr/cdv/dri ${libdir}/pvr/cdv ${libdir}/xorg/modules/drivers"
-FILES_${PN}-dev += "${libdir}/dri ${libdir}/pvr/cdv/dri ${libdir}/xorg/modules/drivers"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug ${libdir}/pvr/cdv/dri/.debug"
-
-FILES_${PN} += "${base_libdir}/firmware"
-FILES_${PN} += "${sysconfdir}/X11/xorg.conf.d"
-
-FILES_${PN} += "${libdir}/lib*.so"
-FILES_${PN}-dev += "${libdir}/lib*.so"
-FILES_${PN}-dbg += "${libdir}/.debug"
-
-FILES_${PN} += "${libdir}/pvr/cdv/xorg/modules/drivers"
-
-FILES_${PN} += "${datadir}/doc/psb-video-cdv-0.16/license.txt"
-FILES_${PN} += "${datadir}/doc/pvr-bin-cdv-1.7.788837_10/license.txt"
-
-
-                        

meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb

@@ -0,0 +1,139 @@
+SUMMARY = "Cedartrail PowerVR Graphics Driver version 1.0.3 binaries"
+DESCRIPTION = "2D, 3D and Media user space driver for Cedartrail platform \
+The binaries are covered by the Intel Free Distribution Binary License. \
+The user must make himself/herself aware of the Licensing terms \
+before enabling build of the Cedartrail PowerVR Graphics Driver via \
+this recipe.  Please see the README in meta-cedartrail for instructions \
+for enabling the build of the driver "
+
+LICENSE_FLAGS = "license_${PN}_${PV}"
+LICENSE = "Intel Free Distribution Binary License"
+LIC_FILES_CHKSUM = " \
+    file://${S}/usr/share/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65  \
+    file://${S}/usr/share/doc/pvr-bin-cdv-${PVR-BIN-REV_LIC}/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65"
+
+DEPENDS = "rpm-native libva"
+
+PR = "r0"
+
+PSB-VIDEO = "psb-video-cdv-1.0.3-1.1.i586.rpm"
+PSB-VIDEO-REV = "1.0.3"
+
+PVR-BIN = "pvr-bin-cdv-1.0.3-1.1.i586.rpm"
+PVR-BIN-REV = "1.7.862890"
+PVR-BIN-REV_N = "1.7.862890_05"
+PVR-BIN-REV_LIC = "1.0.3"
+
+LIBWSBM = "libwsbm-cdv-1.1.0-3.1.i586.rpm"
+
+
+NON-OSS-PATH = "http://repo.meego.com/MeeGo/updates/1.2.0/repos/non-oss/ia32/packages/"
+OSS-PATH =     "http://repo.meego.com/MeeGo/updates/1.2.0/repos/oss/ia32/packages/"
+
+
+SRC_URI = "${NON-OSS-PATH}${PSB-VIDEO};name=psbrpm \
+	   ${NON-OSS-PATH}${PVR-BIN};name=pvrrpm \
+	   ${OSS-PATH}${LIBWSBM};name=wsbmrpm \
+		"
+SRC_URI[pvrrpm.md5sum] = "3ae7db98825af642445f75f4b5ddb303"
+SRC_URI[pvrrpm.sha256sum] = "42b97e5d663444f35b1ee51cdf9573e3b1d5a4f49ae854218c5c4c9a66ba95cf"
+
+SRC_URI[psbrpm.md5sum] =  "ec486193dc4b3f91bc7c5e18d9ca9d8a"
+SRC_URI[psbrpm.sha256sum] = "0861d69b44d5ce29a3f778ac82976a22f7726af84d9b2e5438c18da5263ffdac"
+
+SRC_URI[wsbmrpm.md5sum] = "b8b21ca8325abd7850d197f9bf3071c7"
+SRC_URI[wsbmrpm.sha256sum] = "f436386967c1adec5211e662251bd542bbe0b8cd55e1d9f9c203da5ee934d4f0"
+
+S  = "${WORKDIR}/cdv-graphics-drivers_${PV}"
+
+FILES_${PN} += "${libdir}/dri ${libdir}/pvr/cdv/dri ${libdir}/pvr/cdv ${libdir}/xorg/modules/drivers"
+
+FILES_${PN} += "${base_libdir}/firmware"
+FILES_${PN} += "${sysconfdir}/X11/xorg.conf.d"
+
+FILES_${PN} += "${libdir}/lib*.so"
+
+FILES_${PN} += "${libdir}/pvr/cdv/xorg/modules/drivers"
+
+FILES_${PN} += "${datadir}/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt"
+FILES_${PN} += "${datadir}/doc/pvr-bin-cdv-${PVR-BIN-REV_LIC}/license.txt"
+
+
+TARGET_CC_ARCH += "${CFLAGS}{LDFLAGS}"
+INSANE_SKIP_${PN} += "ldflags"
+INSANE_SKIP_${PN}-dbg += "ldflags"
+
+do_configure () {
+
+# Extract  license files from rpms
+rpm2cpio.sh ${WORKDIR}/${PSB-VIDEO} |cpio -ivd ./usr/share/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt
+rpm2cpio.sh ${WORKDIR}/${PVR-BIN} |cpio -ivd ./usr/share/doc/pvr-bin-cdv-${PVR-BIN-REV_LIC}/license.txt
+
+}
+
+do_install() {
+
+	mv ${WORKDIR}/*.rpm  ${S}
+
+	rpm2cpio.sh ${S}/${LIBWSBM} | cpio -id
+
+	install -d -m 0755                                    ${D}${libdir}/dri
+
+	install -m 0755 ${S}/usr/lib/*                        ${D}${libdir}/
+
+	rpm2cpio.sh ${S}/${PSB-VIDEO} | cpio -id
+
+	install -d -m 0755				      ${D}${base_libdir}/firmware
+
+	install -m 0755 ${S}/usr/lib/dri/*     		      ${D}${libdir}/dri/
+
+	install -m 0755 ${S}/lib/firmware/*		      ${D}${base_libdir}/firmware
+
+	rpm2cpio.sh  ${S}/${PVR-BIN}  | cpio -id
+
+	install -d -m 0755                                    ${D}${libdir}/pvr/cdv/dri
+
+	install -m 0755 ${S}/usr/lib/pvr/cdv/dri/*            ${D}${libdir}/pvr/cdv/dri
+
+	install -d -m 0755                                    ${D}${sysconfdir}/X11/xorg.conf.d
+	install -m 0755 ${S}/etc/powervr.ini		      ${D}${sysconfdir}/
+	install -m 0755 ${S}/etc/X11/xorg.conf.d/*            ${D}${sysconfdir}/X11/xorg.conf.d/
+	install -m 0755 ${S}/usr/lib/dri/pvr_dri.so    	      ${D}${libdir}/dri/
+	install -m 0755 ${S}/usr/lib/*.so.*                   ${D}${libdir}/
+
+
+	install -m 0755 ${S}/usr/lib/libegl4ogl.so.${PVR-BIN-REV}   	${D}${libdir}/libegl4ogl.so
+	install -m 0755 ${S}/usr/lib/libEGL.so.${PVR-BIN-REV}  		${D}${libdir}/libEGL.so
+	install -m 0755 ${S}/usr/lib/libGLES_CM.so.${PVR-BIN-REV} 	${D}${libdir}/libGLES_CM.so
+	install -m 0755 ${S}/usr/lib/libGLES_CM.so.${PVR-BIN-REV}  	${D}${libdir}/libGLESv1_CM.so
+	install -m 0755 ${S}/usr/lib/libGLESv2.so.${PVR-BIN-REV}  	${D}${libdir}/libGLESv2.so
+	install -m 0755 ${S}/usr/lib/libglslcompiler.so.${PVR-BIN-REV} 	${D}${libdir}/libglslcompiler.so
+	install -m 0755 ${S}/usr/lib/libIMGegl.so.${PVR-BIN-REV}  	${D}${libdir}/libIMGegl.so
+	install -m 0755 ${S}/usr/lib/libOpenVG.so.${PVR-BIN-REV} 	${D}${libdir}/libOpenVG.so
+	install -m 0755 ${S}/usr/lib/libOpenVGU.so.${PVR-BIN-REV} 	${D}${libdir}/libOpenVGU.so
+	install -m 0755 ${S}/usr/lib/libpvr2d.so.${PVR-BIN-REV}  	${D}${libdir}/libpvr2d.so
+	install -m 0755 ${S}/usr/lib/libPVROGL_MESA.so.${PVR-BIN-REV} 	${D}${libdir}/libPVROGL_MESA.so
+	install -m 0755 ${S}/usr/lib/libpvrPVR2D_BLITWSEGL.so.${PVR-BIN-REV} 	${D}${libdir}/libpvrPVR2D_BLITWSEGL.so
+	install -m 0755 ${S}/usr/lib/libpvrPVR2D_DRIWSEGL.so.${PVR-BIN-REV} 	${D}${libdir}/libpvrPVR2D_DRIWSEGL.so
+	install -m 0755 ${S}/usr/lib/libpvrPVR2D_FLIPWSEGL.so.${PVR-BIN-REV}  	${D}${libdir}/libpvrPVR2D_FLIPWSEGL.so
+	install -m 0755 ${S}/usr/lib/libpvrPVR2D_LINUXFBWSEGL.so.${PVR-BIN-REV}	${D}${libdir}/libpvrPVR2D_LINUXFBWSEGL.so
+	install -m 0755 ${S}/usr/lib/libPVRScopeServices.so.${PVR-BIN-REV}  	${D}${libdir}/libPVRScopeServices.so
+	install -m 0755 ${S}/usr/lib/libsrv_init.so.${PVR-BIN-REV}  	${D}${libdir}/libsrv_init.so
+	install -m 0755 ${S}/usr/lib/libsrv_um.so.${PVR-BIN-REV} 	${D}${libdir}/libsrv_um.so
+	install -m 0755 ${S}/usr/lib/libusc.so.${PVR-BIN-REV} 		${D}${libdir}/libusc.so
+
+	install -m 0755 ${S}/usr/lib/pvr/cdv/*.so.*           		${D}${libdir}/pvr/cdv/
+
+	install -d -m 0755 ${D}${libdir}/pvr/cdv/xorg/modules/drivers
+	install -m 0755 ${S}/usr/lib/pvr/cdv/xorg/modules/drivers/* 	${D}${libdir}/pvr/cdv/xorg/modules/drivers/
+
+	install -d -m 0755                                    		${D}${libdir}/xorg/modules/drivers
+
+	install -m 0755 ${S}/usr/lib/xorg/modules/drivers/*   		${D}${libdir}/xorg/modules/drivers/
+
+	install -d -m 0755 ${D}${datadir}/doc/psb-video-cdv-${PSB-VIDEO-REV}
+	install -d -m 0755 ${D}${datadir}/doc/pvr-bin-cdv-${PVR-BIN-REV_N}
+
+	install -m 0755 ${S}/usr/share/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt ${D}${datadir}/doc/psb-video-cdv-${PSB-VIDEO-REV}/license.txt
+
+}

meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb

@@ -1,99 +0,0 @@
-require cdv-pvr-driver.inc
-
-PR = "${INC_PR}.1"
-
-DEPENDS = "libva"
-
-SRC_URI = "http://repo.meego.com/MeeGo/updates/1.2.0/repos/non-oss/ia32/packages/psb-video-cdv-0.16-1.1.i586.rpm;name=psbrpm \
-	   http://repo.meego.com/MeeGo/updates/1.2.0/repos/non-oss/ia32/packages/pvr-bin-cdv-1.7.788837_10-1.1.i586.rpm;name=pvrrpm \
-	   http://repo.meego.com/MeeGo/updates/1.2.0/repos/oss/ia32/packages/libwsbm-cdv-1.1.0-3.1.i586.rpm;name=wsbmrpm \
-		"
-SRC_URI[pvrrpm.md5sum] = "06dbacd7f0f5bb10132eb5477ae9267a"
-SRC_URI[pvrrpm.sha256sum] = "1e42c57485e46a1712e26f48df44a2f5305a82ca98afc5bf4f90a93c9631f509"
-
-SRC_URI[psbrpm.md5sum] =  "fd213baa2af33d35e8b552e586b02b90"
-SRC_URI[psbrpm.sha256sum] = "cda281798ebbd280b6d2caf2a09961db0d719f929b808c6360c81db323aeee71"
-
-SRC_URI[wsbmrpm.md5sum] = "b8b21ca8325abd7850d197f9bf3071c7"
-SRC_URI[wsbmrpm.sha256sum] = "f436386967c1adec5211e662251bd542bbe0b8cd55e1d9f9c203da5ee934d4f0"
-
-
-S  = "${WORKDIR}/cdv-graphics-drivers_${PV}"
-
-do_configure () {
-
-# Extract  license files from rpms
-rpm2cpio ${WORKDIR}/psb-video-cdv-0.16-1.1.i586.rpm |cpio -ivd ./usr/share/doc/psb-video-cdv-0.16/license.txt
-rpm2cpio ${WORKDIR}/pvr-bin-cdv-1.7.788837_10-1.1.i586.rpm |cpio -ivd ./usr/share/doc/pvr-bin-cdv-1.7.788837_10/license.txt
-
-}
-
-
-do_install() {
- 	
-	
-	mv ${WORKDIR}/*.rpm  ${S}	
-				
-	rpm2cpio ${S}/libwsbm-cdv-1.1.0-3.1.i586.rpm | cpio -id
-	
-	install -d -m 0755                                    ${D}${libdir}/dri
-
-	install -m 0755 ${S}/usr/lib/*                        ${D}${libdir}/
-
-	rpm2cpio ${S}/psb-video-cdv-0.16-1.1.i586.rpm | cpio -id
-
-	install -d -m 0755				      ${D}${base_libdir}/firmware
-
-	install -m 0755 ${S}/usr/lib/dri/*     		      ${D}${libdir}/dri/
-
-	install -m 0755 ${S}/lib/firmware/*		      ${D}${base_libdir}/firmware
-
-	rpm2cpio ${S}/pvr-bin-cdv-1.7.788837_10-1.1.i586.rpm  | cpio -id
-
-	install -d -m 0755                                    ${D}${libdir}/pvr/cdv/dri
-
-	install -m 0755 ${S}/usr/lib/pvr/cdv/dri/*            ${D}${libdir}/pvr/cdv/dri
-
-	install -d -m 0755                                    ${D}${sysconfdir}/X11/xorg.conf.d
-	install -m 0755 ${S}/etc/powervr.ini		      ${D}${sysconfdir}/	
-	install -m 0755 ${S}/etc/X11/xorg.conf.d/*            ${D}${sysconfdir}/X11/xorg.conf.d/
-	install -m 0755 ${S}/usr/lib/dri/pvr_dri.so    	      ${D}${libdir}/dri/
-	install -m 0755 ${S}/usr/lib/*.so.*                   ${D}${libdir}/    
-
-	
-	install -m 0755 ${S}/usr/lib/libegl4ogl.so.1.7.788837   			${D}${libdir}/libegl4ogl.so
-	install -m 0755 ${S}/usr/lib/libEGL.so.1.7.788837  				${D}${libdir}/libEGL.so
-	install -m 0755 ${S}/usr/lib/libGLES_CM.so.1.7.788837 				${D}${libdir}/libGLES_CM.so
-	install -m 0755 ${S}/usr/lib/libGLES_CM.so.1.7.788837  				${D}${libdir}/libGLESv1_CM.so
-	install -m 0755 ${S}/usr/lib/libGLESv2.so.1.7.788837  				${D}${libdir}/libGLESv2.so
-	install -m 0755 ${S}/usr/lib/libglslcompiler.so.1.7.788837 			${D}${libdir}/libglslcompiler.so
-	install -m 0755 ${S}/usr/lib/libIMGegl.so.1.7.788837  				${D}${libdir}/libIMGegl.so
-	install -m 0755 ${S}/usr/lib/libOpenVG.so.1.7.788837 				${D}${libdir}/libOpenVG.so
-	install -m 0755 ${S}/usr/lib/libOpenVGU.so.1.7.788837 				${D}${libdir}/libOpenVGU.so
-	install -m 0755 ${S}/usr/lib/libpvr2d.so.1.7.788837  				${D}${libdir}/libpvr2d.so
-	install -m 0755 ${S}/usr/lib/libPVROGL_MESA.so.1.7.788837 			${D}${libdir}/libPVROGL_MESA.so
-	install -m 0755 ${S}/usr/lib/libpvrPVR2D_BLITWSEGL.so.1.7.788837 		${D}${libdir}/libpvrPVR2D_BLITWSEGL.so
-	install -m 0755 ${S}/usr/lib/libpvrPVR2D_DRIWSEGL.so.1.7.788837 		${D}${libdir}/libpvrPVR2D_DRIWSEGL.so
-	install -m 0755 ${S}/usr/lib/libpvrPVR2D_FLIPWSEGL.so.1.7.788837  		${D}${libdir}/libpvrPVR2D_FLIPWSEGL.so
-	install -m 0755 ${S}/usr/lib/libpvrPVR2D_LINUXFBWSEGL.so.1.7.788837  		${D}${libdir}/libpvrPVR2D_LINUXFBWSEGL.so
-	install -m 0755 ${S}/usr/lib/libPVRScopeServices.so.1.7.788837  		${D}${libdir}/libPVRScopeServices.so
-	install -m 0755 ${S}/usr/lib/libsrv_init.so.1.7.788837  			${D}${libdir}/libsrv_init.so
-	install -m 0755 ${S}/usr/lib/libsrv_um.so.1.7.788837 				${D}${libdir}/libsrv_um.so
-	install -m 0755 ${S}/usr/lib/libusc.so.1.7.788837 				${D}${libdir}/libusc.so
-
-	install -m 0755 ${S}/usr/lib/pvr/cdv/*.so.*           				${D}${libdir}/pvr/cdv/    
-
-	install -d -m 0755 ${D}${libdir}/pvr/cdv/xorg/modules/drivers
-	install -m 0755 ${S}/usr/lib/pvr/cdv/xorg/modules/drivers/* 			${D}${libdir}/pvr/cdv/xorg/modules/drivers/
-
-    	install -d -m 0755                                    				${D}${libdir}/xorg/modules/drivers
-   
-	install -m 0755 ${S}/usr/lib/xorg/modules/drivers/*   				${D}${libdir}/xorg/modules/drivers/
-   
-	install -d -m 0755 ${D}${datadir}/doc/psb-video-cdv-0.16
-	install -d -m 0755 ${D}${datadir}/doc/pvr-bin-cdv-1.7.788837_10
-
-	install -m 0755 ${S}/usr/share/doc/psb-video-cdv-0.16/license.txt 		${D}${datadir}/doc/psb-video-cdv-0.16/license.txt
-	install -m 0755 ${S}/usr/share/doc/pvr-bin-cdv-1.7.788837_10/license.txt	${D}${datadir}/doc/pvr-bin-cdv-1.7.788837_10/license.txt
-
-}

meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend

@@ -7,8 +7,6 @@ SRC_URI_cedartrail-nopvr = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=
 COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_cedartrail  = "cedartrail"
 KBRANCH_cedartrail  = "yocto/standard/cedartrail"
-KERNEL_FEATURES_append_cedartrail += " cfg/smp.scc"
-KERNEL_FEATURES_append_cedartrail += "cfg/drm-cdvpvr.scc"
 KERNEL_FEATURES_append_cedartrail += "bsp/cedartrail/cedartrail-pvr-merge.scc"
 KERNEL_FEATURES_append_cedartrail += "cfg/efi-ext.scc"
 
@@ -17,9 +15,9 @@ KMACHINE_cedartrail-nopvr  = "cedartrail"
 KBRANCH_cedartrail-nopvr  = "yocto/standard/cedartrail"
 KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
 
-SRCREV_machine_pn-linux-yocto_cedartrail ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94"
-SRCREV_meta_pn-linux-yocto_cedartrail ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
-SRCREV_pvr_pn-linux-yocto_cedartrail ?= "997f5644664b31ebefd6e16c451c4a3729eb378a"
+SRCREV_machine_pn-linux-yocto_cedartrail ?= "3b5b629560f2a36426c19f4f18e3633aa93c955e"
+SRCREV_meta_pn-linux-yocto_cedartrail ?= "46e8fc2bbbe73514e8d99101adaaa373f760ffa7"
+SRCREV_pvr_pn-linux-yocto_cedartrail ?= "7828ab82533828b924dbfad5158e274a8bb04df3"
 
-SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94"
+SRCREV_machine_pn-linux-yocto_cedartrail-nopvr ?= "3b5b629560f2a36426c19f4f18e3633aa93c955e"
 SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"

meta-fri2/README

@@ -1,5 +1,5 @@
 This README file contains information on building the meta-fri2 BSP
-layer, and booting the images contained in the /binary directory.
+layer and booting the images contained in the /binary directory.
 Please see the corresponding sections below for details.
 
 The Fish River Island II BSP supports the Kontron M2M Smart Services
@@ -50,20 +50,23 @@ Table of Contents
   I. Building the meta-fri2 BSP layer
  II. Booting the images in /binary
 III. Device Notes
-     a. Serial Port
-     b. HDMI
-     c. Power Reset
-     d. Accelerometer
-     e. GPIO
-     f. MMC
-     g. 802.11
-     h. 802.15.4
-     i. Audio
-     j. Optional devices
+     a. BIOS and Firmware
+     b. Serial Port
+     c. HDMI
+     d. Power Reset
+     e. Accelerometer
+     f. GPIO
+     g. MMC
+     h. 802.11
+     i. 802.15.4
+     j. Audio
+     k. Optional Devices
  IV. Known Issues
      a. EFI boot fails
      b. Client USB is disabled
      c. Audio over secondary HDMI port only
+     d. Secondary HDMI port is dim under X
+  V. Additional Resources
 
 
 I. Building the meta-fri2 BSP layer
@@ -99,7 +102,7 @@ in your local.conf.  For example:
 
   LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10"
 
-If you want to enable the layer that does not support EMGD graphics
+If you want to enable the layer that does not support EMGD graphics,
 add the following to the local.conf file:
 
   MACHINE ?= "fri2-noemgd"
@@ -151,6 +154,11 @@ ifconfig the IP address and use that to ssh in.  The root password is
 empty, so to log in type 'root' for the user name and hit 'Enter' at
 the Password prompt: and you should be in.
 
+If instead of a live image, you would like to prepare an EFI bootable
+partitioned image, use the mkefidisk.sh script provided in the scripts
+directory of this BSP. Future versions of the images have an EFI
+installer integrated into the live image.
+
 ----
 
 If you find you're getting corrupt images on the USB (it doesn't show
@@ -162,10 +170,26 @@ characters), try doing this first:
 
 III. Device Notes
 ================================
-a. Serial Port
+a. BIOS and Firmware
+
+Units provided from the Yocto Project Fish River Island 2 Giveaway
+Program are preconfigured with the Intel provided Fast Boot firmware.
+This firmware will search the available devices (USB, SD, and mSATA) for
+a valid EFI payload at "EFI\BOOT\BOOTIA32.EFI". If it fails to find one,
+it will launch the EFI shell and optionally execute a "startup.nsh"
+script if it finds the script on the available storage devices. It
+searches the devices in the following order: USB, SD, mSATA.
+
+Units acquired via other channels may have the Kontron supplied APTIO
+(AMI) BIOS. This is a PCBIOS and EFI firmware with a traditional BIOS
+configuration menu which can be used to define a variety of boot
+configurations.
+
+
+b. Serial Port
 --------------
 The FRI2 has an optional serial daughter card providing a serial
-console via the micro-USB port on the top of the device adjascent the
+console via the micro-USB port on the top of the device adjacent the
 SIM card slot.
 
 The UART from the EG20T is connected to a TI UART-to-USB device
@@ -181,9 +205,9 @@ When you power on your FRI2, your host will discover a serial device
 and name it /dev/ttyUSB0 (or similar). You can communicate with this
 device at 115200 8N1 using your preferred terminal emulator.
 
-In order to redirect the BIOS console to the serial port, you may need
-to set up console redirection in the BIOS menu. The serial port is
-referred to as COM2 in the BIOS.
+If using the Intel provided Fast Boot firmware, no additional
+configuration is required. If using the APTIO (AMI) BIOS, use the
+following settings to configure console redirection in the BIOS menu:
 
   Advanced
     Serial Port Console Redirection
@@ -200,50 +224,46 @@ referred to as COM2 in the BIOS.
         Resolution 100x31     [Disabled]
         Legacy OS Redirection [80x24]
 
-Note that the UART clock is configured at 48MHz in the firmware. This
-will cause problems with software assuming a typical 1.8 MHz clock.
-The Linux kernel pch-uart driver is aware of the clock, but Syslinux,
-for example, is not. For software expecting a typical clock, directing
-them to use a BAUD of 3318 (rather than 115200) can work around the
-problem.
 
-b. HDMI
+c. HDMI
 -------
-The FRI2 has two micro HDMI ports. The one closest to the 1/8" audio
-jacks is the primary display.
+The FRI2 has two micro HDMI ports. For the Intel provided Fast Boot
+firmware, the one closest to the bottom of the device is the primary
+display. For the APTIO (AMI) BIOS, the jack nearest the 1/8" audio jacks
+is the primary display.
 
-c. Power Reset
+d. Power Reset
 --------------
 The recessed button adjacent the LEDs on the top of the device is a
 power reset button.
 
-d. Accelerometer
+e. Accelerometer
 ----------------
 The LIS331DLH accelerometer is connected to the I2C bus on the CPLD on
 the compute module. The driver for this chip is under active
 development and will be included in the BSP once completed.
 
-e. GPIO
+f. GPIO
 -------
 The FRI2 has two I2C PCA555x GPIO devices used for internal control
 signals. These have not been exposed in the current release of the
 BSP, but may be in the future. Regardless, these do would not provide
 general purpose IO with which to read or drive additional signals.
 
-f. MMC
+g. MMC
 ------
 The FRI2 provides two microSD card MMC devices. One is located
 adjacent the 1/8" audio jacks, another is located on the board inside
 the chassis. These devices can be used to boot the device, or as
 secondary storage.
 
-g. 802.11
+h. 802.11
 ---------
 The Intel Corporation Centrino Advanced-N 6205 that ships with the
 FRI2 is supported. You can use connman-gnome to configures the
 interface.
 
-h. 802.15.4
+i. 802.15.4
 -----------
 The TI CC2531 802.15.4 radio is a USB ACM modem. The MAC is enabled by
 issuing the following command:
@@ -256,11 +276,11 @@ the 802.15.4 device may appear as /dev/ttyACM3 instead.
 
 No further testing or integration has been done.
 
-i. Audio
+j. Audio
 --------------------
 The FRI2 has an 1/8" analog output (nearest the antennae), a line-in
 input below that, as well as SPDIF over HDMI. These can be tested
-using the alsa-utils package. aplay -l will list both playback
+using the alsa-utils package. The aplay -l command will list both playback
 devices:
 
 # aplay -l
@@ -281,7 +301,7 @@ Over HDMI:
 # aplay -D plughw:0,3 sample.wav
 
 
-j. Optional Devices
+k. Optional Devices
 -------------------
 The FRI2 has two mini-PCIe slots internally. The device ships with a
 half-length wireless card installed. This can be replaced with a
@@ -290,27 +310,47 @@ cellular cards or mSATA SSDs.
 
 The Ericsson F5521gw 3G modem has been verifed with the FRI2 images.
 Note that the connman-gnome UI does not allow for configuring the
-cellular interface. The ofono-tests package can be used to configure
-the modem and bring up an interface.
+cellular interface. The ofono-tests package can be used to configure the
+modem and bring up an interface.
 
 
 IV. Known Issues
 ----------------
 a. EFI
 ------
-The FRI2 firmware can boot to an EFI shell. It does not yet boot the
-EFI payload provided on the FRI2 live image. This is a known issue
-under investigation.
+The APTIO (AMI) BIOS does not yet boot the EFI payload provided on the
+FRI2 live image. This is a known issue under investigation. If using
+this firmware, boot using PCBIOS mode, rather than EFI.  The Intel
+provided Fast Boot firmware will boot the EFI payload.
 
 b. Client USB is disabled
 -------------------------
-The micro-USB port adjacent the primary HDMI port is intended for
-Client USB functionality, but is not supported on current revisions of
-the device.
+The micro-USB port adjacent the primary HDMI port is intended for Client
+USB functionality, but is not supported on current revisions of the
+device.
 
 c. Audio over secondary HDMI port only
 --------------------------------------
 While audio over HDMI has been shown to work, it seems to only work over
 the secondary (bottom-most) HDMI port. There does not appear to be a
-deterministic way of getting the device to output the signal (video and audio)
-over the secondary port.
+deterministic way of getting the device to output the signal (video and
+audio) over the secondary port.
+
+d. Secondary HDMI port is dim under X
+-------------------------------------
+The EMGD driver appears to display a dim image on the secondary
+(bottom-most) HDMI port. With the Intel provided Fast Boot firmware, the
+EFI shell and payload (including the Linux kernel messages and tty) are
+only displayed over the secondary HDMI port. For scenarios requiring a
+graphical display, the workaround is to connect the display to the
+primary HDMI port and boot unattended, or using the serial port if
+manual interaction is required. A software fix including an upgraded
+EMGD driver is planned for the 1.3 version of the BSP.
+
+
+V. Additional Resources
+-----------------------
+In addition to this README, please see the following wiki page for tips
+on using the FRI2 with the Yocto Project:
+
+https://wiki.yoctoproject.org/wiki/BSPs/FRI2

meta-fri2/conf/machine/fri2-noemgd.conf

@@ -23,7 +23,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 # trick syslinux into configuring a 115200 baud.
 SYSLINUX_OPTS = "serial 0xb060 3318"
 SERIAL_CONSOLE = "115200 ttyPCH1"
-APPEND += "console=ttyPCH1,115200 console=tty0"
+APPEND += "console=ttyPCH1,115200 console=tty0 nopat"
 
 # EFI boot will ignore this and use the EFI framebuffer at 800x600
 APPEND += "video=vesafb vga=0x318"

meta-fri2/conf/machine/fri2.conf

@@ -7,8 +7,10 @@
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
-MACHINE_FEATURES += "wifi 3g pcbios efi"
-MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
+VA_FEATURES ?= "gst-va-intel va-intel"
+
+MACHINE_FEATURES += "wifi 3g pcbios efi gst-va-mixvideo"
+MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5 ${VA_FEATURES}"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto = "3.2%"
@@ -27,7 +29,7 @@ PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 # trick syslinux into configuring a 115200 baud.
 SYSLINUX_OPTS = "serial 0xb060 3318"
 SERIAL_CONSOLE = "115200 ttyPCH1"
-APPEND += "console=ttyPCH1,115200 console=tty0"
+APPEND += "console=ttyPCH1,115200 console=tty0 nopat"
 
 # EFI boot will ignore this and use the EFI framebuffer at 800x600
 APPEND += "video=vesafb vga=0x318"

meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf

@@ -23,15 +23,32 @@ Section "Device"
     Option     "PcfVersion"            "1792"
     Option     "ConfigId"              "1"
     Option     "ALL/1/name"                   "e6xx"
-    Option     "ALL/1/General/PortOrder"      "32400"
+    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/General/TuningWA"       "1"
+
+    # Primary display (upper HDMI port, driven by sDVOB)
+    Option     "ALL/1/Port/2/General/name"           "Primary"
+    Option     "ALL/1/Port/2/General/Edid"           "1"
+    Option     "ALL/1/Port/2/General/EdidAvail"      "7"
+    Option     "ALL/1/Port/2/General/EdidNotAvail"   "5"
+    Option     "ALL/1/Port/2/General/Rotation"       "0"
+    Option     "ALL/1/Port/2/Attr/71"                "20300"
+
+    # Secondary display (lower HDMI port, driven by LVDS, 1366x768)
+    Option     "ALL/1/Port/4/General/name"           "Secondary"
     Option     "ALL/1/Port/4/General/Edid"           "0"
+    Option     "ALL/1/Port/4/General/Rotation"       "0"
+
+    # Panel depth (the default 18 results in a dim display)
+    # Force dither off for 24-bit panels
+    Option     "ALL/1/Port/4/Attr/26"                "24"
+    Option     "ALL/1/Port/4/Attr/45"                "0"
+
+    # Backlight intensity and inverter frequency for E6xx CPUs
+    Option     "ALL/1/Port/4/Attr/70"                "100"
+    Option     "ALL/1/Port/4/Attr/71"                "20300"
 EndSection
 
 Section "ServerLayout"

meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend

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

meta-fri2/recipes-kernel/linux/linux-yocto_3.2.bbappend

@@ -3,13 +3,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2  = "fri2"
 KBRANCH_fri2 = "standard/default/fri2"
-SRCREV_machine_pn-linux-yocto_fri2 ?= "bed6ca99eb1113f7219c23053182c4a569e620ce"
+SRCREV_machine_pn-linux-yocto_fri2 ?= "76dc683eccc46804729a76b9d2fd425ba540a483"
 SRCREV_meta_pn-linux-yocto_fri2 ?= "5b4c9dc78b5ae607173cc3ddab9bce1b5f78129b"
 
 COMPATIBLE_MACHINE_fri2-noemgd = "fri2-noemgd"
 KMACHINE_fri2-noemgd  = "fri2"
 KBRANCH_fri2-noemgd = "standard/default/fri2"
-SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "bed6ca99eb1113f7219c23053182c4a569e620ce"
+SRCREV_machine_pn-linux-yocto_fri2-noemgd ?= "76dc683eccc46804729a76b9d2fd425ba540a483"
 SRCREV_meta_pn-linux-yocto_fri2-noemgd ?= "5b4c9dc78b5ae607173cc3ddab9bce1b5f78129b"
 
 module_autoload_iwlwifi = "iwlwifi"

meta-fri2/scripts/mkefidisk.sh

@@ -0,0 +1,252 @@
+#!/bin/sh
+#
+# Copyright (c) 2012, Intel Corporation.
+# All rights reserved.
+#
+# This program is free software;  you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY;  without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+# the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program;  if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+#
+# Defaults
+#
+# 20 Mb for the boot partition
+BOOT_SIZE=20
+# 5% for swap
+SWAP_RATIO=5
+
+function usage() {
+	echo "Usage: $(basename $0) DEVICE HDDIMG TARGET_DEVICE"
+}
+
+function image_details() {
+	IMG=$1
+	echo "Image details"
+	echo "============="
+	echo "    image: $(stat --printf '%N\n' $IMG)"
+	echo "     size: $(stat -L --printf '%s bytes\n' $IMG)"
+	echo " modified: $(stat -L --printf '%y\n' $IMG)"
+	echo "     type: $(file -L -b $IMG)"
+	echo ""
+}
+
+function device_details() {
+	DEV=$1
+	BLOCK_SIZE=512
+
+	echo "Device details"
+	echo "=============="
+	echo "  device: $DEVICE"
+	if [ -f "/sys/class/block/$DEV/device/vendor" ]; then
+		echo "  vendor: $(cat /sys/class/block/$DEV/device/vendor)"
+	else
+		echo "  vendor: UNKOWN"
+	fi
+	if [ -f "/sys/class/block/$DEV/device/model" ]; then
+		echo "   model: $(cat /sys/class/block/$DEV/device/model)"
+	else
+		echo "   model: UNKNOWN"
+	fi
+	if [ -f "/sys/class/block/$DEV/size" ]; then
+		echo "    size: $[$(cat /sys/class/block/$DEV/size)*BLOCK_SIZE] bytes"
+	else
+		echo "    size: UNKNOWN"
+	fi
+	echo ""
+}
+
+
+#
+# Parse and validate arguments
+#
+if [ $# -ne 3 ]; then
+	usage
+	exit 1
+fi
+
+DEVICE=$1
+HDDIMG=$2
+TARGET_DEVICE=$3
+
+if [ ! -w "$DEVICE" ]; then
+	echo "ERROR: Device $DEVICE does not exist or is not writable"
+	usage
+	exit 1
+fi
+
+if [ ! -e "$HDDIMG" ]; then
+	echo "ERROR: HDDIMG $HDDIMG does not exist"
+	usage
+	exit 1
+fi
+
+
+#
+# Check if any $DEVICE partitions are mounted
+#
+grep -q $DEVICE /proc/mounts
+if [ $? -eq 0 ]; then
+	echo "ERROR: $DEVICE partitions mounted:"
+	grep $DEVICE /proc/mounts | cut -f 1 -d " "
+	echo "Unmount the partitions listed and try again."
+	exit 1
+fi
+
+
+#
+# Confirm device with user
+#
+image_details $HDDIMG
+device_details $(basename $DEVICE)
+echo -n "Prepare EFI image on $DEVICE [y/N]? "
+read RESPONSE
+if [ "$RESPONSE" != "y" ]; then
+	echo "Image creation aborted"
+	exit 0
+fi
+
+
+#
+# Partition $DEVICE
+#
+DEVICE_SIZE=$(parted $DEVICE unit mb print | grep Disk | cut -d" " -f 3 | sed -e "s/MB//")
+SWAP_SIZE=$((DEVICE_SIZE*SWAP_RATIO/100))
+ROOTFS_SIZE=$((DEVICE_SIZE-BOOT_SIZE-SWAP_SIZE))
+ROOTFS_START=$((BOOT_SIZE))
+ROOTFS_END=$((ROOTFS_START+ROOTFS_SIZE))
+SWAP_START=$((ROOTFS_END))
+
+# MMC devices are special in a couple of ways
+# 1) they use a partition prefix character 'p'
+# 2) they are detected asynchronously (need ROOTWAIT)
+PART_PREFIX=""
+if [ ! "${DEVICE#/dev/mmcblk}" = "${DEVICE}" ]; then
+	PART_PREFIX="p"
+fi
+BOOTFS=$DEVICE${PART_PREFIX}1
+ROOTFS=$DEVICE${PART_PREFIX}2
+SWAP=$DEVICE${PART_PREFIX}3
+
+ROOTWAIT=""
+TARGET_PART_PREFIX=""
+if [ ! "${TARGET_DEVICE#/dev/mmcblk}" = "${TARGET_DEVICE}" ]; then
+	TARGET_PART_PREFIX="p"
+	ROOTWAIT="rootwait"
+fi
+TARGET_ROOTFS=$TARGET_DEVICE${TARGET_PART_PREFIX}2
+TARGET_SWAP=$TARGET_DEVICE${TARGET_PART_PREFIX}3
+
+echo "*****************"
+echo "Boot partition size:   $BOOT_SIZE MB ($BOOTFS)"
+echo "ROOTFS partition size: $ROOTFS_SIZE MB ($ROOTFS)"
+echo "Swap partition size:   $SWAP_SIZE MB ($SWAP)"
+echo "*****************"
+echo "Deleting partition table on $DEVICE ..."
+dd if=/dev/zero of=$DEVICE bs=512 count=2
+
+echo "Creating new partition table (GPT) on $DEVICE ..."
+parted $DEVICE mklabel gpt
+
+echo "Creating boot partition on $BOOTFS"
+parted $DEVICE mkpart primary 0% $BOOT_SIZE
+
+echo "Creating ROOTFS partition on $ROOTFS"
+parted $DEVICE mkpart primary $ROOTFS_START $ROOTFS_END
+
+echo "Creating swap partition on $SWAP"
+parted $DEVICE mkpart primary $SWAP_START 100%
+
+parted $DEVICE print
+
+
+#
+# Format $DEVICE partitions
+#
+echo ""
+echo "Formatting $BOOTFS as vfat..."
+mkfs.vfat $BOOTFS
+
+echo "Formatting $ROOTFS as ext3..."
+mkfs.ext3 $ROOTFS
+
+echo "Formatting swap partition...($SWAP)"
+mkswap $SWAP
+
+
+#
+# Installing to $DEVICE
+#
+echo ""
+echo "Mounting images and device in preparation for installation..."
+TMPDIR=$(mktemp -d mkefidisk-XXX)
+if [ $? -ne 0 ]; then
+	echo "ERROR: Failed to create temporary mounting directory."
+	exit 1
+fi
+HDDIMG_MNT=$TMPDIR/hddimg
+HDDIMG_ROOTFS_MNT=$TMPDIR/hddimg_rootfs
+ROOTFS_MNT=$TMPDIR/rootfs
+BOOTFS_MNT=$TMPDIR/bootfs
+mkdir $HDDIMG_MNT
+mkdir $HDDIMG_ROOTFS_MNT
+mkdir $ROOTFS_MNT
+mkdir $BOOTFS_MNT
+
+mount -o loop $HDDIMG $HDDIMG_MNT
+mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT
+mount $ROOTFS $ROOTFS_MNT
+mount $BOOTFS $BOOTFS_MNT
+
+echo "Copying ROOTFS files..."
+cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT
+
+echo "$TARGET_SWAP     swap             swap       defaults              0 0" >> $ROOTFS_MNT/etc/fstab
+
+# We dont want udev to mount our root device while we're booting...
+if [ -d $ROOTFS_MNT/etc/udev/ ] ; then
+	echo "$TARGET_DEVICE" >> $ROOTFS_MNT/etc/udev/mount.blacklist
+fi
+
+umount $ROOTFS_MNT
+umount $HDDIMG_ROOTFS_MNT
+
+echo "Preparing boot partition..."
+EFIDIR="$BOOTFS_MNT/EFI/BOOT"
+mkdir -p $EFIDIR
+GRUBCFG="$EFIDIR/grub.cfg"
+
+cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT
+# Copy the efi loader and config (booti*.efi and grub.cfg)
+cp $HDDIMG_MNT/EFI/BOOT/* $EFIDIR
+
+# Update grub config for the installed image
+# Delete the install entry
+sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
+# Delete the initrd lines
+sed -i "/initrd /d" $GRUBCFG
+# Delete any LABEL= strings
+sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
+# Replace the ramdisk root with the install device and include other options
+sed -i "s@ root=[^ ]*@ root=$TARGET_ROOTFS rw $ROOTWAIT quiet@" $GRUBCFG
+
+# Provide a startup.nsh script for older firmware with non-standard boot
+# directories and paths.
+echo "bootia32.efi" > $BOOTFS_MNT/startup.nsh
+
+umount $BOOTFS_MNT
+umount $HDDIMG_MNT
+rm -rf $TMPDIR
+sync
+
+echo "Installation complete."

meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend

@@ -1,7 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_n450 = "n450"
 KMACHINE_n450  = "atom-pc"
-KBRANCH_n450 = "standard/default/common-pc/base"
+KBRANCH_n450 = "standard/default/common-pc/atom-pc"
 
 #SRCREV_machine_pn-linux-yocto_n450 = XXXX
 #SRCREV_meta_pn-linux-yocto_n450 ?= XXXX