Re: [yocto] glib-2.0-native build fails on bernard
I had the same issue on 64-bit fedora R15. This patch fixed it for me: http://patchwork.openembedded.org/patch/8233/ - Jani Uusi-Rantala From: yocto-boun...@yoctoproject.org [yocto-boun...@yoctoproject.org] on behalf of ext Andre Haupt [an...@bitwigglers.org] Sent: Friday, August 12, 2011 11:26 To: yocto@yoctoproject.org Subject: [yocto] glib-2.0-native build fails on bernard Hi all, Bitbake glib-2.0-native for the qemux86 target on poky bernard fails with: octo-git/builds/qemux86-bernard/tmp/sysroots/x86_64-linux/usr/lib | ./.libs/libglib-2.0.so: undefined reference to `GLIB_SLICE_ALLOC' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_REALLOC' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_SLICE_FREE' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_ALLOC' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_FREE' | ./.libs/libglib-2.0.so: undefined reference to `GLIB_QUARK_NEW' | collect2: ld returned 1 exit status | make[4]: *** [gtester] Error 1 | make[4]: Leaving directory `/home/ahaupt/yocto-git/builds/qemux86-bernard/tmp/work/x86_64-linux/glib-2.0-native-1_2.26.1-r0/glib-2.26.1/glib' | make[3]: *** [all-recursive] Error 1 | make[3]: Leaving directory `/home/ahaupt/yocto-git/builds/qemux86-bernard/tmp/work/x86_64-linux/glib-2.0-native-1_2.26.1-r0/glib-2.26.1/glib' | make[2]: *** [all] Error 2 | make[2]: Leaving directory `/home/ahaupt/yocto-git/builds/qemux86-bernard/tmp/work/x86_64-linux/glib-2.0-native-1_2.26.1-r0/glib-2.26.1/glib' | make[1]: *** [all-recursive] Error 1 | make[1]: Leaving directory `/home/ahaupt/yocto-git/builds/qemux86-bernard/tmp/work/x86_64-linux/glib-2.0-native-1_2.26.1-r0/glib-2.26.1' | make: *** [all] Error 2 | FATAL: oe_runmake failed | ERROR: Function 'do_compile' failed (see /home/ahaupt/yocto-git/builds/qemux86-bernard/tmp/work/x86_64-linux/glib-2.0-native-1_2.26.1-r0/temp/log.do_compile.20434 for further information) NOTE: package glib-2.0-native-1_2.26.1-r0: task do_compile: Failed ERROR: Task 8 (virtual:native:/home/ahaupt/yocto-git/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb, do_compile) failed with exit code '1' This is on a freshly set up Fedora 15 x86-64 build host. I am using the bernard branch of git.yoctoproject.org/poky.git. What do i miss here? cheers, Andre ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] bbappend - Where should my file be?
Scott / Bruce, On 12 Aug 2011, at 00:57, Scott Garman wrote: cp: cannot stat `/home/chris/yocto/yocto-versions/laverne-4.0.1/meta/recipes-kernel/ linux/files/defconfig': No such file or directory It looks like this is where the file is expected. I believe also meta/recipes-kernel/linux/linux/defconfig should also work. I should have mentioned that ;-) As the bbappend file is in my layer, I was expecting (and want) the defconfig file to be stored/found in it. I created this layer by copying another one that I've got. It's unpack log shows: NOTE: Unpacking /home/chris/yocto/yocto-downloads/ git_git.pokylinux.org.linux-2.6-windriver.git.tar.gz to /home/chris/ yocto/sjs-build/tmp/work/LX800-poky-linux/linux- wrs -2.6.34 + git0 + b67e060194a38c6331da1532bd06446087a42b3b_0 +0431115c9d720fee5bb105f6a7411efb4f851d26-r12/ NOTE: Unpacking /home/chris/yocto/meta-keylevel-sjs/recipes/linux/ linux-wrs/defconfig to /home/chris/yocto/sjs-build/tmp/work/LX800-poky- linux/linux- wrs -2.6.34 + git0 + b67e060194a38c6331da1532bd06446087a42b3b_0 +0431115c9d720fee5bb105f6a7411efb4f851d26-r12/ I suspect I've got something configured wrong with the new layer, but... On 12 Aug 2011, at 01:28, Bruce Ashfield wrote: I believe also meta/recipes-kernel/linux/linux/defconfig should also work. Yep, bitbake is telling us where it is looking. The -wrs_git is the extension to the recipe, so that isn't where it is looking. Sorry Bruce, that was a typo (see working log above for a layer that works). I've tried using: MyLayer/recipies/linux/defconfig MyLayer/recipies/linux/files/defconfig (with no FILESEXTRAPATHS) MyLayer/recipies/linux/linux-wrs/defconfig On another note, there's been a lot of fixes to the kern tools to improve the process for adding BSPs and extending the tree (and one defconfig bug fix), so I'll be interested to hear how this goes. I'm planning to give it a try after the next release. I'm currently just trying to migrate an existing (4.0.1) project to a new platform and decided to add a new layer rather than change version at the same time. Chris Tapp opensou...@keylevel.com www.keylevel.com ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] glib-2.0-native build fails on bernard
On Fri, Aug 12, 2011 at 08:32:17AM +, jani.uusi-rant...@nokia.com wrote: I had the same issue on 64-bit fedora R15. This patch fixed it for me: http://patchwork.openembedded.org/patch/8233/ for bernard (with MACHINE ??= qemux86 and DISTRO ?= poky) glib-2.0_2.26.1.bb is pulled in, so the above patch does not apply. I tried something similar: diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb index eace71a..e8964d9 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb @@ -1,7 +1,7 @@ require glib.inc PE = 1 -PR = r0 +PR = r1 SRC_URI = http://ftp.gnome.org/pub/GNOME/sources/glib/2.26/glib-${PV}.tar.bz2 \ file://configure-libtool.patch \ @@ -14,3 +14,5 @@ SRC_URI[sha256sum] = 7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e51562 SRC_URI_append_virtclass-native = file://glib-gettextize-dir.patch BBCLASSEXTEND = native + +EXTRA_OECONF_append = --enable-dtrace=no Unfortunately that does not help. cheers, Andre ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] bbappend - Where should my file be?
On 11-08-12 04:20 AM, Chris Tapp wrote: Scott / Bruce, On 12 Aug 2011, at 00:57, Scott Garman wrote: cp: cannot stat `/home/chris/yocto/yocto-versions/laverne-4.0.1/meta/recipes-kernel/linux/files/defconfig': No such file or directory It looks like this is where the file is expected. I believe also meta/recipes-kernel/linux/linux/defconfig should also work. I should have mentioned that ;-) As the bbappend file is in my layer, I was expecting (and want) the defconfig file to be stored/found in it. I created this layer by copying another one that I've got. It's unpack log shows: hah. For some reason that flew right over my head. Must be the 500 email I read a day :) NOTE: Unpacking /home/chris/yocto/yocto-downloads/git_git.pokylinux.org.linux-2.6-windriver.git.tar.gz to /home/chris/yocto/sjs-build/tmp/work/LX800-poky-linux/linux-wrs-2.6.34+git0+b67e060194a38c6331da1532bd06446087a42b3b_0+0431115c9d720fee5bb105f6a7411efb4f851d26-r12/ NOTE: Unpacking /home/chris/yocto/meta-keylevel-sjs/recipes/linux/linux-wrs/defconfig to /home/chris/yocto/sjs-build/tmp/work/LX800-poky-linux/linux-wrs-2.6.34+git0+b67e060194a38c6331da1532bd06446087a42b3b_0+0431115c9d720fee5bb105f6a7411efb4f851d26-r12/ That does look right! I suspect I've got something configured wrong with the new layer, but... On 12 Aug 2011, at 01:28, Bruce Ashfield wrote: I believe also meta/recipes-kernel/linux/linux/defconfig should also work. Yep, bitbake is telling us where it is looking. The -wrs_git is the extension to the recipe, so that isn't where it is looking. Sorry Bruce, that was a typo (see working log above for a layer that works). I've tried using: MyLayer/recipies/linux/defconfig MyLayer/recipies/linux/files/defconfig (with no FILESEXTRAPATHS) MyLayer/recipies/linux/linux-wrs/defconfig On another note, there's been a lot of fixes to the kern tools to improve the process for adding BSPs and extending the tree (and one defconfig bug fix), so I'll be interested to hear how this goes. I'm planning to give it a try after the next release. I'm currently just trying to migrate an existing (4.0.1) project to a new platform and decided to add a new layer rather than change version at the same time. Sounds good. Bruce Chris Tapp opensou...@keylevel.com www.keylevel.com ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [PATCH 3/2] rt: simplify linux-yocto-rt.bbappend for all BSPs
[rather than rebase, I've added this one to the series, here for review as well] As the all the BSPs use the same BSP branch and meta commit ID as the base recipe, there is no need specify the KBRANCH and SRCREVs. Not doing so greatly simplifies maintenance. Leaving the syntax in place, but commented out, serves as documentation should the need arise to use a different BSP branch or meta commit ID. Signed-off-by: Darren Hart dvh...@linux.intel.com --- .../linux/linux-yocto-rt_3.0.bbappend |7 --- .../linux/linux-yocto-rt_3.0.bbappend |7 --- .../linux/linux-yocto-rt_3.0.bbappend |7 --- .../linux/linux-yocto-rt_3.0.bbappend |7 --- .../linux/linux-yocto-rt_3.0.bbappend |7 --- .../linux/linux-yocto-rt_3.0.bbappend |7 --- .../linux/linux-yocto-rt_3.0.bbappend |7 --- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend index c257703..aaf5614 100644 --- a/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend @@ -1,9 +1,10 @@ FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}: COMPATIBLE_MACHINE_crownbay-noemgd = crownbay-noemgd KMACHINE_crownbay-noemgd = crownbay -KBRANCH_crownbay-noemgd = yocto/standard/preempt-rt/base KERNEL_FEATURES_append_crownbay-noemgd += cfg/smp.scc -SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= ${AUTOREV} -SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= ${AUTOREV} +# Update the following to use a different BSP branch or meta SRCREV +#KBRANCH_crownbay-noemgd = yocto/standard/preempt-rt/base +#SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= +#SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= diff --git a/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend index fbff72d..fce01cb 100644 --- a/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +++ b/meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend @@ -1,7 +1,8 @@ FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}: COMPATIBLE_MACHINE_emenlow = emenlow KMACHINE_emenlow = emenlow -KBRANCH_emenlow = yocto/standard/preempt-rt/base -SRCREV_machine_pn-linux-yocto-rt_emenlow ?= ${AUTOREV} -SRCREV_meta_pn-linux-yocto-rt_emenlow ?= ${AUTOREV} +# Update the following to use a different BSP branch or meta SRCREV +#KBRANCH_emenlow = yocto/standard/preempt-rt/base +#SRCREV_machine_pn-linux-yocto-rt_emenlow ?= +#SRCREV_meta_pn-linux-yocto-rt_emenlow ?= diff --git a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend index 4b1a2e1..7a502bd 100644 --- a/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +++ b/meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend @@ -1,7 +1,8 @@ FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}: COMPATIBLE_MACHINE_fishriver = fishriver KMACHINE_fishriver = fishriver -KBRANCH_fishriver = yocto/standard/preempt-rt/base -SRCREV_machine_pn-linux-yocto-rt_fishriver ?= ${AUTOREV} -SRCREV_meta_pn-linux-yocto-rt_fishriver ?= ${AUTOREV} +# Update the following to use a different BSP branch or meta SRCREV +#KBRANCH_fishriver = yocto/standard/preempt-rt/base +#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= +#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= diff --git a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend index 13b68a3..2624176 100644 --- a/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +++ b/meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend @@ -1,7 +1,8 @@ FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}: COMPATIBLE_MACHINE_fri2 = fri2 KMACHINE_fri2 = fri2 -KBRANCH_fri2 = yocto/standard/preempt-rt/base -SRCREV_machine_pn-linux-yocto-rt_fri2 ?= ${AUTOREV} -SRCREV_meta_pn-linux-yocto-rt_fri2 ?= ${AUTOREV} +# Update the following to use a different BSP branch or meta SRCREV +#KBRANCH_fri2 = yocto/standard/preempt-rt/base +#SRCREV_machine_pn-linux-yocto-rt_fri2 ?= +#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= diff --git a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend index ac18db0..1ddc78f 100644 --- a/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +++ b/meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend @@ -1,7 +1,8 @@ FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}: COMPATIBLE_MACHINE_jasperforest = jasperforest KMACHINE_jasperforest = jasperforest -KBRANCH_jasperforest = yocto/standard/preempt-rt/base -SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
[yocto] core-image-rt building a lot more packages than expected
I have been surprised over the last few days at the number of packages being built for the core-image-rt target, which for reference is as follows: # # Copyright (C) 2010 Intel Corporation. # DESCRIPTION = Real-Time Linux Image DEPENDS = linux-yocto-rt require recipes-core/images/core-image-minimal.bb IMAGE_INSTALL += rt-tests LICENSE = MIT The only dependencies of rt-tests are: DEPENDS = linux-libc-headers eglibc Building core-image-rt schedules 3154 tasks, and among them are things like: lttng-viewer gst-plugins-base (bad, good, etc) gtk+ libogg libtheora owl-video clutter libglade librsvg mesa-demos x11-perf xvideo-tests etc etc etc I noticed my local.conf contains: EXTRA_IMAGE_FEATURES = tools-debug tools-profile tools-testapps debug-tweaks That hasn't changed in a while, but perhaps those features now pull in more than they used to? Or if they don't, are we unintentionally pulling in a lot more packages for what is essentially a minimal image? Thanks, -- Darren Hart Intel Open Source Technology Center Yocto Project - Linux Kernel ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] core-image-rt building a lot more packages than expected
On Fri, 2011-08-12 at 09:27 -0700, Darren Hart wrote: I have been surprised over the last few days at the number of packages being built for the core-image-rt target, which for reference is as follows: # # Copyright (C) 2010 Intel Corporation. # DESCRIPTION = Real-Time Linux Image DEPENDS = linux-yocto-rt require recipes-core/images/core-image-minimal.bb IMAGE_INSTALL += rt-tests LICENSE = MIT The only dependencies of rt-tests are: DEPENDS = linux-libc-headers eglibc Building core-image-rt schedules 3154 tasks, and among them are things like: lttng-viewer gst-plugins-base (bad, good, etc) gtk+ libogg libtheora owl-video clutter libglade librsvg mesa-demos x11-perf xvideo-tests etc etc etc I noticed my local.conf contains: EXTRA_IMAGE_FEATURES = tools-debug tools-profile tools-testapps debug-tweaks That hasn't changed in a while, but perhaps those features now pull in more than they used to? Or if they don't, are we unintentionally pulling in a lot more packages for what is essentially a minimal image? If you enable those things they do get pulled into images and some of the dependency chains are pretty heavy. They are no longer default in local.conf though. Cheers, Richard ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 0/3][KERNEL] yocto/emgd: add emgd 1.8
From: Tom Zanussi tom.zanu...@intel.com This patchset adds emgd 1.8 to yocto/emgd. Please pull into linux-yocto-3.0/yocto/emgd. Thanks, Tom The following changes are available in the git repository at: git://git.yoctoproject.org/linux-yocto-2.6.37-contrib.git tzanussi/emgd-linux-yocto-3.0 http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/emgd-linux-yocto-3.0 Tom Zanussi (3): yocto/emgd: emgd 1.8 driver yocto/emgd: build fixups yocto/emgd: 3.0 fixes drivers/gpu/drm/Kconfig|9 + drivers/gpu/drm/Makefile |1 + drivers/gpu/drm/emgd/Makefile | 284 ++ drivers/gpu/drm/emgd/emgd/cfg/config.h | 126 + drivers/gpu/drm/emgd/emgd/cfg/config_default.h | 197 + drivers/gpu/drm/emgd/emgd/cfg/config_helper.c | 239 ++ .../gpu/drm/emgd/emgd/core/init/cmn/igd_global.c | 34 + drivers/gpu/drm/emgd/emgd/core/init/cmn/igd_init.c | 915 + .../drm/emgd/emgd/core/init/cmn/init_dispatch.h| 65 + drivers/gpu/drm/emgd/emgd/core/init/plb/init_plb.c | 458 +++ .../drm/emgd/emgd/core/init/plb/micro_init_plb.c | 626 drivers/gpu/drm/emgd/emgd/core/init/tnc/init_tnc.c | 619 .../drm/emgd/emgd/core/init/tnc/micro_init_tnc.c | 993 ++ drivers/gpu/drm/emgd/emgd/display/dsp/cmn/dsp.c| 2350 .../drm/emgd/emgd/display/dsp/cmn/dsp_dispatch.h | 61 + .../gpu/drm/emgd/emgd/display/dsp/plb/dsp_plb.c| 664 .../gpu/drm/emgd/emgd/display/dsp/tnc/dsp_tnc.c| 496 +++ .../gpu/drm/emgd/emgd/display/mode/cmn/igd_mode.c | 2195 drivers/gpu/drm/emgd/emgd/display/mode/cmn/match.c | 1317 +++ drivers/gpu/drm/emgd/emgd/display/mode/cmn/match.h | 49 + .../drm/emgd/emgd/display/mode/cmn/micro_mode.c| 1694 + .../drm/emgd/emgd/display/mode/cmn/mode_dispatch.h | 358 ++ .../gpu/drm/emgd/emgd/display/mode/cmn/vga_mode.c | 1291 +++ .../drm/emgd/emgd/display/mode/plb/clocks_plb.c| 511 +++ .../emgd/emgd/display/mode/plb/micro_mode_plb.c| 1389 .../gpu/drm/emgd/emgd/display/mode/plb/mode_plb.c | 1887 ++ .../drm/emgd/emgd/display/mode/tnc/clocks_tnc.c| 820 + .../emgd/emgd/display/mode/tnc/micro_mode_tnc.c| 2762 +++ .../gpu/drm/emgd/emgd/display/mode/tnc/mode_tnc.c | 1908 ++ drivers/gpu/drm/emgd/emgd/display/pd/cmn/pd.c | 516 +++ .../gpu/drm/emgd/emgd/display/pi/cmn/displayid.c | 1058 ++ drivers/gpu/drm/emgd/emgd/display/pi/cmn/edid.c| 1187 +++ .../drm/emgd/emgd/display/pi/cmn/i2c_dispatch.h| 76 + drivers/gpu/drm/emgd/emgd/display/pi/cmn/igd_pi.c | 260 ++ .../gpu/drm/emgd/emgd/display/pi/cmn/mode_table.c | 2547 + .../gpu/drm/emgd/emgd/display/pi/cmn/pd_init_all.c | 205 ++ drivers/gpu/drm/emgd/emgd/display/pi/cmn/pi.c | 1796 ++ drivers/gpu/drm/emgd/emgd/display/pi/plb/i2c_plb.c | 940 + .../drm/emgd/emgd/display/pi/tnc/i2c_bitbash_tnc.c | 588 +++ .../drm/emgd/emgd/display/pi/tnc/i2c_gmbus_tnc.c | 926 + drivers/gpu/drm/emgd/emgd/drm/drm_emgd_private.h | 146 + drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c | 1982 +++ drivers/gpu/drm/emgd/emgd/drm/emgd_drv.h | 182 + drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c| 654 drivers/gpu/drm/emgd/emgd/drm/emgd_interface.c | 2324 drivers/gpu/drm/emgd/emgd/drm/emgd_mmap.c | 186 + drivers/gpu/drm/emgd/emgd/drm/emgd_test_pvrsrv.c | 1370 +++ drivers/gpu/drm/emgd/emgd/drm/image_data.h | 33 + drivers/gpu/drm/emgd/emgd/drm/splash_screen.c | 1714 + drivers/gpu/drm/emgd/emgd/drm/splash_screen.h | 206 ++ drivers/gpu/drm/emgd/emgd/drm/user_config.c| 323 ++ drivers/gpu/drm/emgd/emgd/drm/user_config.h| 111 + drivers/gpu/drm/emgd/emgd/gmm/gmm.c| 812 + drivers/gpu/drm/emgd/emgd/gmm/gtt.c| 445 +++ drivers/gpu/drm/emgd/emgd/include/cmd.h| 47 + drivers/gpu/drm/emgd/emgd/include/context.h| 248 ++ drivers/gpu/drm/emgd/emgd/include/debug.h | 169 + drivers/gpu/drm/emgd/emgd/include/decode.h | 76 + drivers/gpu/drm/emgd/emgd/include/dispatch.h | 59 + drivers/gpu/drm/emgd/emgd/include/dispatch_utils.h | 78 + drivers/gpu/drm/emgd/emgd/include/displayid.h | 644 drivers/gpu/drm/emgd/emgd/include/dsp.h| 46 + drivers/gpu/drm/emgd/emgd/include/edid.h | 130 + drivers/gpu/drm/emgd/emgd/include/general.h| 84 + drivers/gpu/drm/emgd/emgd/include/instr_common.h | 54 + drivers/gpu/drm/emgd/emgd/include/intelpci.h | 98 + drivers/gpu/drm/emgd/emgd/include/math_fix.h | 59 + drivers/gpu/drm/emgd/emgd/include/memlist.h| 150 + drivers/gpu/drm/emgd/emgd/include/memory.h | 421 +++ drivers/gpu/drm/emgd/emgd/include/mode.h | 305 ++
[yocto] [PATCH 1/3][KERNEL] yocto/emgd: emgd 1.8 driver
From: Tom Zanussi tom.zanu...@intel.com The starting-point code that subsequent patches will modify. This is a straight copy of the code in the emgd 1.8 emgd driver, specifically IEMGD_HEAD_Linux/common/drm/emgd_drm.tgz from Lin_EMGD_1_8_RC_2032.tgz, the 'Linux Tar Ball' release downloaded from http://edc.intel.com/Software/Downloads/EMGD/. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- drivers/gpu/drm/emgd/Makefile | 316 ++ drivers/gpu/drm/emgd/emgd/cfg/config.h | 126 + drivers/gpu/drm/emgd/emgd/cfg/config_default.h | 197 + drivers/gpu/drm/emgd/emgd/cfg/config_helper.c | 239 ++ .../gpu/drm/emgd/emgd/core/init/cmn/igd_global.c | 34 + drivers/gpu/drm/emgd/emgd/core/init/cmn/igd_init.c | 915 + .../drm/emgd/emgd/core/init/cmn/init_dispatch.h| 65 + drivers/gpu/drm/emgd/emgd/core/init/plb/init_plb.c | 458 +++ .../drm/emgd/emgd/core/init/plb/micro_init_plb.c | 626 drivers/gpu/drm/emgd/emgd/core/init/tnc/init_tnc.c | 619 .../drm/emgd/emgd/core/init/tnc/micro_init_tnc.c | 993 ++ drivers/gpu/drm/emgd/emgd/display/dsp/cmn/dsp.c| 2350 .../drm/emgd/emgd/display/dsp/cmn/dsp_dispatch.h | 61 + .../gpu/drm/emgd/emgd/display/dsp/plb/dsp_plb.c| 664 .../gpu/drm/emgd/emgd/display/dsp/tnc/dsp_tnc.c| 496 +++ .../gpu/drm/emgd/emgd/display/mode/cmn/igd_mode.c | 2195 drivers/gpu/drm/emgd/emgd/display/mode/cmn/match.c | 1317 +++ drivers/gpu/drm/emgd/emgd/display/mode/cmn/match.h | 49 + .../drm/emgd/emgd/display/mode/cmn/micro_mode.c| 1694 + .../drm/emgd/emgd/display/mode/cmn/mode_dispatch.h | 358 ++ .../gpu/drm/emgd/emgd/display/mode/cmn/vga_mode.c | 1291 +++ .../drm/emgd/emgd/display/mode/plb/clocks_plb.c| 511 +++ .../emgd/emgd/display/mode/plb/micro_mode_plb.c| 1389 .../gpu/drm/emgd/emgd/display/mode/plb/mode_plb.c | 1887 ++ .../drm/emgd/emgd/display/mode/tnc/clocks_tnc.c| 820 + .../emgd/emgd/display/mode/tnc/micro_mode_tnc.c| 2762 +++ .../gpu/drm/emgd/emgd/display/mode/tnc/mode_tnc.c | 1908 ++ drivers/gpu/drm/emgd/emgd/display/pd/cmn/pd.c | 516 +++ .../gpu/drm/emgd/emgd/display/pi/cmn/displayid.c | 1058 ++ drivers/gpu/drm/emgd/emgd/display/pi/cmn/edid.c| 1187 +++ .../drm/emgd/emgd/display/pi/cmn/i2c_dispatch.h| 76 + drivers/gpu/drm/emgd/emgd/display/pi/cmn/igd_pi.c | 260 ++ .../gpu/drm/emgd/emgd/display/pi/cmn/mode_table.c | 2547 + .../gpu/drm/emgd/emgd/display/pi/cmn/pd_init_all.c | 205 ++ drivers/gpu/drm/emgd/emgd/display/pi/cmn/pi.c | 1796 ++ drivers/gpu/drm/emgd/emgd/display/pi/plb/i2c_plb.c | 940 + .../drm/emgd/emgd/display/pi/tnc/i2c_bitbash_tnc.c | 588 +++ .../drm/emgd/emgd/display/pi/tnc/i2c_gmbus_tnc.c | 926 + drivers/gpu/drm/emgd/emgd/drm/drm_emgd_private.h | 146 + drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c | 1982 +++ drivers/gpu/drm/emgd/emgd/drm/emgd_drv.h | 182 + drivers/gpu/drm/emgd/emgd/drm/emgd_fb.c| 654 drivers/gpu/drm/emgd/emgd/drm/emgd_interface.c | 2324 drivers/gpu/drm/emgd/emgd/drm/emgd_mmap.c | 186 + drivers/gpu/drm/emgd/emgd/drm/emgd_test_pvrsrv.c | 1370 +++ drivers/gpu/drm/emgd/emgd/drm/image_data.h | 33 + drivers/gpu/drm/emgd/emgd/drm/splash_screen.c | 1714 + drivers/gpu/drm/emgd/emgd/drm/splash_screen.h | 206 ++ drivers/gpu/drm/emgd/emgd/drm/user_config.c| 323 ++ drivers/gpu/drm/emgd/emgd/drm/user_config.h| 111 + drivers/gpu/drm/emgd/emgd/gmm/gmm.c| 812 + drivers/gpu/drm/emgd/emgd/gmm/gtt.c| 445 +++ drivers/gpu/drm/emgd/emgd/include/cmd.h| 47 + drivers/gpu/drm/emgd/emgd/include/context.h| 248 ++ drivers/gpu/drm/emgd/emgd/include/debug.h | 169 + drivers/gpu/drm/emgd/emgd/include/decode.h | 76 + drivers/gpu/drm/emgd/emgd/include/dispatch.h | 59 + drivers/gpu/drm/emgd/emgd/include/dispatch_utils.h | 78 + drivers/gpu/drm/emgd/emgd/include/displayid.h | 644 drivers/gpu/drm/emgd/emgd/include/dsp.h| 46 + drivers/gpu/drm/emgd/emgd/include/edid.h | 130 + drivers/gpu/drm/emgd/emgd/include/general.h| 84 + drivers/gpu/drm/emgd/emgd/include/instr_common.h | 54 + drivers/gpu/drm/emgd/emgd/include/intelpci.h | 98 + drivers/gpu/drm/emgd/emgd/include/math_fix.h | 59 + drivers/gpu/drm/emgd/emgd/include/memlist.h| 150 + drivers/gpu/drm/emgd/emgd/include/memory.h | 421 +++ drivers/gpu/drm/emgd/emgd/include/mode.h | 305 ++ drivers/gpu/drm/emgd/emgd/include/mode_access.h| 52 + drivers/gpu/drm/emgd/emgd/include/module_init.h| 109 + drivers/gpu/drm/emgd/emgd/include/msvdx.h | 241 ++ drivers/gpu/drm/emgd/emgd/include/pci.h|
[yocto] [PATCH 2/3][KERNEL] yocto/emgd: build fixups
From: Tom Zanussi tom.zanu...@intel.com Add emgd config option (DRM_EGD) and modify Makefiles for in-tree builds. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- drivers/gpu/drm/Kconfig |9 + drivers/gpu/drm/Makefile |1 + drivers/gpu/drm/emgd/Makefile | 40 3 files changed, 14 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index b493663..9755c11 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -158,3 +158,12 @@ config DRM_SAVAGE help Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister chipset. If M is selected the module will be called savage. + +config DRM_EGD + tristate Intel EMGD + depends on DRM + select DRM_KMS_HELPER + help + Choose this option if you have an EMGD-supported chipset + (Intel E6xx or System Controller Hub US15W/US15WP/WPT). + If M is selected the module will be called emgd. diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 89cf05a..64d2e2e 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -35,4 +35,5 @@ obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ obj-$(CONFIG_DRM_VIA) +=via/ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/ +obj-$(CONFIG_DRM_EGD) +=emgd/ obj-y += i2c/ diff --git a/drivers/gpu/drm/emgd/Makefile b/drivers/gpu/drm/emgd/Makefile index d673fe9..320bed6 100755 --- a/drivers/gpu/drm/emgd/Makefile +++ b/drivers/gpu/drm/emgd/Makefile @@ -24,10 +24,6 @@ # export EGD_TOPLEVEL = DRM Driver -KERNELVER ?= $(shell uname -r) -KERNELDIR ?= /lib/modules/$(KERNELVER)/build -INSTALLDIR ?= /lib/modules/$(KERNELVER)/kernel/drivers/gpu/drm/emgd - BLUE = \033[34m OFF = \033[0m BUILD ?= release @@ -35,7 +31,7 @@ CONFIG_PVR_RELEASE ?= $(BUILD) CONFIG_DRM_EGD ?= m # Get the include paths pointed to the right place. -export EMGD_MOD_DIR ?= $(CURDIR) +export EMGD_MOD_DIR ?= $(obj) # Note the hardcoded '2.6.32-5' directory is a temporary hack for Debian # which structures its kernel headers package into two different @@ -53,6 +49,7 @@ PROJECT_INCLUDES = \ -I$(EMGD_MOD_DIR)/emgd/pal/lpd \ -I$(EMGD_MOD_DIR)/emgd/drm \ -I$(KERNELDIR)/include/drm \ + -Iinclude/drm \ -I/usr/src/linux-headers-2.6.32-5-common/include/drm \ -I$(EMGD_MOD_DIR)/pvr/include4 \ -I$(EMGD_MOD_DIR)/pvr/services4/include \ @@ -125,6 +122,8 @@ ifeq ($(PDUMP),1) EXTRA_CFLAGS += -DPDUMP=1 endif +ccflags-y += $(EXTRA_CFLAGS) + EMGD_OBJS := \ emgd/drm/emgd_fb.o \ emgd/drm/emgd_mmap.o \ @@ -283,34 +282,3 @@ ifeq ($(PDUMP),1) endif obj-$(CONFIG_DRM_EGD) += emgd.o - -all:: clean modules - -modules:: - @echo $(CURDIR) -- $(CONFIG_PVR_RELEASE) - @echo $(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules - @$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules - -clean:: - @rm -f $(emgd-y) - @rm -f emgd.o emgd.mod.* emgd.ko Module.* modules.order - @find . -name *.cmd -exec rm '{}' \; - -install:: - install -o root -g root -m 755 -d $(INSTALLDIR) - install -o root -g root -m 744 emgd.ko $(INSTALLDIR) - /sbin/depmod -a - -uninstall:: - rmmod $(INSTALLDIR)/emgd.ko - rm -rf $(INSTALLDIR)/emgd.ko - /sbin/depmod -a - -debug:: - export CONFIG_PVR_RELEASE=debug; $(MAKE) modules - -package:: clean - @echo -e $(BLUE)Packaging $(EGD_TOPLEVEL)$(OFF); - mkdir -p $(EGD_PKG) - tar -C $(EMGD_MOD_DIR) --exclude CVS -czf $(EGD_PKG)/emgd_drm.tgz * - -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 3/3][KERNEL] yocto/emgd: 3.0 fixes
From: Tom Zanussi tom.zanu...@intel.com Fixes required for migration to Linux 3.0. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- .../gpu/drm/emgd/emgd/display/mode/plb/mode_plb.c |2 +- .../gpu/drm/emgd/emgd/display/mode/tnc/mode_tnc.c |2 +- drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c | 12 ++-- .../drm/emgd/pvr/services4/srvkm/common/resman.c |4 .../drm/emgd/pvr/services4/srvkm/env/linux/event.c |4 .../drm/emgd/pvr/services4/srvkm/env/linux/mm.c|4 .../drm/emgd/pvr/services4/srvkm/env/linux/mm.h|4 .../drm/emgd/pvr/services4/srvkm/env/linux/mmap.c |4 .../emgd/pvr/services4/srvkm/env/linux/module.c|4 .../emgd/pvr/services4/srvkm/env/linux/mutils.c|3 --- .../emgd/pvr/services4/srvkm/env/linux/mutils.h|4 .../emgd/pvr/services4/srvkm/env/linux/osfunc.c| 13 ++--- .../drm/emgd/pvr/services4/srvkm/env/linux/proc.c |4 .../emgd/pvr/services4/srvkm/env/linux/pvr_debug.c |6 +- .../emgd/pvr/services4/srvkm/env/linux/pvr_drm.c |4 15 files changed, 11 insertions(+), 63 deletions(-) diff --git a/drivers/gpu/drm/emgd/emgd/display/mode/plb/mode_plb.c b/drivers/gpu/drm/emgd/emgd/display/mode/plb/mode_plb.c index 87ab2b8..bda3dc7 100644 --- a/drivers/gpu/drm/emgd/emgd/display/mode/plb/mode_plb.c +++ b/drivers/gpu/drm/emgd/emgd/display/mode/plb/mode_plb.c @@ -73,7 +73,7 @@ static unsigned long vblank_interrupt_state = 0; /* Spin lock for synchronization of the vblank_interrupt_state variable, * between the VBlank interrupt handler and the non-interrupt handler code: */ -static spinlock_t vblank_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(vblank_lock); diff --git a/drivers/gpu/drm/emgd/emgd/display/mode/tnc/mode_tnc.c b/drivers/gpu/drm/emgd/emgd/display/mode/tnc/mode_tnc.c index 653d511..656ed44 100644 --- a/drivers/gpu/drm/emgd/emgd/display/mode/tnc/mode_tnc.c +++ b/drivers/gpu/drm/emgd/emgd/display/mode/tnc/mode_tnc.c @@ -84,7 +84,7 @@ static unsigned long vblank_interrupt_state = 0; /* Spin lock for synchronization of the vblank_interrupt_state variable, * between the VBlank interrupt handler and the non-interrupt handler code: */ -static spinlock_t vblank_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(vblank_lock); diff --git a/drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c b/drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c index 301747c..87acb78 100644 --- a/drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c +++ b/drivers/gpu/drm/emgd/emgd/drm/emgd_drv.c @@ -1936,10 +1936,6 @@ static struct drm_driver driver = { .poll= drm_poll, .fasync = drm_fasync, }, - .pci_driver = { - .name = DRIVER_NAME, - .id_table = pciidlist, - }, .name= DRIVER_NAME, .desc= DRIVER_DESC, .date= DRIVER_DATE, @@ -1948,6 +1944,10 @@ static struct drm_driver driver = { .patchlevel = DRIVER_PATCHLEVEL, }; +static struct pci_driver emgd_pci_driver = { + .name = DRIVER_NAME, + .id_table = pciidlist, +}; /** * Standard procedure to initialize this kernel module when it is loaded. @@ -1957,7 +1957,7 @@ static int __init emgd_init(void) { EMGD_TRACE_ENTER; driver.num_ioctls = emgd_max_ioctl; - ret = drm_init(driver); + ret = drm_pci_init(driver, emgd_pci_driver); PVRDPFInit(); printk(KERN_INFO [EMGD] drm_init() returning %d\n, ret); EMGD_TRACE_EXIT; @@ -1969,7 +1969,7 @@ static int __init emgd_init(void) { */ static void __exit emgd_exit(void) { EMGD_TRACE_ENTER; - drm_exit(driver); + drm_pci_exit(driver, emgd_pci_driver); EMGD_TRACE_EXIT; } diff --git a/drivers/gpu/drm/emgd/pvr/services4/srvkm/common/resman.c b/drivers/gpu/drm/emgd/pvr/services4/srvkm/common/resman.c index dcbaa4b..7bb860f 100644 --- a/drivers/gpu/drm/emgd/pvr/services4/srvkm/common/resman.c +++ b/drivers/gpu/drm/emgd/pvr/services4/srvkm/common/resman.c @@ -24,10 +24,6 @@ #include resman.h #ifdef __linux__ -#ifndef AUTOCONF_INCLUDED - #include linux/config.h -#endif - #include linux/version.h #include linux/sched.h #if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,9) diff --git a/drivers/gpu/drm/emgd/pvr/services4/srvkm/env/linux/event.c b/drivers/gpu/drm/emgd/pvr/services4/srvkm/env/linux/event.c index c1c645c..d412f47 100644 --- a/drivers/gpu/drm/emgd/pvr/services4/srvkm/env/linux/event.c +++ b/drivers/gpu/drm/emgd/pvr/services4/srvkm/env/linux/event.c @@ -20,10 +20,6 @@ THE SOFTWARE. **/ -#ifndef AUTOCONF_INCLUDED - #include linux/config.h -#endif - #include linux/version.h #include asm/io.h #include asm/page.h diff --git a/drivers/gpu/drm/emgd/pvr/services4/srvkm/env/linux/mm.c
[yocto] [PATCH][KERNEL] meta/crownbay: use hpet
From: Tom Zanussi tom.zanu...@intel.com This enables hpet for crownbay. Please pull into linux-yocto-3.0/meta. Thanks, Tom The following changes are available in the git repository at: git://git.yoctoproject.org/linux-yocto-2.6.37-contrib.git tzanussi/crownbay-updates-linux-yocto-3.0 http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/crownbay-updates-linux-yocto-3.0 Tom Zanussi (1): meta/crownbay: enable hpet meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH][KERNEL] meta/crownbay: enable hpet
From: Tom Zanussi tom.zanu...@intel.com The crownbay reference board has HPET hardware - enable it. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc index 09ecf3b..c7cd538 100644 --- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc +++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc @@ -12,3 +12,5 @@ include features/logbuf/size-normal.scc include features/latencytop/latencytop.scc include features/profiling/profiling.scc + +include features/hpet/hpet.scc -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 0/6] meta-intel: crownbay 1.8 emgd and 3.0 kernel upgrade
From: Tom Zanussi tom.zanu...@intel.com This patchset switches crownbay to the 3.0 kernel and upgrades emgd to 1.8. Both crownbay and crownbay-emgd were successfully built and boot tested. One major change coming out of this patchset is that the emgd binary bits no longer have to be downloaded and extracted manually - the new emgd-driver-bin recipe takes care of that now. However, after these changes the crownbay (but not the crownbay-noemgd) recipe will not build successfully unless the user overrides COMMERCIAL_LICENSE as mentioned in the README and recipe DESCRIPTION. The following changes since commit bf39c131f326f958693a827e25c30f0c1769cc8e: Darren Hart (1): rt: simplify linux-yocto-rt.bbappend for all BSPs are available in the git repository at: git://git.yoctoproject.org/meta-intel.git tzanussi/crownbay-3.0-emgd http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/crownbay-3.0-emgd Tom Zanussi (6): meta-crownbay: switch to linux-yocto 3.0 kernel meta-crownbay: new recipe for emgd 1.8 driver binaries meta-crownbay: select emgd 1.8 meta-crownbay: make the use of emgd-driver-bin COMMERCIAL meta-crownbay: xorg.conf changes meta-crownbay: update README meta-crownbay/README | 207 meta-crownbay/conf/layer.conf |2 + meta-crownbay/conf/machine/crownbay-noemgd.conf|2 + meta-crownbay/conf/machine/crownbay.conf |4 +- .../xorg-xserver/emgd-driver-bin_1.8.bb| 36 .../xserver-xf86-config/crownbay/xorg.conf |3 +- .../xorg-xserver/xserver-xf86-config_0.1.bbappend |1 + .../recipes-kernel/linux/linux-yocto_3.0.bbappend | 15 ++ 8 files changed, 103 insertions(+), 167 deletions(-) create mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 1/6] meta-crownbay: switch to linux-yocto 3.0 kernel
From: Tom Zanussi tom.zanu...@intel.com Switch crownbay and crownbay-noemgd to the 3.0 kernel, lock it down, and update kernel SRCREVs. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- meta-crownbay/conf/machine/crownbay-noemgd.conf|2 ++ meta-crownbay/conf/machine/crownbay.conf |2 ++ .../recipes-kernel/linux/linux-yocto_3.0.bbappend | 15 +++ 3 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index 0219bd1..0a82b54 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf @@ -12,6 +12,8 @@ MACHINE_FEATURES = kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ KERNEL_IMAGETYPE = bzImage PREFERRED_PROVIDER_virtual/kernel ?= linux-yocto +PREFERRED_VERSION_linux-yocto = 3.0+git% + PREFERRED_PROVIDER_linux-libc-headers ?= linux-libc-headers-yocto PREFERRED_PROVIDER_virtual/libx11 ?= libx11-trim PREFERRED_PROVIDER_virtual/libgl ?= mesa-dri diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index 323c8c1..b4ea4b4 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -12,6 +12,8 @@ MACHINE_FEATURES = kernel26 screen keyboard pci usbhost ext2 ext3 x86 \ KERNEL_IMAGETYPE = bzImage PREFERRED_PROVIDER_virtual/kernel ?= linux-yocto +PREFERRED_VERSION_linux-yocto = 3.0+git% + PREFERRED_PROVIDER_linux-libc-headers ?= linux-libc-headers-yocto PREFERRED_PROVIDER_virtual/libx11 ?= libx11-trim PREFERRED_PROVIDER_virtual/libgl ?= mesa-dri diff --git a/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend new file mode 100644 index 000..c9aef72 --- /dev/null +++ b/meta-crownbay/recipes-kernel/linux/linux-yocto_3.0.bbappend @@ -0,0 +1,15 @@ +FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}: + +COMPATIBLE_MACHINE_crownbay = crownbay +KMACHINE_crownbay = yocto/standard/crownbay +KERNEL_FEATURES_append_crownbay += cfg/smp.scc + +COMPATIBLE_MACHINE_crownbay-noemgd = crownbay-noemgd +KMACHINE_crownbay-noemgd = yocto/standard/crownbay +KERNEL_FEATURES_append_crownbay-noemgd += cfg/smp.scc + +SRCREV_machine_pn-linux-yocto_crownbay ?= 9a259cf4f6d404db2820642df755a295bbfb7fe7 +SRCREV_meta_pn-linux-yocto_crownbay ?= fe8eac15e144a35a716cd32c9d2b296ecd5202ac + +SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= 9a259cf4f6d404db2820642df755a295bbfb7fe7 +SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= fe8eac15e144a35a716cd32c9d2b296ecd5202ac -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 2/6] meta-crownbay: new recipe for emgd 1.8 driver binaries
From: Tom Zanussi tom.zanu...@intel.com This adds a new recipe for the emgd 1.8 driver binaries. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- .../xorg-xserver/emgd-driver-bin_1.8.bb| 36 1 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb new file mode 100644 index 000..64578cc --- /dev/null +++ b/meta-crownbay/recipes-graphics/xorg-xserver/emgd-driver-bin_1.8.bb @@ -0,0 +1,36 @@ +SUMMARY = EMGD 1.8 xserver binaries +DESCRIPTION = EMGD 1.8 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 'commercial' and you need to add COMMERCIAL_LICENSE \ += \\ in order to enable it in a build. +LICENSE = Intel-binary-only +PR = r0 + +EMGD_LICDIR = IEMGD_HEAD_Linux/License +EMGD_RPMDIR = IEMGD_HEAD_Linux/MeeGo1.2 + +LIC_FILES_CHKSUM = file://${WORKDIR}/${EMGD_LICDIR}/License.txt;md5=b54f01caaf8483b3cb60c0c40f2bf22d + +SRC_URI = http://edc.intel.com/App_Shared/Downloads/Lin_EMGD_1_8_RC_2032.tgz; + +FILES_${PN} += ${libdir}/dri ${libdir}/xorg/modules/drivers +FILES_${PN}-dbg += ${libdir}/xorg/modules/drivers/.debug ${libdir}/dri/.debug + +S = ${WORKDIR}/${EMGD_RPMDIR} + +do_install () { +rpm2cpio.sh ${S}/emgd-bin*.rpm | cpio -id + +install -d -m 0755${D}/${libdir}/dri +install -d -m 0755${D}/${libdir}/xorg/modules/drivers +install -m 0755 ${S}/usr/lib/*.so.* ${D}${libdir}/ +install -m 0755 ${S}/usr/lib/dri/*${D}${libdir}/dri/ +install -m 0755 ${S}/usr/lib/xorg/modules/drivers/* ${D}${libdir}/xorg/modules/drivers/ + +ln -sf libEGl.so.1${D}${libdir}/libEGl.so +ln -sf libGLES_CM.so.1${D}${libdir}/libGLES_CM.so +ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so +} + +LEAD_SONAME = libEGL.so -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 4/6] meta-crownbay: make the use of emgd-driver-bin COMMERCIAL
From: Tom Zanussi tom.zanu...@intel.com The emgd-driver-bin recipe now automatically downloads and installs EMGD using the new click-through-free tarball, but since the binaries still fall under a non-free license, we need to prevent it from being accidentally installed in an image. We therefore make sure it's labeled in the crownbay layer with 'COMMERCIAL_LICENSE'. In order to build a crownbay image, the user now needs to add a 'COMMERCIAL_LICENSE = ' line to local.conf. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- meta-crownbay/conf/layer.conf |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf index 9b71700..d4877d6 100644 --- a/meta-crownbay/conf/layer.conf +++ b/meta-crownbay/conf/layer.conf @@ -10,3 +10,5 @@ BBFILES := ${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += crownbay BBFILE_PATTERN_crownbay := ^${LAYERDIR}/ BBFILE_PRIORITY_crownbay = 6 + +COMMERCIAL_LICENSE += emgd-driver-bin -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 3/6] meta-crownbay: select emgd 1.8
From: Tom Zanussi tom.zanu...@intel.com Change preferred version of emgd binaries to 1.8. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- meta-crownbay/conf/machine/crownbay.conf |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index b4ea4b4..28d2902 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -28,7 +28,7 @@ XSERVER ?= xserver-xf86-dri-lite \ xf86-video-vesa PREFERRED_VERSION_xserver-xf86-dri-lite ?= 1.9.3 -PREFERRED_VERSION_emgd-driver-bin ?= 1.6 +PREFERRED_VERSION_emgd-driver-bin ?= 1.8 SERIAL_CONSOLE = 115200 ttyS0 -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 5/6] meta-crownbay: xorg.conf changes
From: Tom Zanussi tom.zanu...@intel.com Update to the ced-generated xorg.conf for 1.8. Signed-off-by: Tom Zanussi tom.zanu...@intel.com --- .../xserver-xf86-config/crownbay/xorg.conf |3 ++- .../xorg-xserver/xserver-xf86-config_0.1.bbappend |1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf index f78a538..fce58f8 100644 --- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf +++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf @@ -26,11 +26,12 @@ Section Device Option ALL/1/General/PortOrder 4 Option ALL/1/General/DisplayConfig 1 Option ALL/1/General/DisplayDetect 1 +Option ALL/1/General/TuningWA 1 Option ALL/1/Port/4/General/name lvds Option ALL/1/Port/4/General/EdidAvail 3 Option ALL/1/Port/4/General/EdidNotAvail 1 Option ALL/1/Port/4/General/Rotation 0 -Option ALL/1/Port/4/General/Edid 1 +Option ALL/1/Port/4/General/Edid 0 EndSection Section ServerLayout diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend index 4b8d0e6..1461431 100644 --- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -1,3 +1,4 @@ THISDIR := ${@os.path.dirname(bb.data.getVar('FILE', d, True))} FILESPATH =. ${@base_set_filespath([${THISDIR}/${PN}], d)}: +PR := ${PR}.1 -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] Yocto Project community statistics page
I have created a community statistics wiki page at https://wiki.yoctoproject.org/wiki/Community_Statistics. All feedback is welcome. thanks, -- Jeff Osier-Mixon http://jefro.net/blog Yocto Project Community Manager @Intel http://yoctoproject.org ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] Configuring a layer to support multiple targets
What is the best way to configure a layer to support multiple targets that share a common base? For example, a set of targets that use the Vortex86DX SOC share common peripherals and also have per-variant peripherals. I was thinking: 1) Have a conf/machine file for each variant; 2) Make these use an include for the Vortex86DX SOC. However, I can't work out how to get a per-machine defconfig file. Is there some way of using the machine name to do this? Can I just use FILESEXTRAPATHS := ${THISDIR}/${PN}/${MACHINE} in a kernel .bbappend file? Chris Tapp opensou...@keylevel.com www.keylevel.com ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Configuring a layer to support multiple targets
On 2011-08-12 16:31, Chris Tapp wrote: What is the best way to configure a layer to support multiple targets that share a common base? For example, a set of targets that use the Vortex86DX SOC share common peripherals and also have per-variant peripherals. I was thinking: 1) Have a conf/machine file for each variant; 2) Make these use an include for the Vortex86DX SOC. However, I can't work out how to get a per-machine defconfig file. Is there some way of using the machine name to do this? Can I just use FILESEXTRAPATHS := ${THISDIR}/${PN}/${MACHINE} in a kernel .bbappend file? That shouldn't even be necessary. Just something like this: FILESEXTRAPATHS_prepend := ${THISDIR}/${PN} and it will look for files in various directories ${THISDIR}/${PN}/${MACHINE} ${THISDIR}/${PN} (and maybe some others) For example, I have one layer for a project which supports three different targets (all part of the same platform) using this technique. -- Gary Thomas | Consulting for the MLB Associates |Embedded world ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Configuring a layer to support multiple targets
On 11-08-12 06:31 PM, Chris Tapp wrote: What is the best way to configure a layer to support multiple targets that share a common base? For example, a set of targets that use the Vortex86DX SOC share common peripherals and also have per-variant peripherals. I was thinking: 1) Have a conf/machine file for each variant; 2) Make these use an include for the Vortex86DX SOC. However, I can't work out how to get a per-machine defconfig file. Is there some way of using the machine name to do this? Can I just use What's your yocto release / base kernel ? IF you happen to be using linux-yocto there are several ways to avoid using defconfigs at all, and share your common base of kernel configuration items. Cheers, Bruce FILESEXTRAPATHS := ${THISDIR}/${PN}/${MACHINE} in a kernel .bbappend file? Chris Tapp opensou...@keylevel.com www.keylevel.com ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto