[PATCH 1/9] [meta-intel] Cedartrail: Split machine.conf

[PATCH 1/9] [meta-intel] Cedartrail: Split machine.conf

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

Have two machine.conf files.
One for pvr and the other for no-pvr.
PVR machine.conf has the both pcbios and efi support.
no-pvr has only pcbios support.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 meta-cedartrail/conf/machine/cedartrail-nopvr.conf |   19 +++++++++++++++++++
 meta-cedartrail/conf/machine/cedartrail.conf       |   10 ++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 meta-cedartrail/conf/machine/cedartrail-nopvr.conf

diff --git a/meta-cedartrail/conf/machine/cedartrail-nopvr.conf b/meta-cedartrail/conf/machine/cedartrail-nopvr.conf
new file mode 100644
index 0000000..767137e
--- /dev/null
+++ b/meta-cedartrail/conf/machine/cedartrail-nopvr.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: Cedartrail
+
+#@DESCRIPTION: Machine configuration for Cedartrail systems
+# i.e. Cedarview processor + Tiger Point Chipset
+
+require conf/machine/include/tune-atom.inc
+require conf/machine/include/ia32-base.inc
+
+XSERVER ?= "${XSERVER_IA32_BASE} \
+           ${XSERVER_IA32_EXT} \
+           ${XSERVER_IA32_VESA} \
+           "
+
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
+APPEND += "video=vesafb vga=0x318"
+
diff --git a/meta-cedartrail/conf/machine/cedartrail.conf b/meta-cedartrail/conf/machine/cedartrail.conf
index 3bd5cf8..4d77b04 100644
--- a/meta-cedartrail/conf/machine/cedartrail.conf
+++ b/meta-cedartrail/conf/machine/cedartrail.conf
@@ -7,9 +7,15 @@
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
+MACHINE_FEATURES += "pcbios efi"
+
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
-           ${XSERVER_IA32_VESA} \
+           cdv-pvr-driver \
            "
+PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
+PREFERRED_VERSION_mesa-dri ?= "7.11"
 
-APPEND += "video=vesafb vga=0x318"
+SYSLINUX_OPTS = "serial 0 115200"
+SERIAL_CONSOLE = "115200 ttyS0"
+APPEND += "console=ttyS0,115200 console=tty0"
-- 
1.7.5.4

[PATCH 2/9] [meta-intel] Cedartrail: Update SRCREVS and add EFI Support.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

Add EFI support and update the SRCREVS for pvr
version of build.
Add pvr merge scc file to pull in the pvr patches.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../linux/linux-yocto-rt_3.0.bbappend              |    8 ++++++++
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
index 5a95d3e..2248c88 100644
--- a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ b/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
@@ -3,6 +3,14 @@ COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_cedartrail  = "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"
+
+COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
+KMACHINE_cedartrail-nopvr  = "cedartrail"
+KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
+
 
 # Update the following to use a different BSP branch or meta SRCREV
 #KBRANCH_cedartrail  = "yocto/standard/preempt-rt/base"
diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
index ca59e72..dc15a5e 100644
--- a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -3,6 +3,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_cedartrail = "cedartrail"
 KMACHINE_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"
 
-SRCREV_machine_pn-linux-yocto_cedartrail ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
-SRCREV_meta_pn-linux-yocto_cedartrail ?= "04a52a32cbdf0972033b97b83eaa83eb275dfdc9"
+COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
+KMACHINE_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_machine_pn-linux-yocto_cedartrail-nopvr ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94"
+SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
-- 
1.7.5.4

[PATCH 3/9] [meta-intel] Cedartrail: split xorg.conf files.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

Have two xorg.conf files.
One for pvr-graphics driver.
One for vesa graphics driver.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../xserver-xf86-config/cedartrail-nopvr/xorg.conf |   26 ++++++++++++++++++++
 .../xserver-xf86-config/cedartrail/xorg.conf       |   25 +++++++------------
 2 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf

