[oe-commits] org.oe.dev merge of '641a15c42908d49a2d22b32302275bdcee06d601'

mickeyl commit oe at amethyst.openembedded.net
Wed Jul 16 08:00:44 UTC 2008


merge of '641a15c42908d49a2d22b32302275bdcee06d601'
     and 'bcdca45c1b2872acd0f00daa6d38395d0d5867d1'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 3f616f9c9fa67e572b27d86791488f40694c6cdb
ViewMTN: http://monotone.openembedded.org/revision/info/3f616f9c9fa67e572b27d86791488f40694c6cdb
Files:
1
packages/python/python-2.5.2/default-is-optimized.patch
packages/python/python-evas_cvs.bb
packages/python/python_2.5.2.bb
packages/pidgin/pidgin_2.4.2.bb
packages/pidgin/pidgin_2.4.3.bb
packages/linux/linux-rp-2.6.26
packages/neuros-public
packages/tangogps
packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff
packages/linux/linux-omap2-git/beagleboard/serialfix.diff
packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch
packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch
packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.26/defconfig-akita
packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
packages/linux/linux-rp-2.6.26/defconfig-c7x0
packages/linux/linux-rp-2.6.26/defconfig-collie
packages/linux/linux-rp-2.6.26/defconfig-htcuniversal
packages/linux/linux-rp-2.6.26/defconfig-hx2000
packages/linux/linux-rp-2.6.26/defconfig-poodle
packages/linux/linux-rp-2.6.26/defconfig-qemuarm
packages/linux/linux-rp-2.6.26/defconfig-qemux86
packages/linux/linux-rp-2.6.26/defconfig-spitz
packages/linux/linux-rp-2.6.26/defconfig-zylonite
packages/linux/linux-rp-2.6.26/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.26/hrw-hostapcard.patch
packages/linux/linux-rp-2.6.26/htcuni-acx.patch
packages/linux/linux-rp-2.6.26/htcuni.patch
packages/linux/linux-rp-2.6.26/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.26/pxa_fb_overlay.patch
packages/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch
packages/linux/linux-rp-2.6.26/spitz_h_rewrite.patch
packages/linux/linux-rp-2.6.26/versatile-armv6.patch
packages/linux/linux-rp-2.6.26/zylonite-boot.patch
packages/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch
packages/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch
packages/linux/linux-rp-2.6.26/zylonite_touch-r0.patch
packages/linux/linux-rp_2.6.26.bb
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/pidgin/pidgin/pidgin-cross-python.patch
packages/rt2x00/rt73-firmware_1.8.bb
packages/tangogps/tangogps_0.9.0.3.bb
packages/zd1211/zd1211-firmware_1.4.bb
classes/qtopia4core.bbclass
conf/machine/include/neuros.inc
packages/dsplink/codec-engine_2.10.bb
packages/dsplink/dsplink.inc
packages/dsplink/dsplink_1.50.bb
packages/dsplink/dsplink_1.51.00.08.bb
packages/ffmpeg/ffmpeg_git.bb
packages/ffmpeg/omapfbplay_git.bb
packages/gstreamer/gst-ffmpeg_0.10.4.bb
packages/linux/linux-neuros_git.bb
packages/linux/linux-omap2_git.bb
packages/neuros-pkggen/files/package.c
packages/neuros-pkggen/files/package.h
packages/neuros-pkggen/neuros-pkggen-native.bb
packages/rsync/rsync.inc
packages/rsync/rsync_2.6.9.bb
packages/rsync/rsync_3.0.0.bb
packages/u-boot/files/neuros-osd2/default-env.ascr
packages/u-boot/u-boot-env.bb
packages/u-boot/u-boot_git.bb
packages/zd1211/zd1211-firmware_1.3.bb
Diffs:

