Skip to contentSkip to conversation

meta-intel userland changes for corwnbay & emgd 1.14

PATCH In review [email protected] 2 participants 10 messages Jul 19, 2012 – Jul 21, 2012

lore
Share & tools
lore
#0 lore raw

cover meta-intel userland changes for corwnbay & emgd 1.14

From: Nitin A Kamble <[email protected]>

These commits emable crownbay bsp with v3.4 kernel and emgd 1.14 graphics driver. the last SRC_REV commit need updating to reflect upstream commit-ids. And that commit can be used to do any testing before pulling these commits.

These commit work along with the emgd-1.14 kenrel repo commit sent before. so for testing take both sets of commits for the v3.4 kernel repo & meta-intel repo.

Thanks,
Nitin

The following changes since commit ae18053df8d2b176b4f714bc5a826276f3fcbfad:

linux-firmware: update md5sum for LICENCE.iwlwifi_firmware (2012-07-11 19:06:58 -0500)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/work-crownbay
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/work-crownbay

Nitin A Kamble (7):
crownbay: customize the xorg.conf for the flat panel on the corwnbay
kit
ia32-base.inc: also take -dev package of emgd
emgd-driver-bin: upgrade from 1.10 to 1.14
crownbay: update emgd driver version in the README
crownbay: add recipe extension for linux-yocto-3.4
crownbay: make v3.4 the default kernel
crownbay: update kernel meta SRC_REV

 ...-driver-bin_1.10.bb => emgd-driver-bin_1.14.bb} |   13 +++++----
 conf/machine/include/ia32-base.inc                 |    1 +
 meta-crownbay/README                               |    8 +++---
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    2 +-
 meta-crownbay/conf/machine/crownbay.conf           |    2 +-
 .../xserver-xf86-config/crownbay/xorg.conf         |   14 ++++++++++
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |   26 ++++++++++++++++++++
 7 files changed, 54 insertions(+), 12 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{emgd-driver-bin_1.10.bb => emgd-driver-bin_1.14.bb} (92%)
 create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/7 crownbay: customize the xorg.conf for the flat panel on the corwnbay kit

From: Nitin A Kamble <[email protected]>

The kit has Auo 800x600 LCD screen. Configuring Xorg for it.

---
 .../xserver-xf86-config/crownbay/xorg.conf         |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf +14 -0
index 662f60f..f81b466 100644
@@ -4,12 +4,26 @@
 ## DriverVer=
 ##
 
+# AUO G084SN05 V8 lcd flat panel
+Section "Monitor"
+    Identifier     "Monitor0"
+    VendorName     "Auo"
+    HorizSync       33.6 - 48.3
+    VertRefresh     60.0 - 60.0
+    Option         "DPMS"
+EndSection
+
 Section "Screen"
     Identifier    "Screen0"
     Device        "IntelEMGD-0"
     Monitor       "Monitor0"
+
+    # for the AUO flat screen
     SubSection    "Display"
+        Depth      24
+        Modes      "800x600"
     EndSubSection
+
 EndSection
 
 # Primary (First/only) display
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 2/7 ia32-base.inc: also take -dev package of emgd

From: Nitin A Kamble <[email protected]>

emgd-driver-bin recipe provides emgd-driver-bin, emgd-driver-bin-dev & emgd-driver-bin-dbg packages. For emgd driver to work it also need library files from emgd-driver-bin-dev package. This change makes sure this -dev package is also added for emgd driver.

---
 conf/machine/include/ia32-base.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
conf/machine/include/ia32-base.inc +1 -0
index 99ac352..7d9413a 100644
@@ -57,6 +57,7 @@ XSERVER_IA32_I965 = "xf86-video-intel \
            "
 
 XSERVER_IA32_EMGD = "emgd-driver-bin \
+                     emgd-driver-bin-dev \
            "
 
 XSERVER_IA32_VESA = "xf86-video-vesa"
Signature · 1 line
1.7.3.4
#3 lore raw

Re: [PATCH 2/7] ia32-base.inc: also take -dev package of emgd

Quoted 17 lines · On Wed, 2012-07-18 at 07:49 -0700, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

emgd-driver-bin recipe provides emgd-driver-bin, emgd-driver-bin-dev & emgd-driver-bin-dbg packages. For emgd driver to work it also need library files from emgd-driver-bin-dev package. This change makes sure this -dev package is also added for emgd driver.

---
 conf/machine/include/ia32-base.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
conf/machine/include/ia32-base.inc +0 -0
index 99ac352..7d9413a 100644

conf/machine/include/ia32-base.inc XSERVER_IA32_I965 = "xf86-video-intel \ · line 62

Quoted 6 lines
conf/machine/include/ia32-base.inc +1 -0
@@ -57,6 +57,7 @@ XSERVER_IA32_I965 = "xf86-video-intel \
            "
 
 XSERVER_IA32_EMGD = "emgd-driver-bin \
+                     emgd-driver-bin-dev \
            "
 

