[oe-commits] org.oe.dev merge of '1f4f07522c89b1ab3b65e60204a55a1a00974bc4'

oe commit oe at amethyst.openembedded.net
Thu Jul 24 19:47:41 UTC 2008


merge of '1f4f07522c89b1ab3b65e60204a55a1a00974bc4'
     and 'a8931960546bdf36307b49ffd1b252b3f0a2b108'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 603021ef21f227008bfd1abee484b2e9d1b91701
ViewMTN: http://monotone.openembedded.org/revision/info/603021ef21f227008bfd1abee484b2e9d1b91701
Files:
1
packages/mono/mono-1.9.1
packages/mono/files/libgc_cppflags.patch
packages/mono/mono-mcs-intermediate_1.9.1.bb
packages/mono/mono-native_1.9.1.bb
packages/mono/mono_1.9.1-files.inc
packages/mono/mono_1.9.1.bb
packages/mono/mono_1.9.1.inc
packages/mono/README
packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff
Diffs:

#
# mt diff -r1f4f07522c89b1ab3b65e60204a55a1a00974bc4 -r603021ef21f227008bfd1abee484b2e9d1b91701
#
#
#
# add_dir "packages/mono/mono-1.9.1"
# 
# add_file "packages/mono/files/libgc_cppflags.patch"
#  content [00ddb4b73388e59b32b7a48f1dcd97a3054c18c8]
# 
# add_file "packages/mono/mono-mcs-intermediate_1.9.1.bb"
#  content [4e1f201a3ac5d3b4ff36d80c490dd7769ffdd304]
# 
# add_file "packages/mono/mono-native_1.9.1.bb"
#  content [c198192b096c988088e98426b67d28da3e6d71aa]
# 
# add_file "packages/mono/mono_1.9.1-files.inc"
#  content [e8aa5fcf2f7be1f3cfa316a7678047d127db70eb]
# 
# add_file "packages/mono/mono_1.9.1.bb"
#  content [81a45705a3bcd1681de26643f35d68d8076e7a42]
# 
# add_file "packages/mono/mono_1.9.1.inc"
#  content [8602072beea0f9ffab0ec94434f26dc4a40f10d1]
# 
# patch "packages/mono/README"
#  from [ce24307d6afe8343f5db95c14efcac462e36c160]
#    to [e957b1c88e0021bec7fb80690c2d0ee9085eff93]
#
============================================================
--- packages/mono/files/libgc_cppflags.patch	00ddb4b73388e59b32b7a48f1dcd97a3054c18c8
+++ packages/mono/files/libgc_cppflags.patch	00ddb4b73388e59b32b7a48f1dcd97a3054c18c8
@@ -0,0 +1,46 @@
+Index: mono-1.9.1/configure.in
+===================================================================
+--- mono-1.9.1.orig/configure.in	2008-07-16 23:37:52.000000000 -0400
++++ mono-1.9.1/configure.in	2008-07-16 23:38:23.000000000 -0400
+@@ -660,13 +660,6 @@
+ 		;;
+ 
+ 	xincluded)
+-		AC_CONFIG_SUBDIRS(libgc)
+-
+-		# Pass CPPFLAGS to libgc configure
+-		# Maybe we should use a separate variable for this to avoid passing useless and
+-		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+-		export CPPFLAGS
+-
+ 		found_boehm=yes
+ 		gc_headers=yes
+ 		use_included_gc=yes
+@@ -714,9 +707,6 @@
+    CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
+ fi
+ 
+-# tell libgc/configure about what we want
+-ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
+-
+ AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
+ AC_SUBST(LIBGC_CFLAGS)
+ AC_SUBST(LIBGC_LIBS)
+@@ -1970,6 +1960,17 @@
+ 	CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
+ fi
+ 
++case "x$gc" in
++	xincluded)
++		# Pass CPPFLAGS to libgc configure
++		# We should use a separate variable for this to avoid passing useless and
++		# potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
++		# This should be executed late so we pick up the final version of CPPFLAGS
++		ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
++		AC_CONFIG_SUBDIRS(libgc)
++		;;
++esac
++
+ PREVIEW=yes
+ AC_ARG_WITH(preview,  [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
+ 	if test x$with_preview = xno; then
============================================================
--- packages/mono/mono-mcs-intermediate_1.9.1.bb	4e1f201a3ac5d3b4ff36d80c490dd7769ffdd304
+++ packages/mono/mono-mcs-intermediate_1.9.1.bb	4e1f201a3ac5d3b4ff36d80c490dd7769ffdd304
@@ -0,0 +1,15 @@
+# This is a straw-man recipe for step 1 in the two-step build of
+# mono. Because it's impossible to build the mcs directory
+# in cross-compile mode, this recipe will do a native build,
+# then tar the resulting install tree for usage by the mono
+# package in step 2.
+# See http://www.mono-project.com/Mono:ARM
+
+require mono_1.9.1.inc
+require mono-mcs-intermediate.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://libgc_cppflags.patch;patch=1"
+
+
============================================================
--- packages/mono/mono-native_1.9.1.bb	c198192b096c988088e98426b67d28da3e6d71aa
+++ packages/mono/mono-native_1.9.1.bb	c198192b096c988088e98426b67d28da3e6d71aa
@@ -0,0 +1,27 @@
+require mono_1.9.1.inc
+PR = "r3"
+DEPENDS = "glib-2.0-native perl-native"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://mono-fix-libdir-path.patch;patch=1 \
+	    file://libgc_cppflags.patch;patch=1 \
+           "
+
+PARALLEL_MAKE = ""
+
+inherit native
+
+do_stage_prepend() {
+	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+}
+
+do_fix_libtool_name() {
+	# inherit native will make that all native tools that are being
+	# built are prefixed with something like "i686-linux-",
+	# including libtool. Fix up some hardcoded libtool names:
+	for i in "${S}"/runtime/*-wrapper.in; do
+		sed -e "s/libtool/${BUILD_SYS}-libtool/" -i "${i}"
+	done
+}
+addtask fix_libtool_name after do_patch before do_configure
============================================================
--- packages/mono/mono_1.9.1-files.inc	e8aa5fcf2f7be1f3cfa316a7678047d127db70eb
+++ packages/mono/mono_1.9.1-files.inc	e8aa5fcf2f7be1f3cfa316a7678047d127db70eb
@@ -0,0 +1,1426 @@
+# This is a generated file, please do not edit directly
+# Use collect-files.py instead. -- Henryk <henryk at openmoko.org>
+FILES_mono-jit-dbg = "/usr/bin/mono*.mdb \
+	/usr/bin/mono*/*.mdb"
+FILES_mono-jit = "/usr/bin/mono"
+FILES_mono-gac-dbg = "/usr/bin/gacutil*.mdb \
+	/usr/bin/gacutil*/*.mdb \
+	/usr/lib/mono/1.0/gacutil.exe*.mdb \
+	/usr/lib/mono/1.0/gacutil.exe*/*.mdb"
+FILES_mono-gac = "/usr/bin/gacutil \
+	/usr/lib/mono/1.0/gacutil.exe"
+FILES_mono-mjs-dbg = "/usr/bin/mjs*.mdb \
+	/usr/bin/mjs*/*.mdb \
+	/usr/lib/mono/1.0/mjs.exe*.mdb \
+	/usr/lib/mono/1.0/mjs.exe*/*.mdb"
+FILES_mono-mjs = "/usr/bin/mjs \
+	/usr/lib/mono/1.0/mjs.exe*"
+FILES_mono-gmcs-dbg = "/usr/bin/gmcs*.mdb \
+	/usr/bin/gmcs*/*.mdb \
+	/usr/lib/mono/2.0/gmcs.exe*.mdb \
+	/usr/lib/mono/2.0/gmcs.exe*/*.mdb"
+FILES_mono-gmcs = "/usr/bin/gmcs \
+	/usr/lib/mono/2.0/gmcs.exe*"
+FILES_mono-utils-dbg = "/usr/bin/pedump*.mdb \
+	/usr/bin/pedump*/*.mdb \
+	/usr/bin/monodis*.mdb \
+	/usr/bin/monodis*/*.mdb \
+	/usr/bin/monograph*.mdb \
+	/usr/bin/monograph*/*.mdb \
+	/usr/bin/mono-find-provides*.mdb \
+	/usr/bin/mono-find-provides*/*.mdb \
+	/usr/bin/mono-find-requires*.mdb \
+	/usr/bin/mono-find-requires*/*.mdb"
+FILES_mono-utils = "/usr/bin/pedump \
+	/usr/bin/monodis \
+	/usr/bin/monograph \
+	/usr/bin/mono-find-provides \
+	/usr/bin/mono-find-requires"
+FILES_libmono-peapi1.0-cil-dbg = "/usr/lib/mono/gac/PEAPI/1.0.*/*.mdb \
+	/usr/lib/mono/gac/PEAPI/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/PEAPI/1.0.*/.debug/ \
+	/usr/lib/mono/gac/PEAPI/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/PEAPI.dll*.mdb \
+	/usr/lib/mono/1.0/PEAPI.dll*/*.mdb"
+FILES_libmono-peapi1.0-cil = "/usr/lib/mono/gac/PEAPI/1.0.*/ \
+	/usr/lib/mono/1.0/PEAPI.dll"
+FILES_libmono-cairo1.0-cil-dbg = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cairo/1.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Mono.Cairo/1.0.*/.debug/ \
+	/usr/lib/mono/gac/Mono.Cairo/1.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Mono.Cairo.dll*.mdb \
+	/usr/lib/mono/1.0/Mono.Cairo.dll*/*.mdb \
+	/usr/lib/pkgconfig/mono-cairo.pc*.mdb \
+	/usr/lib/pkgconfig/mono-cairo.pc*/*.mdb"
+FILES_libmono-cairo1.0-cil = "/usr/lib/mono/gac/Mono.Cairo/1.0.*/ \
+	/usr/lib/mono/1.0/Mono.Cairo.dll \
+	/usr/lib/pkgconfig/mono-cairo.pc"
+FILES_libmono-system-web2.0-cil-dbg = "/usr/lib/mono/gac/System.Web/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Web/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Web/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Web/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/*.mdb \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/*/*.mdb \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/.debug/ \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/../.debug/ \
+	/usr/lib/mono/2.0/System.Web.dll*.mdb \
+	/usr/lib/mono/2.0/System.Web.dll*/*.mdb \
+	/usr/lib/mono/2.0/System.Web.Services.dll*.mdb \
+	/usr/lib/mono/2.0/System.Web.Services.dll*/*.mdb"
+FILES_libmono-system-web2.0-cil = "/usr/lib/mono/gac/System.Web/2.0.0.0__*/ \
+	/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/ \
+	/usr/lib/mono/2.0/System.Web.dll \
+	/usr/lib/mono/2.0/System.Web.Services.dll"
+FILES_mono-1.0-devel-dbg = "/usr/bin/al*.mdb \
+	/usr/bin/al*/*.mdb \
+	/usr/bin/caspol*.mdb \
+	/usr/bin/caspol*/*.mdb \
+	/usr/bin/cert2spc*.mdb \
+	/usr/bin/cert2spc*/*.mdb \
+	/usr/bin/certmgr*.mdb \
+	/usr/bin/certmgr*/*.mdb \
+	/usr/bin/chktrust*.mdb \
+	/usr/bin/chktrust*/*.mdb \
+	/usr/bin/cilc*.mdb \
+	/usr/bin/cilc*/*.mdb \
+	/usr/bin/disco*.mdb \
+	/usr/bin/disco*/*.mdb \
+	/usr/bin/dtd2xsd*.mdb \
+	/usr/bin/dtd2xsd*/*.mdb \
+	/usr/bin/dtd2rng*.mdb \
+	/usr/bin/dtd2rng*/*.mdb \
+	/usr/bin/genxs*.mdb \
+	/usr/bin/genxs*/*.mdb \
+	/usr/bin/ilasm*.mdb \
+	/usr/bin/ilasm*/*.mdb \
+	/usr/bin/installvst*.mdb \
+	/usr/bin/installvst*/*.mdb \
+	/usr/bin/macpack*.mdb \
+	/usr/bin/macpack*/*.mdb \
+	/usr/bin/mkbundle*.mdb \
+	/usr/bin/mkbundle*/*.mdb \
+	/usr/bin/mono-api-diff*.mdb \
+	/usr/bin/mono-api-diff*/*.mdb \
+	/usr/bin/mono-api-info*.mdb \
+	/usr/bin/mono-api-info*/*.mdb \
+	/usr/bin/mono-shlib-cop*.mdb \
+	/usr/bin/mono-shlib-cop*/*.mdb \
+	/usr/bin/mono-xmltool*.mdb \
+	/usr/bin/mono-xmltool*/*.mdb \
+	/usr/bin/monop*.mdb \
+	/usr/bin/monop*/*.mdb \
+	/usr/bin/monolinker*.mdb \
+	/usr/bin/monolinker*/*.mdb \
+	/usr/bin/mozroots*.mdb \
+	/usr/bin/mozroots*/*.mdb \
+	/usr/bin/permview*.mdb \
+	/usr/bin/permview*/*.mdb \
+	/usr/bin/resgen*.mdb \
+	/usr/bin/resgen*/*.mdb \
+	/usr/bin/secutil*.mdb \
+	/usr/bin/secutil*/*.mdb \
+	/usr/bin/setreg*.mdb \
+	/usr/bin/setreg*/*.mdb \
+	/usr/bin/signcode*.mdb \
+	/usr/bin/signcode*/*.mdb \
+	/usr/bin/sn*.mdb \
+	/usr/bin/sn*/*.mdb \
+	/usr/bin/soapsuds*.mdb \
+	/usr/bin/soapsuds*/*.mdb \
+	/usr/bin/sqlsharp*.mdb \
+	/usr/bin/sqlsharp*/*.mdb \
+	/usr/bin/wsdl*.mdb \
+	/usr/bin/wsdl*/*.mdb \
+	/usr/bin/xsd*.mdb \
+	/usr/bin/xsd*/*.mdb \
+	/usr/lib/mono/1.0/CorCompare.exe*.mdb \
+	/usr/lib/mono/1.0/CorCompare.exe*/*.mdb \
+	/usr/lib/mono/1.0/al.exe*.mdb \
+	/usr/lib/mono/1.0/al.exe*/*.mdb \
+	/usr/lib/mono/1.0/browsercaps-updater.exe*.mdb \
+	/usr/lib/mono/1.0/browsercaps-updater.exe*/*.mdb \
+	/usr/lib/mono/1.0/caspol.exe*.mdb \
+	/usr/lib/mono/1.0/caspol.exe*/*.mdb \
+	/usr/lib/mono/1.0/cert2spc.exe*.mdb \
+	/usr/lib/mono/1.0/cert2spc.exe*/*.mdb \
+	/usr/lib/mono/1.0/certmgr.exe*.mdb \
+	/usr/lib/mono/1.0/certmgr.exe*/*.mdb \
+	/usr/lib/mono/1.0/chktrust.exe*.mdb \
+	/usr/lib/mono/1.0/chktrust.exe*/*.mdb \
+	/usr/lib/mono/1.0/cilc.exe*.mdb \
+	/usr/lib/mono/1.0/cilc.exe*/*.mdb \
+	/usr/lib/mono/1.0/culevel.exe*.mdb \
+	/usr/lib/mono/1.0/culevel.exe*/*.mdb \
+	/usr/lib/mono/1.0/disco.exe*.mdb \
+	/usr/lib/mono/1.0/disco.exe*/*.mdb \
+	/usr/lib/mono/1.0/dtd2rng.exe*.mdb \
+	/usr/lib/mono/1.0/dtd2rng.exe*/*.mdb \
+	/usr/lib/mono/1.0/dtd2xsd.exe*.mdb \
+	/usr/lib/mono/1.0/dtd2xsd.exe*/*.mdb \
+	/usr/lib/mono/1.0/genxs.exe*.mdb \
+	/usr/lib/mono/1.0/genxs.exe*/*.mdb \
+	/usr/lib/mono/1.0/ictool.exe*.mdb \
+	/usr/lib/mono/1.0/ictool.exe*/*.mdb \
+	/usr/lib/mono/1.0/ilasm.exe*.mdb \
+	/usr/lib/mono/1.0/ilasm.exe*/*.mdb \
+	/usr/lib/mono/1.0/installvst.exe*.mdb \
+	/usr/lib/mono/1.0/installvst.exe*/*.mdb \
+	/usr/lib/mono/1.0/macpack.exe*.mdb \
+	/usr/lib/mono/1.0/macpack.exe*/*.mdb \
+	/usr/lib/mono/1.0/makecert.exe*.mdb \
+	/usr/lib/mono/1.0/makecert.exe*/*.mdb \
+	/usr/lib/mono/1.0/mkbundle.exe*.mdb \
+	/usr/lib/mono/1.0/mkbundle.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-api-diff.exe*.mdb \
+	/usr/lib/mono/1.0/mono-api-diff.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-api-info.exe*.mdb \
+	/usr/lib/mono/1.0/mono-api-info.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-shlib-cop.exe*.mdb \
+	/usr/lib/mono/1.0/mono-shlib-cop.exe*/*.mdb \
+	/usr/lib/mono/1.0/mono-xmltool.exe*.mdb \
+	/usr/lib/mono/1.0/mono-xmltool.exe*/*.mdb \
+	/usr/lib/mono/1.0/monolinker.exe*.mdb \
+	/usr/lib/mono/1.0/monolinker.exe*/*.mdb \
+	/usr/lib/mono/1.0/monop.exe*.mdb \
+	/usr/lib/mono/1.0/monop.exe*/*.mdb \
+	/usr/lib/mono/1.0/mozroots.exe*.mdb \
+	/usr/lib/mono/1.0/mozroots.exe*/*.mdb \
+	/usr/lib/mono/1.0/permview.exe*.mdb \
+	/usr/lib/mono/1.0/permview.exe*/*.mdb \
+	/usr/lib/mono/1.0/resgen.exe*.mdb \
+	/usr/lib/mono/1.0/resgen.exe*/*.mdb \
+	/usr/lib/mono/1.0/secutil.exe*.mdb \
+	/usr/lib/mono/1.0/secutil.exe*/*.mdb \
+	/usr/lib/mono/1.0/setreg.exe*.mdb \
+	/usr/lib/mono/1.0/setreg.exe*/*.mdb \
+	/usr/lib/mono/1.0/signcode.exe*.mdb \
+	/usr/lib/mono/1.0/signcode.exe*/*.mdb \
+	/usr/lib/mono/1.0/sn.exe*.mdb \
+	/usr/lib/mono/1.0/sn.exe*/*.mdb \
+	/usr/lib/mono/1.0/soapsuds.exe*.mdb \
+	/usr/lib/mono/1.0/soapsuds.exe*/*.mdb \
+	/usr/lib/mono/1.0/sqlsharp.exe*.mdb \
+	/usr/lib/mono/1.0/sqlsharp.exe*/*.mdb \
+	/usr/lib/mono/1.0/wsdl.exe*.mdb \
+	/usr/lib/mono/1.0/wsdl.exe*/*.mdb \
+	/usr/lib/mono/1.0/xsd.exe*.mdb \
+	/usr/lib/mono/1.0/xsd.exe*/*.mdb"
+FILES_mono-1.0-devel = "/usr/bin/al \
+	/usr/bin/caspol \
+	/usr/bin/cert2spc \
+	/usr/bin/certmgr \
+	/usr/bin/chktrust \
+	/usr/bin/cilc \
+	/usr/bin/disco \
+	/usr/bin/dtd2xsd \
+	/usr/bin/dtd2rng \
+	/usr/bin/genxs \
+	/usr/bin/ilasm \
+	/usr/bin/installvst \
+	/usr/bin/macpack \
+	/usr/bin/mkbundle \
+	/usr/bin/mono-api-diff \
+	/usr/bin/mono-api-info \
+	/usr/bin/mono-shlib-cop \
+	/usr/bin/mono-xmltool \
+	/usr/bin/monop \
+	/usr/bin/monolinker \
+	/usr/bin/mozroots \
+	/usr/bin/permview \
+	/usr/bin/resgen \
+	/usr/bin/secutil \
+	/usr/bin/setreg \
+	/usr/bin/signcode \
+	/usr/bin/sn \
+	/usr/bin/soapsuds \
+	/usr/bin/sqlsharp \
+	/usr/bin/wsdl \
+	/usr/bin/xsd \
+	/usr/lib/mono/1.0/CorCompare.exe \
+	/usr/lib/mono/1.0/al.exe \
+	/usr/lib/mono/1.0/browsercaps-updater.exe \
+	/usr/lib/mono/1.0/caspol.exe \
+	/usr/lib/mono/1.0/cert2spc.exe \
+	/usr/lib/mono/1.0/certmgr.exe \
+	/usr/lib/mono/1.0/chktrust.exe \
+	/usr/lib/mono/1.0/cilc.exe \
+	/usr/lib/mono/1.0/culevel.exe \
+	/usr/lib/mono/1.0/disco.exe \
+	/usr/lib/mono/1.0/dtd2rng.exe \
+	/usr/lib/mono/1.0/dtd2xsd.exe \
+	/usr/lib/mono/1.0/genxs.exe \
+	/usr/lib/mono/1.0/ictool.exe \
+	/usr/lib/mono/1.0/ilasm.exe \
+	/usr/lib/mono/1.0/installvst.exe \
+	/usr/lib/mono/1.0/macpack.exe \
+	/usr/lib/mono/1.0/makecert.exe \
+	/usr/lib/mono/1.0/mkbundle.exe \
+	/usr/lib/mono/1.0/mono-api-diff.exe \
+	/usr/lib/mono/1.0/mono-api-info.exe \
+	/usr/lib/mono/1.0/mono-shlib-cop.exe* \
+	/usr/lib/mono/1.0/mono-xmltool.exe \
+	/usr/lib/mono/1.0/monolinker.exe \
+	/usr/lib/mono/1.0/monop.exe \
+	/usr/lib/mono/1.0/mozroots.exe \
+	/usr/lib/mono/1.0/permview.exe \
+	/usr/lib/mono/1.0/resgen.exe \
+	/usr/lib/mono/1.0/secutil.exe \
+	/usr/lib/mono/1.0/setreg.exe \
+	/usr/lib/mono/1.0/signcode.exe \
+	/usr/lib/mono/1.0/sn.exe \
+	/usr/lib/mono/1.0/soapsuds.exe \
+	/usr/lib/mono/1.0/sqlsharp.exe \
+	/usr/lib/mono/1.0/wsdl.exe \
+	/usr/lib/mono/1.0/xsd.exe"
+FILES_prj2make-sharp-dbg = "/usr/bin/prj2make*.mdb \
+	/usr/bin/prj2make*/*.mdb \
+	/usr/lib/mono/1.0/prj2make.exe*.mdb \
+	/usr/lib/mono/1.0/prj2make.exe*/*.mdb"
+FILES_prj2make-sharp = "/usr/bin/prj2make \
+	/usr/lib/mono/1.0/prj2make.exe*"
+FILES_libmono-accessibility2.0-cil-dbg = "/usr/lib/mono/gac/Accessibility/2.0.*/*.mdb \
+	/usr/lib/mono/gac/Accessibility/2.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Accessibility/2.0.*/.debug/ \
+	/usr/lib/mono/gac/Accessibility/2.0.*/../.debug/ \
+	/usr/lib/mono/2.0/Accessibility.dll*.mdb \
+	/usr/lib/mono/2.0/Accessibility.dll*/*.mdb"
+FILES_libmono-accessibility2.0-cil = "/usr/lib/mono/gac/Accessibility/2.0.*/ \
+	/usr/lib/mono/2.0/Accessibility.dll"
+FILES_libmono-microsoft7.0-cil-dbg = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.JScript/7.0.*/../.debug/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/../.debug/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/*/*.mdb \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/.debug/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/../.debug/ \
+	/usr/lib/mono/1.0/Microsoft.JScript.dll*.mdb \
+	/usr/lib/mono/1.0/Microsoft.JScript.dll*/*.mdb \
+	/usr/lib/mono/1.0/Microsoft.VisualC.dll*.mdb \
+	/usr/lib/mono/1.0/Microsoft.VisualC.dll*/*.mdb \
+	/usr/lib/mono/1.0/Microsoft.Vsa.dll*.mdb \
+	/usr/lib/mono/1.0/Microsoft.Vsa.dll*/*.mdb"
+FILES_libmono-microsoft7.0-cil = "/usr/lib/mono/gac/Microsoft.JScript/7.0.*/ \
+	/usr/lib/mono/gac/Microsoft.VisualC/7.0.*/ \
+	/usr/lib/mono/gac/Microsoft.Vsa/7.0.*/ \
+	/usr/lib/mono/1.0/Microsoft.JScript.dll \
+	/usr/lib/mono/1.0/Microsoft.VisualC.dll \
+	/usr/lib/mono/1.0/Microsoft.Vsa.dll"
+FILES_libmono-mozilla0.2-cil-dbg = "/usr/lib/mono/g%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -ra8931960546bdf36307b49ffd1b252b3f0a2b108 -r603021ef21f227008bfd1abee484b2e9d1b91701
#
#
#
# add_file "packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff"
#  content [cca08af46e3afb4fa5a317c7683b8809e54707a0]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff"
#  content [57dfde38a6120c2956bfd101624a34a3963f8b00]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff	cca08af46e3afb4fa5a317c7683b8809e54707a0
+++ packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff	cca08af46e3afb4fa5a317c7683b8809e54707a0
@@ -0,0 +1,22 @@
+From: Steve Sakoman <steve at sakoman.com>
+Date: Wed, 16 Jul 2008 19:38:43 +0000 (-0700)
+Subject: omap3beagle:  set data rate on i2c-1 to 400, since 2600 seems to be
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=12d6504334a830774ff1d42cee4b7296ac9fb7d2
+
+omap3beagle:  set data rate on i2c-1 to 400, since 2600 seems to be
+flakey
+---
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
+index fdce787..938ad73 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
++++ b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -39,7 +39,7 @@ static struct omap_uart_config omap3_beagle_uart_config __initdata = {
+ 
+ static int __init omap3_beagle_i2c_init(void)
+ {
+-	omap_register_i2c_bus(1, 2600, NULL, 0);
++	omap_register_i2c_bus(1, 400, NULL, 0);
+ 	omap_register_i2c_bus(2, 400, NULL, 0);
+ 	omap_register_i2c_bus(3, 400, NULL, 0);
+ 	return 0;
============================================================
--- packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff	57dfde38a6120c2956bfd101624a34a3963f8b00
+++ packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff	57dfde38a6120c2956bfd101624a34a3963f8b00
@@ -0,0 +1,38 @@
+From: Purushotam Kumar <purushotam at ti.com>
+Date: Fri, 18 Jul 2008 23:28:57 +0000 (-0700)
+Subject: OMAP3:devices.c:Enabling 4-bit for SD card
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=6c4d34031c80ca4b50ffe73a4ef7fe197a760a60
+
+OMAP3:devices.c:Enabling 4-bit for SD card
+
+SD card was working in 1-bit mode.This patch will configure SD card in
+4-bit mode and hence performance  will increase.
+
+Signed-off-by: Purushotam Kumar <purushotam at ti.com>
+Acked-by: Madhusudhan Chikkature Rajashekar <madhu.cr at ti.com>
+---
+
+diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
+index b83f9a6..d0cfceb 100644
+--- a/arch/arm/plat-omap/devices.c
++++ b/arch/arm/plat-omap/devices.c
+@@ -296,13 +296,17 @@ static void __init omap_init_mmc(void)
+ 	mmc = &mmc_conf->mmc[0];
+ 
+ 	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
+-		if (mmc->enabled)
++		if (mmc->enabled) {
++			mmc1_data.conf = *mmc;
+ 			(void) platform_device_register(&mmc_omap_device1);
++		}
+ 
+ #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP34XX)
+ 		mmc = &mmc_conf->mmc[1];
+-		if (mmc->enabled)
++		if (mmc->enabled) {
++			mmc2_data.conf = *mmc;
+ 			(void) platform_device_register(&mmc_omap_device2);
++		}
+ #endif
+ 
+ 		return;






More information about the Openembedded-commits mailing list