#
# mt diff -r641a15c42908d49a2d22b32302275bdcee06d601 -r3f616f9c9fa67e572b27d86791488f40694c6cdb
#
#
#
# patch "packages/python/python-2.5.2/default-is-optimized.patch"
#  from [524dcf57d51780fdc3c281c49f60fc03193204e0]
#    to [aeb51917d9c931269828e28f524ceb30e897d1c2]
# 
# patch "packages/python/python-evas_cvs.bb"
#  from [004f170367e06ca113e955f686f51ce112ce9368]
#    to [e10e5677f94c661d96f2145c6bf743dc44f4d217]
# 
# patch "packages/python/python_2.5.2.bb"
#  from [5b3625881116fda1abd1f83093917137935991c8]
#    to [2bf6d846cc21654a0850a5e2bd3be1ecf5fb1c7a]
#
============================================================
--- packages/python/python-2.5.2/default-is-optimized.patch	524dcf57d51780fdc3c281c49f60fc03193204e0
+++ packages/python/python-2.5.2/default-is-optimized.patch	aeb51917d9c931269828e28f524ceb30e897d1c2
@@ -1,7 +1,7 @@
-Index: Python-2.5.1/Python/compile.c
+Index: Python-2.5.2/Python/compile.c
 ===================================================================
---- Python-2.5.1.orig/Python/compile.c
-+++ Python-2.5.1/Python/compile.c
+--- Python-2.5.2.orig/Python/compile.c
++++ Python-2.5.2/Python/compile.c
 @@ -30,7 +30,7 @@
  #include "symtable.h"
  #include "opcode.h"