I think this is the same problem as 1.10 - you shouldn't have to pull in the -dev package to get those two .so files, which are in the emgd-bin-2443-1.10.i586.rpm and not the -dev rpm:

/usr/lib/dri/emgd_dri.so
/usr/lib/dri/emgd_drv_video.so
/usr/lib/libEGL.so.1.5.15.3226
/usr/lib/libEMGD2d.so.1.5.15.3226
/usr/lib/libEMGDOGL.so.1.5.15.3226
/usr/lib/libEMGDScopeServices.so.1.5.15.3226
/usr/lib/libEMGDegl.so.1.5.15.3226
/usr/lib/libGLES_CM.so.1.5.15.3226
/usr/lib/libGLESv2.so.1.5.15.3226
/usr/lib/libOpenVG.so.1.5.15.3226
/usr/lib/libOpenVGU.so.1.5.15.3226
/usr/lib/libPVRScopeServices.so
/usr/lib/libemgdPVR2D_DRIWSEGL.so.1.5.15.3226
/usr/lib/libemgdglslcompiler.so.1.5.15.3226
/usr/lib/libemgdsrv_init.so.1.5.15.3226
/usr/lib/libemgdsrv_um.so.1.5.15.3226
/usr/lib/xorg/modules/drivers/emgd_drv.so
/usr/share/doc/emgd/emgd-cb.conf
/usr/share/doc/emgd/emgd-rv.conf
/usr/share/doc/emgd/license.txt
/usr/share/doc/emgd/readme.txt
/usr/share/man/man4/emgd.4.gz

So those two .so files are now going into the -dev package when before they weren't. I think the package reordering changes are what broke the current recipe:

commit f68cbf56d8f2a45ce44a59d0411cdda8ec7e2c36

Author: Saul Wold <[email protected]>
Date:   Tue Jun 5 04:52:21 2012 -0700

bitbake.conf: reorder PACKAGES list

This change re-orders the PACKAGES list to move PN to the end of the
list
this will ensure that base package gets the final bits since the
packaging
is greedy. We can then have -dev and other package get bits first.

And probably some similar fix to the bunch of 'clean up FILE after PACKAGE reorder' commits would get things back to how they were. Should I file a bug for this?

Tom

Quoted 1 line
conf/machine/include/ia32-base.inc +0 -0
 XSERVER_IA32_VESA = "xf86-video-vesa"
#4 lore raw

Re: [PATCH 2/7] ia32-base.inc: also take -dev package of emgd

Quoted 68 lines · Tom Zanussi
Quoted 17 lines · On Wed, 2012-07-18 at 07:49 -0700, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

emgd-driver-bin recipe provides emgd-driver-bin, emgd-driver-bin-dev & emgd-driver-bin-dbg packages. For emgd driver to work it also need library files from emgd-driver-bin-dev package. This change makes sure this -dev package is also added for emgd driver.

---
 conf/machine/include/ia32-base.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
conf/machine/include/ia32-base.inc +0 -0
index 99ac352..7d9413a 100644

conf/machine/include/ia32-base.inc XSERVER_IA32_I965 = "xf86-video-intel \ · line 62

Quoted 6 lines
conf/machine/include/ia32-base.inc +1 -0
@@ -57,6 +57,7 @@ XSERVER_IA32_I965 = "xf86-video-intel \
            "
 
 XSERVER_IA32_EMGD = "emgd-driver-bin \
+                     emgd-driver-bin-dev \
            "
 

I think this is the same problem as 1.10 - you shouldn't have to pull in the -dev package to get those two .so files, which are in the emgd-bin-2443-1.10.i586.rpm and not the -dev rpm:

/usr/lib/dri/emgd_dri.so
/usr/lib/dri/emgd_drv_video.so
/usr/lib/libEGL.so.1.5.15.3226
/usr/lib/libEMGD2d.so.1.5.15.3226
/usr/lib/libEMGDOGL.so.1.5.15.3226
/usr/lib/libEMGDScopeServices.so.1.5.15.3226
/usr/lib/libEMGDegl.so.1.5.15.3226
/usr/lib/libGLES_CM.so.1.5.15.3226
/usr/lib/libGLESv2.so.1.5.15.3226
/usr/lib/libOpenVG.so.1.5.15.3226
/usr/lib/libOpenVGU.so.1.5.15.3226
/usr/lib/libPVRScopeServices.so
/usr/lib/libemgdPVR2D_DRIWSEGL.so.1.5.15.3226
/usr/lib/libemgdglslcompiler.so.1.5.15.3226
/usr/lib/libemgdsrv_init.so.1.5.15.3226
/usr/lib/libemgdsrv_um.so.1.5.15.3226
/usr/lib/xorg/modules/drivers/emgd_drv.so
/usr/share/doc/emgd/emgd-cb.conf
/usr/share/doc/emgd/emgd-rv.conf
/usr/share/doc/emgd/license.txt
/usr/share/doc/emgd/readme.txt
/usr/share/man/man4/emgd.4.gz

So those two .so files are now going into the -dev package when before they weren't. I think the package reordering changes are what broke the current recipe:

commit f68cbf56d8f2a45ce44a59d0411cdda8ec7e2c36

Author: Saul Wold <[email protected]>
Date:   Tue Jun 5 04:52:21 2012 -0700

bitbake.conf: reorder PACKAGES list

This change re-orders the PACKAGES list to move PN to the end of the
list
this will ensure that base package gets the final bits since the
packaging
is greedy. We can then have -dev and other package get bits first.

Quoted 4 lines

And probably some similar fix to the bunch of 'clean up FILE after PACKAGE reorder' commits would get things back to how they were. Should I file a bug for this?

I pushed the fix for this to meta-intel/master, which you should be able to reuse for emgd 1.14.

Tom

Quoted 10 lines

Tom

conf/machine/include/ia32-base.inc XSERVER_IA32_I965 = "xf86-video-intel \ · line 63

Quoted 1 line
conf/machine/include/ia32-base.inc +0 -0
 XSERVER_IA32_VESA = "xf86-video-vesa"

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

#5 lore raw

PATCH 3/7 emgd-driver-bin: upgrade from 1.10 to 1.14

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

1.14 is the latest released driver for emgd. This change is tested on crownbay machine.

Add runtime dependency to libxcb-dri2

Otherwise the libxcb-dri2.so is not getting installed, and video acceleration of emgd does not work. It is dynamic dependency of emgd_drv_video.so

---
 ...-driver-bin_1.10.bb => emgd-driver-bin_1.14.bb} |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{emgd-driver-bin_1.10.bb => emgd-driver-bin_1.14.bb} (92%)
common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.14.bb renamed from common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.10.bb +7 -6
similarity index 92%
rename from common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.10.bb
rename to common/recipes-graphics/xorg-xserver/emgd-driver-bin_1.14.bb
index 53a43cd..1db92f6 100644
@@ -1,9 +1,9 @@
-SUMMARY = "EMGD 1.10 xserver binaries"
-DESCRIPTION = "EMGD 1.10 includes some userspace binaries that use non-free \
+SUMMARY = "EMGD 1.14 xserver binaries"
+DESCRIPTION = "EMGD 1.14 includes some userspace binaries that use non-free \
 licensing, which are now available via a non-click-through downloadable \
 tarball, and is what this recipe now uses.  Since it is a non-free license, \
-this recipe is marked as 'License_emgd-driver-bin_1.10' and you need to add \
-to LICENSE_FLAGS_WHITELIST += \"License_emgd-driver-bin_1.10\" to your \
+this recipe is marked as 'License_emgd-driver-bin_1.14' and you need to add \
+to LICENSE_FLAGS_WHITELIST += \"License_emgd-driver-bin_1.14\" to your \
 local.conf in order to enable it in a build."
 LICENSE = "Intel-binary-only"
 LICENSE_FLAGS = "license_${PN}_${PV}"
@@ -16,8 +16,9 @@ EMGD_VIDEO_PLUGIN_DIR = "../common/video_plugin"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d"
 
 DEPENDS = "rpm-native xz-native"
+RDEPENDS = "libxcb-dri2"
 
-SRC_URI = "https://edc.intel.com/App_Shared/Downloads/LIN_EMGD_1_10_RC_2209.tgz"
+SRC_URI = "https://edc.intel.com/App_Shared/Downloads/LIN_IEMGD_1_14_GOLD_2443.tgz"
 
 SRC_URI[md5sum] = "e4a38d9efa0b086ae21b68145c4db4e9"
 SRC_URI[sha256sum] = "acea5f0f93a31553553428623c007d7ed0c604cf715fd87dfe075751da4be548"
@@ -27,7 +28,7 @@ INSANE_SKIP_${PN} = "ldflags"
 
 FILES_${PN} += "${libdir}/dri ${libdir}/gstreamer-0.10 ${libdir}/xorg/modules/drivers"
 FILES_${PN}-dev += "${libdir}/dri ${libdir}/xorg/modules/drivers"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug"
+FILES_${PN}-dbg += "${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug ${libdir}/gstreamer-0.10/.debug"
 
 S = "${WORKDIR}/${EMGD_RPM_DIR}"
 
Signature · 1 line
1.7.3.4
#6 lore raw

PATCH 4/7 crownbay: update emgd driver version in the README

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

---
 meta-crownbay/README |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