diff --git a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
new file mode 100644
index 0000000..da4fc3c
--- /dev/null
+++ b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
@@ -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
diff --git a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
index da4fc3c..d7c6a59 100644
--- a/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
+++ b/meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail/xorg.conf
@@ -1,26 +1,19 @@
 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
+        Option     "DRIDisableVSync"    "False"
+        Identifier  "Card0"
+        Driver      "pvr"
+        BusID       "PCI:0:2:0"
+        Option      "SoftEXA"           "Off"
+        Option      "FlipChain"         "On"
 EndSection
 
 Section "ServerLayout"
-    Identifier     "Default Layout"
-    Screen         "Default Screen"
+        Identifier "default screen"
+        Option  "AIGLX" "on"
 EndSection
 
 Section "ServerFlags"
     Option        "DontZap"  "0"
     Option        "AutoAddDevices"  "False"
 EndSection
+
-- 
1.7.5.4

[PATCH 4/9] [meta-intel] Cedartrail: Add PVR graphics support.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

New recipe for PVR graphics support.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../xorg-driver/cdv-pvr-driver.inc                 |   39 ++++++++
 .../xorg-driver/cdv-pvr-driver_1.0.bb              |  101 ++++++++++++++++++++
 2 files changed, 140 insertions(+), 0 deletions(-)
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb

diff --git a/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc b/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc
new file mode 100644
index 0000000..0de6cbe
--- /dev/null
+++ b/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc
@@ -0,0 +1,39 @@
+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 "
+ 
+MEEGO_MIRROR = "http://download.meego.com/live/MeeGo:/1.2.0:/CedarTrail:"
+
+LICENSE_FLAGS = "license_${PN}_${PV}"
+LICENSE = "Intel Free Distribution Binary License"
+LIC_FILES_CHKSUM = " \
+    file://${S}/usr/share/doc/psb-video-cdv-0.12/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65  \
+    file://${S}/usr/share/doc/pvr-bin-cdv-1.7.788837_05/license.txt;md5=b14d99f8d4ed664e9ce95057f0bb5b65"
+
+
+INC_PR = "r0"
+
+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.12/license.txt"
+FILES_${PN} += "${datadir}/doc/pvr-bin-cdv-1.7.788837_05/license.txt"
+
+
+                        
diff --git a/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb b/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb
new file mode 100644
index 0000000..496da1e
--- /dev/null
+++ b/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb
@@ -0,0 +1,101 @@
+require cdv-pvr-driver.inc
+
+PR = "${INC_PR}.0"
+
+DEPENDS = "libva"
+
+SRC_URI = "${MEEGO_MIRROR}/non-oss/MeeGo_1.2.0_CedarTrail/i586/psb-video-cdv-0.12-1.1.i586.rpm;name=psbrpm \ 
+	   ${MEEGO_MIRROR}/oss/standard/i586/libwsbm-cdv-1.1.0-3.1.i586.rpm;name=wsbmrpm \
+	   ${MEEGO_MIRROR}/non-oss/MeeGo_1.2.0_CedarTrail/i586/pvr-bin-cdv-1.7.788837_05-1.1.i586.rpm;name=pvrrpm \
+           "
+
+SRC_URI[pvrrpm.md5sum] = "951fa9edcbc2a3ddb30450079869362e"
+SRC_URI[pvrrpm.sha256sum] = "537dd8a98ac2e3a101063abc62682c3be8c37ac29782a876eafce113ffa5b421"
+
+SRC_URI[psbrpm.md5sum] =  "d4b6b383722264f3b781aeb240c88037"
+SRC_URI[psbrpm.sha256sum] = "e88f95fc73a79adf76ee33d3d9874cec23bb1afe8149d7dc5842d67e58da72f5"
+
+SRC_URI[wsbmrpm.md5sum] = "8d90436b151ddf72f620771f2552b597"
+SRC_URI[wsbmrpm.sha256sum] = "82f78f47c151f0e7d567574ee372504e5b395fb13796caa765f9c30754b5bf63"
+
+
+S  = "${WORKDIR}/cdv-graphics-drivers_${PV}"
+
+do_configure () {
+
+# Extract  license files from rpms
+rpm2cpio ${WORKDIR}/psb-video-cdv-0.12-1.1.i586.rpm |cpio -ivd ./usr/share/doc/psb-video-cdv-0.12/license.txt
+rpm2cpio ${WORKDIR}/pvr-bin-cdv-1.7.788837_05-1.1.i586.rpm |cpio -ivd ./usr/share/doc/pvr-bin-cdv-1.7.788837_05/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.12-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_05-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.12
+	install -d -m 0755 ${D}${datadir}/doc/pvr-bin-cdv-1.7.788837_05
+
+    	install -m 0755 ${S}/usr/share/doc/psb-video-cdv-0.12/license.txt 		${D}${datadir}/doc/psb-video-cdv-0.12/license.txt
+	install -m 0755 ${S}/usr/share/doc/pvr-bin-cdv-1.7.788837_05/license.txt	${D}${datadir}/doc/pvr-bin-cdv-1.7.788837_05/license.txt
+
+}
-- 
1.7.5.4

