[oe-commits] org.oe.dev merge of 'd2f1a9f3ef64d23cec1e794848e1bb2ac1a92e63'
thesing commit
oe at amethyst.openembedded.net
Thu Jul 24 23:44:47 UTC 2008
merge of 'd2f1a9f3ef64d23cec1e794848e1bb2ac1a92e63'
and 'ed4e5b420b127a2a4f722c324c8c61ee00caf977'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: f960843459326876ef399375d5affaacc45d0a46
ViewMTN: http://monotone.openembedded.org/revision/info/f960843459326876ef399375d5affaacc45d0a46
Files:
1
packages/libsdl/libsdl-image-1.2.3
packages/libsdl/libsdl-net-1.2.7
packages/mono/mono-1.9.1
packages/mythtv/files/armv5te
packages/mythtv/files/armv6
packages/mythtv/files/armv7a
packages/mythtv/mythtv-0.21
packages/python/python-setuptools
contrib/angstrom/source-mirror.txt
packages/libsdl/libsdl-image-1.2.3/autotools.patch
packages/libsdl/libsdl-net-1.2.7/libtool2.patch
packages/linux/linux-omap2-git/beagleboard/400khz-i2c.diff
packages/linux/linux-omap2-git/beagleboard/4bitmmc.diff
packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff
packages/lirc/lirc-modules_0.8.3+cvs20080713.bb
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/mythtv/files/armv5te/configh
packages/mythtv/files/armv5te/configmak
packages/mythtv/files/armv6/configh
packages/mythtv/files/armv6/configmak
packages/mythtv/files/armv7a/configh
packages/mythtv/files/armv7a/configmak
packages/mythtv/files/configh
packages/mythtv/files/configmak
packages/mythtv/mythtv-0.21/configure.patch
packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff
packages/neuros-public/neuros-mainmenu_git.bb
packages/neuros-public/neuros-nwm_git.bb
packages/nfs-utils/nfs-utils_1.1.2.bb
packages/python/python-setuptools/fix-log-usage.patch
classes/qmake.bbclass
conf/distro/angstrom-2008.1.conf
conf/machine/neuros-osd2.conf
packages/dsplink/codec-engine_2.10.bb
packages/h2200-bootloader/h2200-bootloader.bb
packages/libsdl/libsdl-image_1.2.3.bb
packages/libsdl/libsdl-net_1.2.7.bb
packages/libsdl/libsdl-ttf_2.0.3.bb
packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff
packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff
packages/linux/linux-omap2_git.bb
packages/mono/README
packages/mythtv/mythtv.inc
packages/mythtv/mythtv_0.18.1.bb
packages/mythtv/mythtv_0.20.bb
packages/mythtv/mythtv_0.21.bb
packages/mythtv/mythtv_svn.bb
packages/neuros-public/neuros-lib-widgets_git.bb
packages/neuros-public/neuros-qt-plugins_git.bb
packages/python/python-setuptools-native_0.6c8.bb
packages/python/python-setuptools_0.6c8.bb
packages/tcp-wrappers/tcp-wrappers_7.6.bb
packages/vlc/vlc-davinci_0.8.6h.bb
packages/linux/linux-rp-2.6.26/collie.patch
packages/linux/linux-rp-2.6.26/collie_keymap.patch
packages/linux/linux-rp-2.6.26/initramfs-config-collie
classes/packaged-staging.bbclass
packages/linux/linux-rp-2.6.26/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux-rp_2.6.26.bb
Diffs:
#
# mt diff -rd2f1a9f3ef64d23cec1e794848e1bb2ac1a92e63 -rf960843459326876ef399375d5affaacc45d0a46
#
#
#
# add_dir "packages/libsdl/libsdl-image-1.2.3"
#
# add_dir "packages/libsdl/libsdl-net-1.2.7"
#
# add_dir "packages/mono/mono-1.9.1"
#
# add_dir "packages/mythtv/files/armv5te"
#
# add_dir "packages/mythtv/files/armv6"
#
# add_dir "packages/mythtv/files/armv7a"
#
# add_dir "packages/mythtv/mythtv-0.21"
#
# add_dir "packages/python/python-setuptools"
#
# add_file "contrib/angstrom/source-mirror.txt"
# content [2e9ab07fc28af71188db82b6db0ad97fdacc72fe]
#
# add_file "packages/libsdl/libsdl-image-1.2.3/autotools.patch"
# content [e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3]
#
# add_file "packages/libsdl/libsdl-net-1.2.7/libtool2.patch"
# content [7f670962471074322af84e6361c3955b49a102f3]
#
# 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]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/mru-clocks3.diff"
# content [0ef415fc9374c8cd2d596f391dbd90b7e6578930]
#
# add_file "packages/lirc/lirc-modules_0.8.3+cvs20080713.bb"
# content [89ce1aeca5d8a6d9596df1bc0ead0b411a4d8cec]
#
# 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]
#
# add_file "packages/mythtv/files/armv5te/configh"
# content [a1db618df92dcc46ce8cbf9c979abf73197ea954]
#
# add_file "packages/mythtv/files/armv5te/configmak"
# content [2d37c9ec408fe8cf1e875293db6f3825bd74b5be]
#
# add_file "packages/mythtv/files/armv6/configh"
# content [3eea7cc66d82409b657a8f007332b546e81c53e4]
#
# add_file "packages/mythtv/files/armv6/configmak"
# content [91672d0d927bf7c8850ef66ce04730446a989d21]
#
# add_file "packages/mythtv/files/armv7a/configh"
# content [c0162436c40dac27f4962f26274bdd1627ae4215]
#
# add_file "packages/mythtv/files/armv7a/configmak"
# content [3d7ce3bc7c569cfe64eb8b44bba400381535f3dc]
#
# add_file "packages/mythtv/files/configh"
# content [5391daaca1ed71479d23273c605e1c78636d53ad]
#
# add_file "packages/mythtv/files/configmak"
# content [da39a3ee5e6b4b0d3255bfef95601890afd80709]
#
# add_file "packages/mythtv/mythtv-0.21/configure.patch"
# content [5bfba3207e4397a1084efecbbf093d613cc0e5eb]
#
# add_file "packages/mythtv/mythtv-0.21/ffmpeg-arm-update.diff"
# content [6962e2cf828b611a65198a1c990da9897fb4d478]
#
# add_file "packages/neuros-public/neuros-mainmenu_git.bb"
# content [556d6e6f57c68b97712cda2ea1ed2e9ada27b4fa]
#
# add_file "packages/neuros-public/neuros-nwm_git.bb"
# content [8066ae3bdfcaa465ac10245698627f7a5653631c]
#
# add_file "packages/nfs-utils/nfs-utils_1.1.2.bb"
# content [c8fc676bb8563f810f362e205ae46c3b75388b51]
#
# add_file "packages/python/python-setuptools/fix-log-usage.patch"
# content [1ee527f30af93cafced84bcc0d71b52bf1c1f1fd]
#
# patch "classes/qmake.bbclass"
# from [4fb295886f71d537f0bdce9a0c0548d276e993e9]
# to [a20a751e59164b6439563f4371d524846ffa0b5b]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [f64ebcf55e85b504d3be169befac3c7981aa74d9]
# to [9a6f55539463ce42e6876f571531293184af4d8d]
#
# patch "conf/machine/neuros-osd2.conf"
# from [e53737e49eb8880c1643d31fbfb73cc769ec96b2]
# to [fc797fb644aa9859c74f2d01e928e5409baf776b]
#
# patch "packages/dsplink/codec-engine_2.10.bb"
# from [d83292d24c597cfd09dbf4e868d8c748469883cc]
# to [3aa4a5c65d7f50eb4aa7926b5c458280ec0ac1e9]
#
# patch "packages/h2200-bootloader/h2200-bootloader.bb"
# from [d015a17dbeb17e4fef0f6d6df88a9ca9620cc88f]
# to [bcfd2dc1c12552564034f4d93f91e182d0936750]
#
# patch "packages/libsdl/libsdl-image_1.2.3.bb"
# from [5a0d595f2ccbc6a735854738caa59a51ac3630c0]
# to [f2c1ecbdcbca05fc7787d6e64dbd80e9a29107d0]
#
# patch "packages/libsdl/libsdl-net_1.2.7.bb"
# from [3ef6b382d1473344c9d55d2ebbd844d176758bd6]
# to [3fdc54c4a3e7db07f2c72d7d3d7f4348320a6357]
#
# patch "packages/libsdl/libsdl-ttf_2.0.3.bb"
# from [8ca2b92300d01da12e40b4ddfa3eb9b9dd5ab98d]
# to [ea5df0018b0c4a0b3f64c39d9957fc19affe5561]
#
# patch "packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff"
# from [05766144d6796d91cb3a002e2a3c75ce6a1b1d7d]
# to [0e87d3813fc787fe923b5d34a89181009743cc11]
#
# patch "packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff"
# from [016a4086941bdeb321b7ce106b8f205a88b4e6af]
# to [639a7c61d5b83da14414233125946adbfd4ccb1d]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [43ac6aa586b248d87d01286575371b1800bb3d2a]
# to [ef14668a9a1c7d97225d194c81aa52ace025f767]
#
# patch "packages/mono/README"
# from [ce24307d6afe8343f5db95c14efcac462e36c160]
# to [e957b1c88e0021bec7fb80690c2d0ee9085eff93]
#
# patch "packages/mythtv/mythtv.inc"
# from [bd289f60d1d68db7a6efc671001e68bcc3caee57]
# to [791a926b70e0610514c5daa741d5fe3cc8bbbd30]
#
# patch "packages/mythtv/mythtv_0.18.1.bb"
# from [9be2c80d0a535cb66ddb00c646649dbc5390ab7f]
# to [92f6955a2b8ead1580c9a5aa948cf2dafb2e0388]
#
# patch "packages/mythtv/mythtv_0.20.bb"
# from [f4c497560d89ece714fd55761cc10b1fd8598565]
# to [679bb68c24acd0032095de29d447f19019f397a9]
#
# patch "packages/mythtv/mythtv_0.21.bb"
# from [f29d4a96714e9f178504e26dc9f419a4b3f33db5]
# to [590a51ee6de14a40660a5ab607d88ecb36aaa2ff]
#
# patch "packages/mythtv/mythtv_svn.bb"
# from [c099b322a994478a2804d178c62e390bd2465c4d]
# to [a62aba89caeea442eddd4f8d81c674f222137675]
#
# patch "packages/neuros-public/neuros-lib-widgets_git.bb"
# from [99e7d5a361229e9fc69cb3d4fdefab5c3fe84ce8]
# to [066f779d14370cd80cffd7fd784d04df7990a255]
#
# patch "packages/neuros-public/neuros-qt-plugins_git.bb"
# from [a8b5931e6c77fb22d956e58b1f601344a24ad80b]
# to [8e03d1bc20bb51c31f921404d846b4c6fa902d59]
#
# patch "packages/python/python-setuptools-native_0.6c8.bb"
# from [98f58e21bf03997cb61c8459da61b888c73364f9]
# to [f5d6011427a630faa2fa13103a2503e98045d9ea]
#
# patch "packages/python/python-setuptools_0.6c8.bb"
# from [122ed3dd626cef08ab8b57defb23846772fdaa38]
# to [ed9de0fbcfd567e9243041f0ccaa8e7893a9c7f7]
#
# patch "packages/tcp-wrappers/tcp-wrappers_7.6.bb"
# from [05091d6ff40fb433090ad87a4d3a8c4568821b7c]
# to [ae842e46020f5c84a42cf753a5f0bfa53a00812f]
#
# patch "packages/vlc/vlc-davinci_0.8.6h.bb"
# from [89eeb1dfedcbed204a397ea4358d8fb53c581789]
# to [311b6631d2c164ed483e269854b4da6bc3236de6]
#
============================================================
--- contrib/angstrom/source-mirror.txt 2e9ab07fc28af71188db82b6db0ad97fdacc72fe
+++ contrib/angstrom/source-mirror.txt 2e9ab07fc28af71188db82b6db0ad97fdacc72fe
@@ -0,0 +1,14 @@
+#To populate the source mirror the autobuilder uses the following command:
+
+rsync ~/OE/downloads/ angstrom at linuxtogo.org:~/website/unstable/sources/ -av \
+ --exclude "*.md5" \
+ --exclude "svn" \
+ --exclude "cvs" \
+ --exclude "git" \
+ --exclude "umac.ko" \
+ --exclude "IPL_ixp400NpeLibrary-2_3_2.zip" \
+ --exclude "*.lock" \
+ --exclude "codec_*" \
+ --exclude "dsplink*" \
+ --progress
+
============================================================
--- packages/libsdl/libsdl-image-1.2.3/autotools.patch e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3
+++ packages/libsdl/libsdl-image-1.2.3/autotools.patch e1e2d2f7c7d55a077ed059b2b3a47f73f7614ee3
@@ -0,0 +1,805 @@
+Index: SDL_image-1.2.3/acinclude.m4
+===================================================================
+--- SDL_image-1.2.3.orig/acinclude.m4 2001-11-02 21:39:10.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,608 +0,0 @@
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_SDL,
+-[dnl
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
+- sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+- sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
+- , enable_sdltest=yes)
+-
+- if test x$sdl_exec_prefix != x ; then
+- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+- if test x${SDL_CONFIG+set} != xset ; then
+- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+- fi
+- fi
+- if test x$sdl_prefix != x ; then
+- sdl_args="$sdl_args --prefix=$sdl_prefix"
+- if test x${SDL_CONFIG+set} != xset ; then
+- SDL_CONFIG=$sdl_prefix/bin/sdl-config
+- fi
+- fi
+-
+- AC_REQUIRE([AC_CANONICAL_TARGET])
+- AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
+- min_sdl_version=ifelse([$1], ,0.11.0,$1)
+- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+- no_sdl=""
+- if test "$SDL_CONFIG" = "no" ; then
+- no_sdl=yes
+- else
+- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+-
+- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- if test "x$enable_sdltest" = "xyes" ; then
+- ac_save_CFLAGS="$CFLAGS"
+- ac_save_LIBS="$LIBS"
+- CFLAGS="$CFLAGS $SDL_CFLAGS"
+- LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+- rm -f conf.sdltest
+- AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+- char *new_str;
+-
+- if (str)
+- {
+- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+- strcpy (new_str, str);
+- }
+- else
+- new_str = NULL;
+-
+- return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+- int major, minor, micro;
+- char *tmp_version;
+-
+- /* This hangs on some systems (?)
+- system ("touch conf.sdltest");
+- */
+- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+- /* HP/UX 9 (%@#!) writes to sscanf strings */
+- tmp_version = my_strdup("$min_sdl_version");
+- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+- printf("%s, bad version string\n", "$min_sdl_version");
+- exit(1);
+- }
+-
+- if (($sdl_major_version > major) ||
+- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+- {
+- return 0;
+- }
+- else
+- {
+- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+- printf("*** best to upgrade to the required version.\n");
+- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+- printf("*** config.cache before re-running configure\n");
+- return 1;
+- }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- if test "x$no_sdl" = x ; then
+- AC_MSG_RESULT(yes)
+- ifelse([$2], , :, [$2])
+- else
+- AC_MSG_RESULT(no)
+- if test "$SDL_CONFIG" = "no" ; then
+- echo "*** The sdl-config script installed by SDL could not be found"
+- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the SDL_CONFIG environment variable to the"
+- echo "*** full path to sdl-config."
+- else
+- if test -f conf.sdltest ; then
+- :
+- else
+- echo "*** Could not run SDL test program, checking why..."
+- CFLAGS="$CFLAGS $SDL_CFLAGS"
+- LIBS="$LIBS $SDL_LIBS"
+- AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef main
+-#define main K_and_R_C_main
+-], [ return 0; ],
+- [ echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding SDL or finding the wrong"
+- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+- echo "*** to the installed location Also, make sure you have run ldconfig if that"
+- echo "*** is required on your system"
+- echo "***"
+- echo "*** If you have an old version installed, it is best to remove it, although"
+- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+- [ echo "*** The test program failed to compile or link. See the file config.log for the"
+- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- SDL_CFLAGS=""
+- SDL_LIBS=""
+- ifelse([$3], , :, [$3])
+- fi
+- AC_SUBST(SDL_CFLAGS)
+- AC_SUBST(SDL_LIBS)
+- rm -f conf.sdltest
+-])
+-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
+-## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
+-## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+-##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
+-
+-# serial 40 AC_PROG_LIBTOOL
+-AC_DEFUN(AC_PROG_LIBTOOL,
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-
+-# Save cache, so that ltconfig can load it
+-AC_CACHE_SAVE
+-
+-# Actually configure libtool. ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
+-|| AC_MSG_E%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -red4e5b420b127a2a4f722c324c8c61ee00caf977 -rf960843459326876ef399375d5affaacc45d0a46
#
#
#
# add_file "packages/linux/linux-rp-2.6.26/collie.patch"
# content [8a5d0916b37087cb7db9e5343a30aeba767cab10]
#
# add_file "packages/linux/linux-rp-2.6.26/collie_keymap.patch"
# content [d57618e329b43a114c5a25b5b8bdb408600074ff]
#
# add_file "packages/linux/linux-rp-2.6.26/initramfs-config-collie"
# content [bd72fd9d67ac81cee1b16a38489c6bb6395b29ca]
#
# patch "classes/packaged-staging.bbclass"
# from [d7e2bb166e10ab78e17adc253c90ba732da71f2f]
# to [4f060ea91ac7720a2a4bd8accdaa84c3305df4e3]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-collie"
# from [09f3d369cb3c051a14ffaec8b7116c1b8be66e50]
# to [c605cec73bcfbadfc27203a557ee8ae481f7370f]
#
# patch "packages/linux/linux-rp.inc"
# from [f9fa8c6c5a8b04b118872bcc1d856c9e0b008ac4]
# to [8c503982eb0f04c622745f3b357ce507a502d408]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [4782fd14fc4ea11a863598f899afcf59024885eb]
# to [8e37ea5330cc69fda41a71482d14ad5f29a375a9]
#
# patch "packages/linux/linux-rp_2.6.26.bb"
# from [ed9d1bca02fff2178ddacd8f62a4d282d50ac86e]
# to [85f16a25da2b1ef154850e283cc2acbc720956f1]
#
============================================================
--- packages/linux/linux-rp-2.6.26/collie.patch 8a5d0916b37087cb7db9e5343a30aeba767cab10
+++ packages/linux/linux-rp-2.6.26/collie.patch 8a5d0916b37087cb7db9e5343a30aeba767cab10
@@ -0,0 +1,1883 @@
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index c7ad324..daa2e0a 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -998,7 +998,7 @@ config CPU_FREQ_SA1100
+
+ config CPU_FREQ_SA1110
+ bool
+- depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)
++ depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3 || SA1100_COLLIE)
+ default y
+
+ config CPU_FREQ_INTEGRATOR
+diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c
+index e508028..36f726c 100644
+--- a/arch/arm/mach-sa1100/dma.c
++++ b/arch/arm/mach-sa1100/dma.c
+@@ -39,7 +39,7 @@ typedef struct {
+
+ static sa1100_dma_t dma_chan[SA1100_DMA_CHANNELS];
+
+-static spinlock_t dma_list_lock;
++static DEFINE_SPINLOCK(dma_list_lock);
+
+
+ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
+diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
+index 9caed30..79e19bf 100644
+--- a/drivers/input/keyboard/locomokbd.c
++++ b/drivers/input/keyboard/locomokbd.c
+@@ -265,6 +265,7 @@ static int __devinit locomokbd_probe(struct locomo_dev *dev)
+ for (i = 0; i < LOCOMOKBD_NUMKEYS; i++)
+ set_bit(locomokbd->keycode[i], input_dev->keybit);
+ clear_bit(0, input_dev->keybit);
++ locomo_writel(0, locomokbd->base + LOCOMO_KSC);
+
+ /* attempt to get the interrupt */
+ err = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd);
+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
+index 9f93c29..33fc5d6 100644
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -72,4 +72,10 @@ config MCP_UCB1200_TS
+ tristate "Touchscreen interface support"
+ depends on MCP_UCB1200 && INPUT
+
++config MCP_COLLIE_TS
++ tristate "Touchscreen collie support"
++ depends on MCP_UCB1200 && INPUT && !MCP_UCB1200_TS
++ ---help---
++ Driver for touchscreen on collie - sharp sl-5500.
++
+ endmenu
+diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
+index 33daa2f..0885ccd 100644
+--- a/drivers/mfd/Makefile
++++ b/drivers/mfd/Makefile
+@@ -16,7 +16,7 @@ obj-$(CONFIG_MCP) += mcp-core.o
+ obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o
+ obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o
+ obj-$(CONFIG_MCP_UCB1200_TS) += ucb1x00-ts.o
+-
++obj-$(CONFIG_MCP_COLLIE_TS) += collie-ts.o
+ ifeq ($(CONFIG_SA1100_ASSABET),y)
+ obj-$(CONFIG_MCP_UCB1200) += ucb1x00-assabet.o
+ endif
+diff --git a/drivers/mfd/collie-ts.c b/drivers/mfd/collie-ts.c
+new file mode 100644
+index 0000000..ddde5fc
+--- /dev/null
++++ b/drivers/mfd/collie-ts.c
+@@ -0,0 +1,449 @@
++/*
++ * Touchscreen driver for UCB1x00-based touchscreens
++ *
++ * Copyright (C) 2001 Russell King, All Rights Reserved.
++ * Copyright (C) 2005 Pavel Machek
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * 21-Jan-2002 <jco at ict.es> :
++ *
++ * Added support for synchronous A/D mode. This mode is useful to
++ * avoid noise induced in the touchpanel by the LCD, provided that
++ * the UCB1x00 has a valid LCD sync signal routed to its ADCSYNC pin.
++ * It is important to note that the signal connected to the ADCSYNC
++ * pin should provide pulses even when the LCD is blanked, otherwise
++ * a pen touch needed to unblank the LCD will never be read.
++ */
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/init.h>
++#include <linux/smp.h>
++#include <linux/smp_lock.h>
++#include <linux/sched.h>
++#include <linux/completion.h>
++#include <linux/delay.h>
++#include <linux/string.h>
++#include <linux/input.h>
++#include <linux/device.h>
++#include <linux/freezer.h>
++#include <linux/slab.h>
++#include <linux/kthread.h>
++
++#include <asm/dma.h>
++#include <asm/semaphore.h>
++#include <asm/arch/collie.h>
++#include <asm/mach-types.h>
++
++#include "ucb1x00.h"
++
++struct ucb1x00_ts {
++ struct input_dev *idev;
++ struct ucb1x00 *ucb;
++
++ wait_queue_head_t irq_wait;
++ struct task_struct *rtask;
++ u16 x_res;
++ u16 y_res;
++
++ unsigned int adcsync:1;
++};
++
++static int adcsync;
++
++/**********************************
++
++ ................
++ . . = 340
++ . .
++ . ^.
++ . ^.
++ . ^.
++ . ^.
++ . .
++ . X. = 10
++ . <<<<<<<< Y .
++ ................
++ . Sharp =200
++ . .
++ . - O - .
++ . .
++ ................
++
++**********************************/
++
++
++static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y)
++{
++ struct input_dev *idev = ts->idev;
++
++ input_report_abs(idev, ABS_X, x);
++ input_report_abs(idev, ABS_Y, y);
++ input_report_abs(idev, ABS_PRESSURE, pressure);
++ input_report_key(idev, BTN_TOUCH, 1);
++ input_sync(idev);
++}
++
++static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts)
++{
++ struct input_dev *idev = ts->idev;
++
++ input_report_abs(idev, ABS_PRESSURE, 0);
++ input_report_key(idev, BTN_TOUCH, 0);
++ input_sync(idev);
++}
++
++/*
++ * Switch to interrupt mode. This set touchscreen to interrupt
++ * mode, so that chip is able to send interrupt.
++ */
++static inline void ucb1x00_ts_mode_int(struct ucb1x00_ts *ts)
++{
++ ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++ UCB_TS_CR_TSMX_POW | UCB_TS_CR_TSPX_POW |
++ UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_GND |
++ UCB_TS_CR_MODE_INT);
++}
++
++/*
++ * Switch to pressure mode, and read pressure. We don't need to wait
++ * here, since both plates are being driven.
++ *
++ * set_read_pressure() in sharp code
++ */
++static inline void ucb1x00_ts_read_pressure(struct ucb1x00_ts *ts)
++{
++ ucb1x00_io_write(ts->ucb, COLLIE_TC35143_GPIO_TBL_CHK, 0);
++ ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++ UCB_TS_CR_TSPX_POW | UCB_TS_CR_TSMX_POW |
++ UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
++
++ ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr |
++ UCB_ADC_INP_AD2 |
++ UCB_ADC_SYNC_ENA);
++ udelay(100);
++ ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr |
++ UCB_ADC_INP_AD2 |
++ UCB_ADC_SYNC_ENA | UCB_ADC_START);
++}
++
++/*
++ * Switch to X position mode and measure Y plate. We switch the plate
++ * configuration in pressure mode, then switch to position mode. This
++ * gives a faster response time. Even so, we need to wait about 55us
++ * for things to stabilise.
++ */
++static inline void ucb1x00_ts_read_xpos(struct ucb1x00_ts *ts)
++{
++ ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
++ ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++ UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
++ UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
++
++
++ ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr |
++ UCB_ADC_INP_TSPY | UCB_ADC_SYNC_ENA);
++ udelay(100);
++ ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr |
++ UCB_ADC_INP_TSPY | UCB_ADC_SYNC_ENA |
++ UCB_ADC_START);
++}
++
++/*
++ * Switch to Y position mode and measure X plate. We switch the plate
++ * configuration in pressure mode, then switch to position mode. This
++ * gives a faster response time. Even so, we need to wait about 55us
++ * for things to stabilise.
++ */
++static inline void ucb1x00_ts_read_ypos(struct ucb1x00_ts *ts)
++{
++ ucb1x00_io_write(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
++
++ ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++ UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
++ UCB_TS_CR_MODE_POS | UCB_TS_CR_BIAS_ENA);
++
++
++ ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr |
++ UCB_ADC_INP_TSPX | UCB_ADC_SYNC_ENA);
++ udelay(100);
++ ucb1x00_reg_write(ts->ucb, UCB_ADC_CR, ts->ucb->adc_cr |
++ UCB_ADC_INP_TSPX | UCB_ADC_SYNC_ENA |
++ UCB_ADC_START);
++}
++
++/*
++ * Switch to X plate resistance mode. Set MX to ground, PX to
++ * supply. Measure current.
++ */
++static inline unsigned int ucb1x00_ts_read_xres(struct ucb1x00_ts *ts)
++{
++ ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++ UCB_TS_CR_TSMX_GND | UCB_TS_CR_TSPX_POW |
++ UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
++ return ucb1x00_adc_read(ts->ucb, 0, ts->adcsync);
++}
++
++/*
++ * Switch to Y plate resistance mode. Set MY to ground, PY to
++ * supply. Measure current.
++ */
++static inline unsigned int ucb1x00_ts_read_yres(struct ucb1x00_ts *ts)
++{
++ ucb1x00_reg_write(ts->ucb, UCB_TS_CR,
++ UCB_TS_CR_TSMY_GND | UCB_TS_CR_TSPY_POW |
++ UCB_TS_CR_MODE_PRES | UCB_TS_CR_BIAS_ENA);
++ return ucb1x00_adc_read(ts->ucb, 0, ts->adcsync);
++}
++
++/*
++ * This is a RT kernel thread that handles the ADC accesses
++ * (mainly so we can use semaphores in the UCB1200 core code
++ * to serialise accesses to the ADC).
++ */
++static int ucb1x00_thread(void *_ts)
++{
++ struct ucb1x00_ts *ts = _ts;
++ struct task_struct *tsk = current;
++ DECLARE_WAITQUEUE(wait, tsk);
++ int state;
++
++ /*
++ * We could run as a real-time thread. However, thus far
++ * this doesn't seem to be necessary.
++ */
++
++ add_wait_queue(&ts->irq_wait, &wait);
++
++ while (!kthread_should_stop()) {
++ unsigned int data[3];
++
++ for (state=0; state<3; state++) {
++
++ ucb1x00_adc_enable(ts->ucb);
++ ucb1x00_enable_irq(ts->ucb, UCB_IRQ_ADC, UCB_FALLING);
++ switch (state) {
++ /* Order matters here; last measurement seems to be more noisy then the
++ rest, and we care about pressure least */
++ case 2: ucb1x00_ts_read_pressure(ts);
++ break;
++ case 0: ucb1x00_ts_read_ypos(ts);
++ break;
++ case 1: ucb1x00_ts_read_xpos(ts);
++ break;
++ }
++ /* wait for adc */
++ try_to_freeze();
++ schedule_timeout(1000 * HZ);
++ ucb1x00_disable_irq(ts->ucb, UCB_IRQ_ADC, UCB_FALLING);
++ data[state] = UCB_ADC_DAT(ucb1x00_reg_read(ts->ucb, UCB_ADC_DATA));
++ ucb1x00_adc_disable(ts->ucb);
++ }
++
++ /* If not pressed any more, try to sleep! */
++ if (data[2] < 300) {
++ set_task_state(tsk, TASK_INTERRUPTIBLE);
++ ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_RISING);
++ ucb1x00_ts_mode_int(ts);
++ ucb1x00_disable(ts->ucb);
++ ucb1x00_ts_event_release(ts);
++ try_to_freeze();
++ schedule_timeout(1000 * HZ);
++ ucb1x00_disable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_RISING);
++ ucb1x00_enable(ts->ucb);
++ } else {
++ ucb1x00_ts_evt_add(ts, data[2], data[1], data[0]);
++ }
++ ucb1x00_disable(ts->ucb);
++ msleep(20);
++ ucb1x00_enable(ts->ucb);
++ }
++
++ remove_wait_queue(&ts->irq_wait, &wait);
++
++ ts->rtask = NULL;
++ return 0;
++}
++
++/*
++ * We only detect touch screen _touches_ with this interrupt
++ * handler, and even then we just schedule our task.
++ */
++static void ucb1x00_ts_irq(int idx, void *id)
++{
++ struct ucb1x00_ts *ts = id;
++ wake_up(&ts->irq_wait);
++}
++
++static void ucb1x00_adc_irq(int idx, void *id)
++{
++ struct ucb1x00_ts *ts = id;
++ wake_up(&ts->irq_wait);
++}
++
++static int ucb1x00_ts_open(struct input_dev *idev)
++{
++ struct ucb1x00_ts *ts = input_get_drvdata(idev);
++ int ret = 0;
++
++ BUG_ON(ts->rtask);
++
++ init_waitqueue_head(&ts->irq_wait);
++
++ ret = ucb1x00_hook_irq(ts->ucb, UCB_IRQ_TSPX, ucb1x00_ts_irq, ts);
++ if (ret < 0)
++ return ret;
++
++ ret = ucb1x00_hook_irq(ts->ucb, UCB_IRQ_ADC, ucb1x00_adc_irq, ts);
++ if (ret < 0) {
++ ucb1x00_free_irq(ts->ucb, UCB_IRQ_TSPX, ts);
++ return ret;
++ }
++
++ ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, UCB_RISING);
++
++ /*
++ * If we do this at all, we should allow the user to
++ * measure and read the X and Y resistance at any time.
++ */
++ ucb1x00_adc_enable(ts->ucb);
++ ts->x_res = ucb1x00_ts_read_xres(ts);
++ ts->y_res = ucb1x00_ts_read_yres(ts);
++ ucb1x00_adc_disable(ts->ucb);
++
++ if (machine_is_collie()) {
++ ucb1x00_io_set_dir(ts->ucb, 0, COLLIE_TC35143_GPIO_TBL_CHK);
++ }
++
++ ts->rtask = kthread_run(ucb1x00_thread, ts, "ktsd");
++ if (!IS_ERR(ts->rtask)) {
++ ret = 0;
++ } else {
++ ucb1x00_free_irq(ts->ucb, UCB_IRQ_TSPX, ts);
++ ts->rtask = NULL;
++ ret = -EFAULT;
++ }
++
++ return ret;
++}
++
++/*
++ * Release touchscreen resources. Disable IRQs.
++ */
++static void ucb1x00_ts_close(struct input_dev *idev)
++{
++ struct ucb1x00_ts *ts = input_get_drvdata(idev);
++
++ if (ts->rtask)
++ kthread_stop(ts->rtask);
++
++ ucb1x00_enable(ts->ucb);
++ ucb1x00_free_irq(ts->ucb, UCB_IRQ_TSPX, ts);
++ ucb1x00_free_irq(ts->ucb, UCB_IRQ_ADC, ts);
++ ucb1x00_reg_write(ts->ucb, UCB_TS_CR, 0);
++ ucb1x00_disable(ts->ucb);
++}
++
++#ifdef CONFIG_PM
++static int ucb1x00_ts_resume(struct ucb1x00_dev *dev)
++{
++ struct ucb1x00_ts *ts = dev->priv;
++
++ if (ts->rtask != NULL) {
++ /*
++ * Restart the TS thread to ensure the
++ * TS interrupt mode is set up again
++ * after sleep.
++ */
++ wake_up(&ts->irq_wait);
++ }
++ return 0;
++}
++#else
++#define ucb1x00_ts_resume NULL
++#endif
++
++
++/*
++ * Initialisation.
++ */
++static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
++{
++ struct ucb1x00_ts *ts;
++ struct input_dev *idev;
++ int err;
++
++ ts = kzalloc(sizeof(struct ucb1x00_ts), GFP_KERNEL);
++ idev = input_allocate_device();
++ if (!ts || !idev) {
++ err = -ENOMEM;
++ goto fail;
++ }
++
++ ts->ucb = dev->ucb;
++ ts->idev = idev;
++ ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
++
++ input_set_drvdata(idev, ts);
++ idev->name = "Touchscreen panel";
++ idev->id.product = ts->ucb->id;
++ idev->open = ucb1x00_ts_open;
++ idev->close = ucb1x00_ts_close;
++
++ __set_bit(EV_ABS, idev->evbit);
++ __set_bit(ABS_X, idev->absbit);
++ __set_bit(ABS_Y, idev->absbit);
++ __set_bit(ABS_PRESSURE, idev->absbit);
++
++ input_set_abs_params(ts->idev, ABS_X, 0, 450, 0, 0);
++ input_set_abs_params(ts->idev, ABS_Y, 200, 800, 0, 0);
++ input_set_abs_params(ts->idev, ABS_PRESSURE, 400, 800, 0, 0);
++
++
++ err = input_register_device(idev);
++ if (err)
++ goto fail;
++
++ dev->priv = ts;
++
++ return 0;
++
++ fail:
++ input_free_device(idev);
++ kfree(ts);
++ return err;
++}
++
++static void ucb1x00_ts_remove(struct ucb1x00_dev *dev)
++{
++ struct ucb1x00_ts *ts = dev->priv;
++
++ input_unregister_device(ts->idev);
++ kfree(ts);
++}
++
++static struct ucb1x00_driver ucb1x00_ts_driver = {
++ .add = ucb1x00_ts_add,
++ .remove = ucb1x00_ts_remove,
++ .resume = ucb1x00_ts_resume,
++};
++
++static int __init ucb1x00_ts_init(void)
++{
++ return ucb1x00_register_driver(&ucb1x00_ts_driver);
++}
++
++static void __exit ucb1x00_ts_exit(void)
++{
++ ucb1x00_unregister_driver(&ucb1x00_ts_driver);
++}
++
++module_param(adcsync, int, 0444);
++module_init(ucb1x00_ts_init);
++module_exit(ucb1x00_ts_exit);
++
++MODULE_AUTHOR("Russell King <rmk at arm.linux.org.uk>");
++MODULE_DESCRIPTION("UCB1x00 touchscreen driver");
++MODULE_LICENSE("GPL");
+diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h
+index a8ad8a0..137b043 100644
+--- a/drivers/mfd/ucb1x00.h
++++ b/drivers/mfd/ucb1x00.h
+@@ -34,7 +34,10 @@
+ #define UCB_IE_TCLIP (1 << 14)
+ #define UCB_IE_ACLIP%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list