meta-crownbay/README +4 -4
index b56c79a..2521432 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.10 Driver.
+Embedded Media and Graphics Driver (EMGD) 1.14 Driver.
 
 
 Dependencies
@@ -63,7 +63,7 @@ common metadata shared between BSPs) 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.10 graphics driver, while the one prefixed
+Intel-proprietary EMGD 1.14 graphics driver, while the one prefixed
 with 'crownbay-noemgd' does not.
 
 If you want to enable the layer that supports EMGD graphics add the
@@ -73,10 +73,10 @@ following to the local.conf file:
 
 The 'crownbay' machine includes the emgd-driver-bin package, which has
 a proprietary license that must be whitelisted by adding the string
-"license_emgd-driver-bin_1.10" to the LICENSE_FLAGS_WHITELIST variable
+"license_emgd-driver-bin_1.14" to the LICENSE_FLAGS_WHITELIST variable
 in your local.conf.  For example:
 
-  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.10"
+  LICENSE_FLAGS_WHITELIST = "license_emgd-driver-bin_1.14"
 
 If you want to enable the layer that does not support EMGD graphics
 add the following to the local.conf file:
Signature · 1 line
1.7.3.4
#7 lore raw

PATCH 5/7 crownbay: add recipe extension for linux-yocto-3.4

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

---
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |   26 ++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend
meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend new file +26 -0
new file mode 100644
index 0000000..86f8c79
@@ -0,0 +1,26 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_crownbay = "crownbay"
+KMACHINE_crownbay  = "crownbay"
+KBRANCH_crownbay  = "standard/default/crownbay"
+
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd  = "crownbay"
+KBRANCH_crownbay-noemgd  = "standard/crownbay"
+
+SRCREV_machine_pn-linux-yocto_crownbay ?= "6297e4c1d57e1063bfce297c2e12392348598559"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "31f082cd1ad3f52d0ec07526084199fe8eb76a1b"
+
+SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "6297e4c1d57e1063bfce297c2e12392348598559"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "31f082cd1ad3f52d0ec07526084199fe8eb76a1b"
+
+# It is often nice to have a local clone of the kernel repos, to
+# allow patches to be staged, branches created, etc. Modify
+
+# KSRC_linux_yocto_3_4 to point to your local clone as appropriate.
+KSRC_linux_yocto_3_4 ?= "/srv/home/nitin/prj/linux-yocto-3.4.git"
+SRC_URI = "git://${KSRC_linux_yocto_3_4};protocol=file;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+
+#SRCREV_machine_${MACHINE}="${AUTOREV}"
+#SRCREV_meta="${AUTOREV}"
+LOCALCOUNT = "0"
Signature · 1 line
1.7.3.4
#8 lore raw

PATCH 6/7 crownbay: make v3.4 the default kernel

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

---
 meta-crownbay/conf/machine/crownbay-noemgd.conf |    2 +-
 meta-crownbay/conf/machine/crownbay.conf        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-crownbay/conf/machine/crownbay-noemgd.conf +1 -1
index af85b00..4c869ee 100644
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Crown Bay systems, without Intel-proprietary graphics bits
 # i.e. E660 + EG20T
 
-PREFERRED_VERSION_linux-yocto ?= "3.2%"
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
 
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
meta-crownbay/conf/machine/crownbay.conf +1 -1
index a39d037..7d5e597 100644
@@ -4,7 +4,7 @@
 #@DESCRIPTION: Machine configuration for Crown Bay systems
 # i.e. E660 + EG20T
 
-PREFERRED_VERSION_linux-yocto ?= "3.2%"
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
 
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
Signature · 1 line
1.7.3.4
#9 lore raw

PATCH 7/7 crownbay: update kernel meta SRC_REV

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

---
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-crownbay/recipes-kernel/linux/linux-yocto_3.4.bbappend +2 -2
index 86f8c79..b7711b3 100644
@@ -9,10 +9,10 @@ KMACHINE_crownbay-noemgd  = "crownbay"
 KBRANCH_crownbay-noemgd  = "standard/crownbay"
 
 SRCREV_machine_pn-linux-yocto_crownbay ?= "6297e4c1d57e1063bfce297c2e12392348598559"
-SRCREV_meta_pn-linux-yocto_crownbay ?= "31f082cd1ad3f52d0ec07526084199fe8eb76a1b"
+SRCREV_meta_pn-linux-yocto_crownbay ?= "7af6129aeecf1a10b3133414f1b097c71748b2af"
 
 SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= "6297e4c1d57e1063bfce297c2e12392348598559"
-SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "31f082cd1ad3f52d0ec07526084199fe8eb76a1b"
+SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= "7af6129aeecf1a10b3133414f1b097c71748b2af"
 
 # It is often nice to have a local clone of the kernel repos, to
 # allow patches to be staged, branches created, etc. Modify
Signature · 1 line
1.7.3.4