[PATCH 5/9] [meta-intel] Cedartrail: Add Cedartrail-nopvr statement.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

Cedartrail-nopvr statement added to support
both pvr and nopvr versions.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../tasks/task-core-tools-profile.bbappend         |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta-cedartrail/recipes-core/tasks/task-core-tools-profile.bbappend b/meta-cedartrail/recipes-core/tasks/task-core-tools-profile.bbappend
index e972712..365958b 100644
--- a/meta-cedartrail/recipes-core/tasks/task-core-tools-profile.bbappend
+++ b/meta-cedartrail/recipes-core/tasks/task-core-tools-profile.bbappend
@@ -1,2 +1,3 @@
 RRECOMMENDS_task-core-tools-profile_append_cedartrail = " systemtap"
+RRECOMMENDS_task-core-tools-profile_append_cedartrail-nopvr = " systemtap"
 
-- 
1.7.5.4

[PATCH 6/9] [meta-intel] Cedartrail: separte machconfig in recipes-bsp.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

Have two separte machconfig for supporting both
pvr and vesa version.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../formfactor/cedartrail-nopvr/machconfig         |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
 create mode 100644 meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig

diff --git a/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig b/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig
new file mode 100644
index 0000000..ffce012
--- /dev/null
+++ b/meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig
@@ -0,0 +1,3 @@
+# Assume a USB mouse and keyboard are connected
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
-- 
1.7.5.4

[PATCH 0/9] [meta-intel] cedartrail patches to support pvr graphics

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

These patch set adds the support for the following 
pvr graphics driver 
EFI support for pvr graphics version of build.
updates the SRCREVS.

Please pull into meta-intel/master.

Thanks
Kishore.

The following changes since commit b669b9363197a6af2014c5d54b2c651894e62a5e:

  Romley: Add new bbappend file for 3.2 kernel (2012-04-05 16:35:11 -0700)

are available in the git repository at:
  git://git.pokylinux.org/meta-intel-contrib kishore/cedartrail-pvr
  http://git.pokylinux.org/cgit.cgi/meta-intel-contrib/log/?h=kishore/cedartrail-pvr