@@ -11,3 +11,38 @@ Index: Python-2.5.1/Python/compile.c
  
  /*
    ISSUES:
+Index: Python-2.5.2/Modules/main.c
+===================================================================
+--- Python-2.5.2.orig/Modules/main.c
++++ Python-2.5.2/Modules/main.c
+@@ -40,7 +40,7 @@ static char **orig_argv;
+ static int  orig_argc;
+ 
+ /* command line options */
+-#define BASE_OPTS "c:dEhim:OQ:StuUvVW:xX?"
++#define BASE_OPTS "c:dEhim:ONQ:StuUvVW:xX?"
+ 
+ #ifndef RISCOS
+ #define PROGRAM_OPTS BASE_OPTS
+@@ -68,8 +68,7 @@ Options and arguments (and corresponding
+ ";
+ static char *usage_2 = "\
+ -m mod : run library module as a script (terminates option list)\n\
+--O     : optimize generated bytecode (a tad; also PYTHONOPTIMIZE=x)\n\
+--OO    : remove doc-strings in addition to the -O optimizations\n\
++-N     : do NOT optimize generated bytecode\n\
+ -Q arg : division options: -Qold (default), -Qwarn, -Qwarnall, -Qnew\n\
+ -S     : don't imply 'import site' on initialization\n\
+ -t     : issue warnings about inconsistent tab usage (-tt: issue errors)\n\
+@@ -302,7 +301,10 @@ Py_Main(int argc, char **argv)
+ 			break;
+ 
+ 		case 'O':
+-			Py_OptimizeFlag++;
++			fprintf(stderr, "-O is already default in this version. Ignoring\n");
++
++		case 'N':
++			Py_OptimizeFlag=0;
+ 			break;
+ 
+ 		case 'S':
============================================================
--- packages/python/python-evas_cvs.bb	004f170367e06ca113e955f686f51ce112ce9368
+++ packages/python/python-evas_cvs.bb	e10e5677f94c661d96f2145c6bf743dc44f4d217
@@ -3,6 +3,10 @@ PR = "r0"
 PV = "0.2.1+cvs${SRCDATE}"
 PR = "r0"
 
+do_compile_prepend() {
+	touch include/evas/__init__.py
+}
+
 do_stage() {
 	distutils_stage_all
 }
============================================================
--- packages/python/python_2.5.2.bb	5b3625881116fda1abd1f83093917137935991c8
+++ packages/python/python_2.5.2.bb	2bf6d846cc21654a0850a5e2bd3be1ecf5fb1c7a
@@ -6,7 +6,7 @@ DEPENDS_sharprom = "python-native readli
 DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
 DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
 # bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml4"
+PR = "ml6"
 
 PYTHON_MAJMIN = "2.5"
 


#
# mt diff -rbcdca45c1b2872acd0f00daa6d38395d0d5867d1 -r3f616f9c9fa67e572b27d86791488f40694c6cdb
#
#
#
# rename "packages/pidgin/pidgin_2.4.2.bb"
#     to "packages/pidgin/pidgin_2.4.3.bb"
# 
# add_dir "packages/linux/linux-rp-2.6.26"
# 
# add_dir "packages/neuros-public"
# 
# add_dir "packages/tangogps"
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff"
#  content [0fd40ab2d4d3854d1b2a13704fbdee61f7214d78]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/serialfix.diff"
#  content [b63bb4a65e96d1b1dee6959e4eb4bd72ec1d28b1]
# 
# add_file "packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch"
#  content [0a9c96315b18cb403f1014aec2038e9477c2db07]
# 
# add_file "packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch"
#  content [e7f07c5193600ba480642fd62dcae173b6b62189]
# 
# add_file "packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch"
#  content [8ffef06194b29e2b22abed7edb6044a5ad4316d7]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-akita"
#  content [064c36530b213dae882be1b6bb2cbab8615906f8]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-bootcdx86"
#  content [83dbfc0474bb18348ca67718d27d2dcc262095a3]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-c7x0"
#  content [9840eec605b360f4cdcf976973331ce274a89b6f]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-collie"
#  content [09f3d369cb3c051a14ffaec8b7116c1b8be66e50]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-htcuniversal"
#  content [afcff96c3bba46e09d06200f4431c95fdb419893]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-hx2000"
#  content [8d4023e3a924b2d01a60011c6aa81cca7bc83d06]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-poodle"
#  content [823d2a1579f2e5312396ba4c0d40a7405bcebd4f]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-qemuarm"
#  content [19a7a240f8a4fd58732db1ccb11767dac8fc7221]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-qemux86"
#  content [8f2d48208eb79e7a2e00941efcaee2cad2d34737]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-spitz"
#  content [121ce2ca2da79de4072c338f63ad9e345f2674bb]
# 
# add_file "packages/linux/linux-rp-2.6.26/defconfig-zylonite"
#  content [71cf26b625ad773ac5468869fe7052854759f70f]
# 
# add_file "packages/linux/linux-rp-2.6.26/hostap-monitor-mode.patch"
#  content [7b6d1b43c24eb7c1135e018aa8ef42f28f5ded00]
# 
# add_file "packages/linux/linux-rp-2.6.26/hrw-hostapcard.patch"
#  content [57f42102146c4908611f21d2fcf3342587c07066]
# 
# add_file "packages/linux/linux-rp-2.6.26/htcuni-acx.patch"
#  content [12ac6d8ef90c4bbd6b06a294889b80e6e53aa996]
# 
# add_file "packages/linux/linux-rp-2.6.26/htcuni.patch"
#  content [1fadf7843ab2feb14c2465130435b34dab802e70]
# 
# add_file "packages/linux/linux-rp-2.6.26/pxa-serial-hack.patch"
#  content [af916d2b2561b14a1e40383de584a3a60110b5e4]
# 
# add_file "packages/linux/linux-rp-2.6.26/pxa_fb_overlay.patch"
#  content [585b5ef26c37766ec384c810ab5bd055e44d1e8a]
# 
# add_file "packages/linux/linux-rp-2.6.26/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
#  content [dd09cc9eb4d3abd338470eb2a61db0e8faf293cb]
# 
# add_file "packages/linux/linux-rp-2.6.26/sharpsl-rc-r1.patch"
#  content [b6f473089db62d2651b38cd14da388d52cf3f6e1]
# 
# add_file "packages/linux/linux-rp-2.6.26/spitz_h_rewrite.patch"
#  content [e027c82b90e2c45a5585e588b58af778b473bd62]
# 
# add_file "packages/linux/linux-rp-2.6.26/versatile-armv6.patch"
#  content [9c7b6904ff1559c5c7163733f9b80bf737a5628b]
# 
# add_file "packages/linux/linux-rp-2.6.26/zylonite-boot.patch"
#  content [e47e2f442bc69d9679debc127d56ce0ad366ed6b]
# 
# add_file "packages/linux/linux-rp-2.6.26/zylonite_keypad-r0.patch"
#  content [7c4b5a7fe857418dd72379aaa883204d069abb8e]
# 
# add_file "packages/linux/linux-rp-2.6.26/zylonite_mtd-r0.patch"
#  content [2be88dd03ad102fe0a6168eb2fa2553841b40aef]
# 
# add_file "packages/linux/linux-rp-2.6.26/zylonite_touch-r0.patch"
#  content [0e1b8affcaa0a0a6688dc9ebcb1945a70414ddb0]
# 
# add_file "packages/linux/linux-rp_2.6.26.bb"
#  content [4c8a103c04a7de67d309779996ffce73441bf396]
# 
# add_file "packages/neuros-public/neuros-lib-widgets_git.bb"
#  content [99e7d5a361229e9fc69cb3d4fdefab5c3fe84ce8]
# 
# add_file "packages/neuros-public/neuros-qt-plugins_git.bb"
#  content [a8b5931e6c77fb22d956e58b1f601344a24ad80b]
# 
# add_file "packages/pidgin/pidgin/pidgin-cross-python.patch"
#  content [f442a9d0892c0437e53ea5fe1ebb25ca4f08f29d]
# 
# add_file "packages/rt2x00/rt73-firmware_1.8.bb"
#  content [30849d7b116d103004440d8b1ac3ba7f4b4cf5ed]
# 
# add_file "packages/tangogps/tangogps_0.9.0.3.bb"
#  content [731daff061dae087ec470d68d35806ad95c3797a]
# 
# add_file "packages/zd1211/zd1211-firmware_1.4.bb"
#  content [c46060576f2e78b244ca81e5f5b805775f5e9d16]
# 
# patch "classes/qtopia4core.bbclass"
#  from [9e44d07549e666bc39b473d49004ee2a271a4f3e]
#    to [e68aa209d908b22d18586f883a2d522d8b76c140]
# 
# patch "conf/machine/include/neuros.inc"
#  from [98be0da0f0970c6e0823e91ff927912ba72f5309]
#    to [463c135b094d059208a51b5db696586d9746cfdf]
# 
# patch "packages/dsplink/codec-engine_2.10.bb"
#  from [d0a04985bc297f7fe5891b3d7a59ea8b34d231d8]
#    to [26e9ad67a3840ad4acde461454c135e085195807]
# 
# patch "packages/dsplink/dsplink.inc"
#  from [117d2c759bf7fc07c00fed79f8791a67e9ee33a7]
#    to [9a18a0df88794b22a58645be2833819c6d551a38]
# 
# patch "packages/dsplink/dsplink_1.50.bb"
#  from [ce809e113a66882d9ee366649c1fb63653d3d7bc]
#    to [de8ff99089087c6bb2111519bc33ea11dcf00b8a]
# 
# patch "packages/dsplink/dsplink_1.51.00.08.bb"
#  from [2fc4774e9e387539e9a60ce9258fc27dcfb665f3]
#    to [14446756523260c5cebb79d3bc3e7604947f2525]
# 
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [a8a6467f13b3028168ae3bb4c7c5826fa0894061]
#    to [eb05423fbb1596fa81f123b4bce01d87b1830343]
# 
# patch "packages/ffmpeg/omapfbplay_git.bb"
#  from [3efb5c482ac4afd4d7f31cd2a0de6c849e8f0e2a]
#    to [57b5c73f07170855d2045754a759ced839d76c83]
# 
# patch "packages/gstreamer/gst-ffmpeg_0.10.4.bb"
#  from [cebc3b85c4540acd50a2053f42621faea271b477]
#    to [1c660c4f80e966feea0af702608757bff5bd56b2]
# 
# patch "packages/linux/linux-neuros_git.bb"
#  from [b673fd21ed36cfdbbec862e53896693a7c7c324c]
#    to [34441f6cf7ffb67ea01a78256c99debb2b580e07]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [26c924f048ec4a31e03284f8a09a9fcebcd5c6f6]
#    to [ff518b2918e6c3e21ba577ec922a9cd1057e1d4b]
# 
# patch "packages/neuros-pkggen/files/package.c"
#  from [d5ca5a63df4cd233db04df33a50fc5150b0d9cc2]
#    to [5b9ae408e185322aca1c6b3fb68aa5c38ec7f44a]
# 
# patch "packages/neuros-pkggen/files/package.h"
#  from [55379d6e10495f88c7745fa5723cdb7bf6a36c15]
#    to [d79097f81ceec529cdfcca8423aa8f1900511663]
# 
# patch "packages/neuros-pkggen/neuros-pkggen-native.bb"
#  from [fbece6a9f1b6839cbb4d1d7847f64a9f5b810583]
#    to [a724aaecd6c0bae0cdcb4a47a1c834877c51045d]
# 
# patch "packages/pidgin/pidgin_2.4.3.bb"
#  from [3f2390a31461f3a1825dcbab4911c2a1f2d67061]
#    to [b23d77d5165ec006f9ac378b17cba948b42599b2]
# 
# patch "packages/rsync/rsync.inc"
#  from [1d1f2cbe00f4779bdc3dc7f9689611d817e90259]
#    to [fd74549f3564de106eb8cd72cdfabfbdf421e5c4]
# 
# patch "packages/rsync/rsync_2.6.9.bb"
#  from [1b1f42efd8d5dc944a9638cd0678259c995c08dd]
#    to [b807b09cd2f7fb22a235f423eafea699f2886cdd]
# 
# patch "packages/rsync/rsync_3.0.0.bb"
#  from [dd9114bcedbdbe8b612946916a35fe4a662cd34c]
#    to [c591ba7b4a00c7f5373fa0d50e20725349016102]
# 
# patch "packages/u-boot/files/neuros-osd2/default-env.ascr"
#  from [8989e41178f588246d71e06134d1cab9837c0de0]
#    to [98c663cf01200a198b3605f8b9d2e2151a1366e9]
# 
# patch "packages/u-boot/u-boot-env.bb"
#  from [7f7ddc4378a241d2ad4d73243dbbbda71d9fb612]
#    to [d6b0517b59a4db41dcd096d408db8a44e0212fe5]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [91095d5509af9328f8d193b5251d464b08333d06]
#    to [3515d781ecf56ec662c74a8d614cacb2fdefaf2d]
# 
# patch "packages/zd1211/zd1211-firmware_1.3.bb"
#  from [5c8fda30e9b57fc74e88cda1748f1d087fc4e931]
#    to [5708126603411d61ab26baa1fc59aff9c30d4a68]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff	0fd40ab2d4d3854d1b2a13704fbdee61f7214d78
+++ packages/linux/linux-omap2-git/beagleboard/i2c-omap-race-fix.diff	0fd40ab2d4d3854d1b2a13704fbdee61f7214d78
@@ -0,0 +1,118 @@
+From linux-omap-owner at vger.kernel.org Tue Jul 15 21:23:13 2008
+Received: from localhost
+	([127.0.0.1] helo=dominion ident=koen)
+	by dominion.dominion.void with esmtp (Exim 4.69)
+	(envelope-from <linux-omap-owner at vger.kernel.org>)
+	id 1KIq7E-0004FX-VS
+	for koen at localhost; Tue, 15 Jul 2008 21:23:13 +0200
+Received: from xs.service.utwente.nl [130.89.5.250]
+	by dominion with POP3 (fetchmail-6.3.6)
+	for <koen at localhost> (single-drop); Tue, 15 Jul 2008 21:23:12 +0200 (CEST)
+Received: from mail.service.utwente.nl ([130.89.5.254]) by exchange.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+	 Tue, 15 Jul 2008 21:01:02 +0200
+Received: from mx.utwente.nl ([130.89.2.12]) by mail.service.utwente.nl with Microsoft SMTPSVC(6.0.3790.3959);
+	 Tue, 15 Jul 2008 21:01:01 +0200
+Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
+          by mx.utwente.nl (8.12.10/SuSE Linux 0.7) with ESMTP id m6FJ0qDf031889
+          for <k.kooi at student.utwente.nl>; Tue, 15 Jul 2008 21:00:52 +0200
+Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
+	id S1756776AbYGOTAV (ORCPT <rfc822;k.kooi at student.utwente.nl>);
+	Tue, 15 Jul 2008 15:00:21 -0400
+Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1755065AbYGOTAV
+	(ORCPT <rfc822;linux-omap-outgoing>);
+	Tue, 15 Jul 2008 15:00:21 -0400
+Received: from utopia.booyaka.com ([72.9.107.138]:35569 "EHLO
+	utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
+	with ESMTP id S1756776AbYGOTAU (ORCPT
+	<rfc822;linux-omap at vger.kernel.org>); Tue, 15 Jul 2008 15:00:20 -0400
+Received: (qmail 2982 invoked by uid 526); 15 Jul 2008 19:00:18 -0000
+Date: 	Tue, 15 Jul 2008 13:00:18 -0600 (MDT)
+From: Paul Walmsley <paul at pwsan.com>
+To: linux-omap at vger.kernel.org
+Subject: [PATCH] i2c-omap: close suspected race between omap_i2c_idle() and
+ omap_i2c_isr()
+Message-ID: <alpine.DEB.1.00.0807151259180.467 at utopia.booyaka.com>
+User-Agent: Alpine 1.00 (DEB 882 2007-12-20)
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+Sender: linux-omap-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <linux-omap.vger.kernel.org>
+X-Mailing-List: 	linux-omap at vger.kernel.org
+X-UTwente-MailScanner-Information: Scanned by MailScanner. Contact servicedesk at icts.utwente.nl for more information.
+X-UTwente-MailScanner: Found to be clean
+X-UTwente-MailScanner-From: linux-omap-owner at vger.kernel.org
+X-Spam-Status: No
+X-OriginalArrivalTime: 15 Jul 2008 19:01:01.0610 (UTC) FILETIME=[1FBA68A0:01C8E6AD]
+
+
+omap_i2c_idle() sets an internal flag, "dev->idle", instructing its
+ISR to decline interrupts.  It sets this flag before it actually masks
+the interrupts on the I2C controller.  This is problematic, since an
+I2C interrupt could arrive after dev->idle is set, but before the
+interrupt source is masked.  When this happens, Linux disables the I2C
+controller's IRQ, causing all future transactions on the bus to fail.
+
+Symptoms, happening on about 7% of boots:
+
+   irq 56: nobody cared (try booting with the "irqpoll" option)
+   <warning traceback here>
+   Disabling IRQ #56
+   i2c_omap i2c_omap.1: controller timed out
+
+In omap_i2c_idle(), this patch sets dev->idle only after the interrupt
+mask write to the I2C controller has left the ARM write buffer.
+That's probably the major offender.  For additional prophylaxis, in
+omap_i2c_unidle(), the patch clears the dev->idle flag before
+interrupts are enabled, rather than afterwards.
+
+The patch has survived twenty-two reboots on the 3430SDP here without
+wedging I2C1.  Not absolutely dispositive, but promising!
+
+
+Signed-off-by: Paul Walmsley <paul at pwsan.com>
+---
+
+ drivers/i2c/busses/i2c-omap.c |   10 ++++++++--
+ 1 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
+index 55779f5..ed7e9ad 100644
+--- a/drivers/i2c/busses/i2c-omap.c
++++ b/drivers/i2c/busses/i2c-omap.c
+@@ -209,22 +209,28 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
+ 	if (dev->iclk != NULL)
+ 		clk_enable(dev->iclk);
+ 	clk_enable(dev->fclk);
++	dev->idle = 0;
+ 	if (dev->iestate)
+ 		omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
+-	dev->idle = 0;
+ }
+ 
+ static void omap_i2c_idle(struct omap_i2c_dev *dev)
+ {
+ 	u16 iv;
+ 
+-	dev->idle = 1;
+ 	dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
+ 	omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0);
+ 	if (dev->rev1)
+ 		iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG);
+ 	else
+ 		omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, dev->iestate);
++	/*
++	 * The wmb() is to ensure that the I2C interrupt mask write
++	 * reaches the I2C controller before the dev->idle store
++	 * occurs.
++	 */
++	wmb();
++	dev->idle = 1;
+ 	clk_disable(dev->fclk);
+ 	if (dev->iclk != NULL)
+ 		clk_disable(dev->iclk);
+--
+To unsubscribe from this list: send the line "unsubscribe linux-omap" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
+
============================================================
--- packages/linux/linux-omap2-git/beagleboard/serialfix.diff	b63bb4a65e96d1b1dee6959e4eb4bd72ec1d28b1
+++ packages/linux/linux-omap2-git/beagleboard/serialfix.diff	b63bb4a65e96d1b1dee6959e4eb4bd72ec1d28b1
@@ -0,0 +1,18 @@
+--- /tmp/pm34xx.c	2008-07-14 18:09:08.000000000 +0200
++++ git/arch/arm/mach-omap2/pm34xx.c	2008-07-14 18:09:42.453198000 +0200
+@@ -398,13 +398,13 @@
+ 		       INT_34XX_PRCM_MPU_IRQ);
+ 		goto err1;
+ 	}
+-
++/*
+ 	ret = pwrdm_for_each(pwrdms_setup);
+ 	if (ret) {
+ 		printk(KERN_ERR "Failed to setup powerdomains\n");
+ 		goto err2;
+ 	}
+-
++*/
+ 	mpu_pwrdm = pwrdm_lookup("mpu_pwrdm");
+ 	if (mpu_pwrdm == NULL) {
+ 		printk(KERN_ERR "Failed to get mpu_pwrdm\n");
============================================================
--- packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch	0a9c96315b18cb403f1014aec2038e9477c2db07
+++ packages/linux/linux-rp-2.6.26/binutils-buildid-arm.patch	0a9c96315b18cb403f1014aec2038e9477c2db07
@@ -0,0 +1,16 @@
+---
+ arch/arm/kernel/vmlinux.lds.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: linux-2.6.22/arch/arm/kernel/vmlinux.lds.S
+===================================================================
+--- linux-2.6.22.orig/arch/arm/kernel/vmlinux.lds.S	2007-09-11 18:32:29.000000000 +0200
++++ linux-2.6.22/arch/arm/kernel/vmlinux.lds.S	2007-09-11 18:33:42.000000000 +0200
+@@ -94,6 +94,7 @@
+ 			TEXT_TEXT
+ 			SCHED_TEXT
+ 			LOCK_TEXT
++			*(.note.*)
+ #ifdef CONFIG_MMU
+ 			*(.fixup)
+ #endif
============================================================
--- packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch	e7f07c5193600ba480642fd62dcae173b6b62189
+++ packages/linux/linux-rp-2.6.26/connectplus-prevent-oops-HACK.patch	e7f07c5193600ba480642fd62dcae173b6b62189
@@ -0,0 +1,17 @@
+Index: linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c
+===================================================================
+--- linux-2.6.21.orig/drivers/net/wireless/hostap/hostap_hw.c	2007-07-07 12:45:39.000000000 +0100
++++ linux-2.6.21/drivers/net/wireless/hostap/hostap_hw.c	2007-07-07 12:47:30.000000000 +0100
+@@ -2666,6 +2666,12 @@
+ 	iface = netdev_priv(dev);
+ 	local = iface->local;
+ 
++	if(dev->base_addr == 0)
++	{
++		printk(KERN_DEBUG "%s: IRQ before base_addr set\n", dev->name);
++		return IRQ_HANDLED;
++	}
++
+ 	prism2_io_debug_add(dev, PRISM2_IO_DEBUG_CMD_INTERRUPT, 0, 0);
+ 
+ 	if (local->func->card_present && !local->func->card_present(local)) {
============================================================
--- packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch	8ffef06194b29e2b22abed7edb6044a5ad4316d7
+++ packages/linux/linux-rp-2.6.26/connectplus-remove-ide-HACK.patch	8ffef06194b29e2b22abed7edb6044a5ad4316d7
@@ -0,0 +1,12 @@
+Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c	2005-09-01 22:43:46.000000000 +0100
++++ linux-2.6.13/drivers/ide/legacy%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list