Kishore Bodke (9):
  Cedartrail: Split machine.conf
  Cedartrail: Update SRCREVS and add EFI Support.
  Cedartrail: split xorg.conf files.
  Cedartrail: Add PVR graphics support.
  Cedartrail: Add Cedartrail-nopvr statement.
  Cedartrail: separte machconfig in recipes-bsp.
  Cedartrail: Add new recipes for audio and video samples.
  Cedartrail:  Add new recipe for test image.
  Cedartrail: Update the README.

 meta-cedartrail/README                             |   49 +++++++++-
 meta-cedartrail/conf/machine/cedartrail-nopvr.conf |   19 ++++
 meta-cedartrail/conf/machine/cedartrail.conf       |   10 ++-
 .../formfactor/cedartrail-nopvr/machconfig         |    3 +
 .../images/core-image-cdv-media-sdk.bb             |   12 +++
 .../images/core-image-cdv-media.bb                 |   13 +++
 .../tasks/task-core-tools-profile.bbappend         |    1 +
 .../xorg-driver/cdv-pvr-driver.inc                 |   39 ++++++++
 .../xorg-driver/cdv-pvr-driver_1.0.bb              |  101 ++++++++++++++++++++
 .../xserver-xf86-config/cedartrail-nopvr/xorg.conf |   26 +++++
 .../xserver-xf86-config/cedartrail/xorg.conf       |   25 ++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    8 ++
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   14 +++-
 .../ogg-CC-BY-3.0-music-samples_0.1.bb             |   21 ++++
 .../video-samples/bigbuckbunny-ogg.bb              |   22 ++++
 15 files changed, 342 insertions(+), 21 deletions(-)
 create mode 100644 meta-cedartrail/conf/machine/cedartrail-nopvr.conf
 create mode 100644 meta-cedartrail/recipes-bsp/formfactor/formfactor/cedartrail-nopvr/machconfig
 create mode 100644 meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb
 create mode 100644 meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver.inc
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.bb
 create mode 100644 meta-cedartrail/recipes-graphics/xorg-xserver/xserver-xf86-config/cedartrail-nopvr/xorg.conf
 create mode 100644 meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
 create mode 100644 meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb

-- 
1.7.5.4

[PATCH 7/9] [meta-intel] Cedartrail: Add new recipes for audio and video samples.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

This recipe adds sample Audio files and Video files
for testing with pvr Acceleration driver.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../ogg-CC-BY-3.0-music-samples_0.1.bb             |   21 +++++++++++++++++++
 .../video-samples/bigbuckbunny-ogg.bb              |   22 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
 create mode 100644 meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb

diff --git a/meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb b/meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
new file mode 100644
index 0000000..796cd61
--- /dev/null
+++ b/meta-cedartrail/recipes-mediasamples/music-samples/ogg-CC-BY-3.0-music-samples_0.1.bb
@@ -0,0 +1,21 @@
+SUMMARY = "ogg file format music samples"
+DESCRIPTION = "Installs ogg file format music samples in /home/Music dir"
+
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+
+PR = "r0"
+
+SRC_URI = "http://downloads.yoctoproject.org/releases/media/music/ogg-CC-BY-3.0-music-samples-${PV}.tar.bz2 \
+            "
+
+SRC_URI[md5sum] = "dc3dd4adca69996edaffe8828e1ee165"
+SRC_URI[sha256sum] = "86381f8474d5ac2c80f54c951a8c22f67d352daa977341d3dfb4161e39ca3975"
+
+do_install() {
+
+install -d ${D}${base_prefix}/home/music
+install -m 0644  ${WORKDIR}/ogg-CC-BY-3.0-music-samples-${PV}/*/*.ogg ${D}${base_prefix}/home/music
+}
+
+FILES_${PN} += "${base_prefix}/home/music/*.ogg"
diff --git a/meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb b/meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb
new file mode 100644
index 0000000..3b658e0
--- /dev/null
+++ b/meta-cedartrail/recipes-mediasamples/video-samples/bigbuckbunny-ogg.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Big Buck Bunny video OGG sample "
+DESCRIPTION = "Installs Big Buck Bunny Video OGG file samples in /home/video dir "
+
+LICENSE = "CC-BY-3.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7"
+
+PR = "r0"
+
+SRC_URI = "http://blender-mirror.kino3d.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_stereo.ogg \
+            "
+
+
+SRC_URI[md5sum] = "576424c653da53e31b86c027e55758ae"
+SRC_URI[sha256sum] = "785b09a585be55f81326a3fcef2cdeeb7ebbc33932b6305fd84209928df67f28"
+
+do_install() {
+
+install -d ${D}${base_prefix}/home/Videos
+install -m 0644  ${WORKDIR}/*.ogg ${D}${base_prefix}/home/Videos
+}
+
+FILES_${PN} += "${base_prefix}/home/Videos/*.ogg"
-- 
1.7.5.4

[PATCH 8/9] [meta-intel] Cedartrail: Add new recipe for test image.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

This recipes builds the custom images with builtin
features like web-kit and adds the Audio and Video
media samples.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 .../images/core-image-cdv-media-sdk.bb             |   12 ++++++++++++
 .../images/core-image-cdv-media.bb                 |   13 +++++++++++++
 2 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb
 create mode 100644 meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb

diff --git a/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb b/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb
new file mode 100644
index 0000000..364d7b7
--- /dev/null
+++ b/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media-sdk.bb
@@ -0,0 +1,12 @@
+#
+# Copyright (C) 2011 Intel Corporation.
+# Author: Kishore Bodke
+# kishore.k.bodke@intel.com
+
+require recipes-sato/images/core-image-sato-sdk.bb
+
+IMAGE_INSTALL += "web-webkit bigbuckbunny-ogg  ogg-CC-BY-3.0-music-samples"
+
+LICENSE = "MIT"
+
+PR = "r0"
diff --git a/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb b/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb
new file mode 100644
index 0000000..a13ea09
--- /dev/null
+++ b/meta-cedartrail/recipes-cdv-media/images/core-image-cdv-media.bb
@@ -0,0 +1,13 @@
+#
+# Copyright (C) 2011 Intel Corporation.
+# Author:  Kishore Bodke 
+# kishore.k.bodke@intel.com
+#
+
+require recipes-sato/images/core-image-sato.bb
+
+IMAGE_INSTALL += "web-webkit bigbuckbunny-ogg  ogg-CC-BY-3.0-music-samples"
+
+LICENSE = "MIT"
+
+PR = "r0"
-- 
1.7.5.4

[PATCH 9/9] [meta-intel] Cedartrail: Update the README.

[kishore.k.bodke]

From: Kishore Bodke <kishore.k.bodke@intel.com>

Add instructions on how to build with pvr graphics
support and how to build with custom image.

Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
---
 meta-cedartrail/README |   49 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/meta-cedartrail/README b/meta-cedartrail/README
index 295e9ff..493e831 100755
--- a/meta-cedartrail/README
+++ b/meta-cedartrail/README
@@ -52,15 +52,38 @@ common metadata shared between BSPs) e.g.:
         yocto/meta-intel \  
 	yocto/meta-intel/meta-cedartrail \
 
-To enable the cedartrail layer, add the cedartrail MACHINE to local.conf:
+To enable the cedartrail layer that supports Power VR graphics,
+add the cedartrail MACHINE to local.conf:
 
   MACHINE ?= "cedartrail"
 
+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"
+
+To enable the layer that does not support Power VR graphics
+add the following to the local.conf file:
+
+ MACHINE ?= "cedartrail-nopvr"
+
+
 You should then be able to build a cedartrail image as such:
 
   $ source oe-init-build-env
   $ bitbake core-image-sato
 
+The above image will not give you the webkit feature and will not
+have the Audio and Video media samples in the image.
+
+If you want the webkit feature and Audio , Video media samples built
+into the image by default, You should build the custom image by 
+doing the following:
+
+  $ source oe-init-build-env
+  $ bitbake core-image-cdv-media
+
 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').
@@ -109,3 +132,27 @@ 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
+
+Miscellaneous Notes
+====================
+
+Video and Music Samples
+-----------------------
+This BSP includes recipes to download Ogg format video and
+music files that can be played-back with the Video and music players
+included in the sato images.  The sample files are installed in
+/home/Music and /home/Videos directories.
+
+
+Adding Glxgears to image
+-------------------------
+Glxgears can be added to the generated image by adding "tools-testapps"
+option to the extra image features variable in the default local.conf
+before building the BSP.
+
+e.g. to add Glxgears, locate the following line in local.conf
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+
+and change above line to..
+
+EXTRA_IMAGE_FEATURES = "debug-tweaks tools-testapps"
-- 
1.7.5.4

Re: [PATCH 2/9] [meta-intel] Cedartrail: Update SRCREVS and add EFI Support.

[Darren Hart]

On 04/10/2012 11:55 AM, kishore.k.bodke@intel.com wrote:
> From: Kishore Bodke <kishore.k.bodke@intel.com>
> 
> Add EFI support and update the SRCREVS for pvr
> version of build.
> Add pvr merge scc file to pull in the pvr patches.
> 
> Signed-off-by: Kishore Bodke <kishore.k.bodke@intel.com>
> ---
>  .../linux/linux-yocto-rt_3.0.bbappend              |    8 ++++++++
>  .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   14 ++++++++++++--
>  2 files changed, 20 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
> index 5a95d3e..2248c88 100644
> --- a/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
> +++ b/meta-cedartrail/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
> @@ -3,6 +3,14 @@ COMPATIBLE_MACHINE_cedartrail = "cedartrail"
>  KMACHINE_cedartrail  = "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"


I suggest moving all of this into the cedartrail.scc file in the
linux-yocto meta branch. These are all core bits required for the BSP,
they don't need to be easily changed from recipe-space.

The exception would be the pvr bits. You can make a single
cedartrail.scc that supports both configs (with and without pvr) and
only modify the pvr one here in recipe space - the rest belongs in
linux-yocto/meta

> +COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
> +KMACHINE_cedartrail-nopvr  = "cedartrail"
> +KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"

Same here.

--
Darren


> +
>  
>  # Update the following to use a different BSP branch or meta SRCREV
>  #KBRANCH_cedartrail  = "yocto/standard/preempt-rt/base"
> diff --git a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
> index ca59e72..dc15a5e 100644
> --- a/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
> +++ b/meta-cedartrail/recipes-kernel/linux/linux-yocto_3.0.bbappend
> @@ -3,6 +3,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>  COMPATIBLE_MACHINE_cedartrail = "cedartrail"
>  KMACHINE_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"
>  
> -SRCREV_machine_pn-linux-yocto_cedartrail ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
> -SRCREV_meta_pn-linux-yocto_cedartrail ?= "04a52a32cbdf0972033b97b83eaa83eb275dfdc9"
> +COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
> +KMACHINE_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_machine_pn-linux-yocto_cedartrail-nopvr ?= "81fd8c307997aff37916828dc8b4ef72f5d35a94"
> +SRCREV_meta_pn-linux-yocto_cedartrail-nopvr ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"


-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 2/9] [meta-intel] Cedartrail: Update SRCREVS and add EFI Support.

[Bodke, Kishore K]

>>  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"
>
>
>I suggest moving all of this into the cedartrail.scc file in the
>linux-yocto meta branch. These are all core bits required for the BSP,
>they don't need to be easily changed from recipe-space.
>
>The exception would be the pvr bits. You can make a single
>cedartrail.scc that supports both configs (with and without pvr) and
>only modify the pvr one here in recipe space - the rest belongs in
>linux-yocto/meta

Hi Darren,

All the above are specific to pvr only.  (cfg/drm-cdvpvr.scc , bsp/cedartrail/cedartrail-pvr-merge.scc, and cfg/efi-ext.scc)
These are not needed for without pvr versions of the BSP.
I think if I move them to Cedartrail.scc, these will get pulled in for no-pvr version of the build and may cause the build to fail.

Thanks
Kishore.


>
>
>> +COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
>> +KMACHINE_cedartrail-nopvr  = "cedartrail"
>> +KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
>
>Same here.
>
>--
>Darren
>
>--
>Darren Hart
>Intel Open Source Technology Center
>Yocto Project - Linux Kernel

Re: [PATCH 2/9] [meta-intel] Cedartrail: Update SRCREVS and add EFI Support.

[Darren Hart]

On 04/23/2012 11:31 AM, Bodke, Kishore K wrote:
> 
>>>  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"
>>
>>
>> I suggest moving all of this into the cedartrail.scc file in the
>> linux-yocto meta branch. These are all core bits required for the BSP,
>> they don't need to be easily changed from recipe-space.
>>
>> The exception would be the pvr bits. You can make a single
>> cedartrail.scc that supports both configs (with and without pvr) and
>> only modify the pvr one here in recipe space - the rest belongs in
>> linux-yocto/meta
> 
> Hi Darren,
> 
> All the above are specific to pvr only.  

You can't use EFI to boot the system with the pvr driver?

--
Darren

> (cfg/drm-cdvpvr.scc , bsp/cedartrail/cedartrail-pvr-merge.scc, and cfg/efi-ext.scc)
> These are not needed for without pvr versions of the BSP.
> I think if I move them to Cedartrail.scc, these will get pulled in for no-pvr version of the build and may cause the build to fail.
> 
> Thanks
> Kishore.
> 
> 
>>
>>
>>> +COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
>>> +KMACHINE_cedartrail-nopvr  = "cedartrail"
>>> +KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
>>
>> Same here.
>>
>> --
>> Darren
>>
>> --
>> Darren Hart
>> Intel Open Source Technology Center
>> Yocto Project - Linux Kernel


-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 2/9] [meta-intel] Cedartrail: Update SRCREVS and add EFI Support.

[Bodke, Kishore K]

>-----Original Message-----
>From: Hart, Darren
>Sent: Monday, April 23, 2012 12:33 PM
>To: Bodke, Kishore K
>Cc: yocto@yoctoproject.org; Zanussi, Tom
>Subject: Re: [yocto] [PATCH 2/9] [meta-intel] Cedartrail: Update SRCREVS
>and add EFI Support.
>
>On 04/23/2012 11:31 AM, Bodke, Kishore K wrote:
>>
>>>>  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"
>>>
>>>
>>> I suggest moving all of this into the cedartrail.scc file in the
>>> linux-yocto meta branch. These are all core bits required for the
>BSP,
>>> they don't need to be easily changed from recipe-space.
>>>
>>> The exception would be the pvr bits. You can make a single
>>> cedartrail.scc that supports both configs (with and without pvr) and
>>> only modify the pvr one here in recipe space - the rest belongs in
>>> linux-yocto/meta
>>
>> Hi Darren,
>>
>> All the above are specific to pvr only.
>
>You can't use EFI to boot the system with the pvr driver?

EFI is also for pvr build only.  For without pvr builds EFI boot is not supported.

Thanks
Kishore.

>
>--
>Darren
>
>> (cfg/drm-cdvpvr.scc , bsp/cedartrail/cedartrail-pvr-merge.scc, and
>cfg/efi-ext.scc)
>> These are not needed for without pvr versions of the BSP.
>> I think if I move them to Cedartrail.scc, these will get pulled in for
>no-pvr version of the build and may cause the build to fail.
>>
>> Thanks
>> Kishore.
>>
>>
>>>
>>>
>>>> +COMPATIBLE_MACHINE_cedartrail-nopvr = "cedartrail"
>>>> +KMACHINE_cedartrail-nopvr  = "cedartrail"
>>>> +KERNEL_FEATURES_append_cedartrail-nopvr += " cfg/smp.scc"
>>>
>>> Same here.
>>>
>>> --
>>> Darren
>>>
>>> --
>>> Darren Hart
>>> Intel Open Source Technology Center
>>> Yocto Project - Linux Kernel
>
>
>--
>Darren Hart
>Intel Open Source Technology Center
>Yocto Project - Linux Kernel