[oe-commits] org.oe.dev merge of '2641af179102d54034675cfdb4e90ed8d63ee913'
pfalcon commit
openembedded-commits at lists.openembedded.org
Fri Feb 1 17:53:16 UTC 2008
merge of '2641af179102d54034675cfdb4e90ed8d63ee913'
and 'e870bd2d79dc7b64ecc6d9ebf5a41c7f98b66d9b'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: edd46f6b477e2a693c84c2ba999b868f23a733f0
ViewMTN: http://monotone.openembedded.org/revision/info/edd46f6b477e2a693c84c2ba999b868f23a733f0
Files:
1
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/gcc/gcc-4.1.0
packages/gcc/gcc-4.1.0/arm-nolibfloat.patch
packages/gcc/gcc-4.1.0/arm-softfloat.patch
packages/gcc/gcc-4.1.0/ldflags.patch
packages/gcc/gcc-4.1.0/pr34130.patch
packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch
packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch
packages/strace/strace-4.5.14
packages/strace/strace-4.5.14/arm-eabi.patch
packages/strace/strace-4.5.14/drop-ctl-proc.patch
packages/strace/strace-4.5.14/glibc-2.5.patch
packages/strace/strace-4.5.14/sh-arch-update.patch
packages/strace/strace-4.5.14/sh-syscall-update.patch
packages/strace/strace_4.5.14.bb
packages/ttf-fonts/ttf-dejavu_2.18.bb
packages/ttf-fonts/ttf-dejavu_2.23.bb
packages/libc-client
packages/libexosip2
packages/libexosip2/files
packages/u-boot/u-boot-1.3.1
packages/libc-client/libc-client_2007.bb
packages/libexosip2/files/simplify-flags.patch
packages/libexosip2/libexosip2_2.2.3.bb
packages/linux/linux-openmoko_2.6.24.bb
packages/linux/linux-rp-2.6.23/mtd-module.patch
packages/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch
packages/linux/linux-rp-2.6.23/wm8750-treble.patch
packages/linux/linux-rp-2.6.24/mtd-module.patch
packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch
packages/linux/linux-rp-2.6.24/wm8750-treble.patch
packages/u-boot/u-boot_1.3.1.bb
packages/xorg-xserver/xserver-kdrive-1.3.0.0/linux-keyboard-mediumraw.patch
packages/xorg-xserver/xserver-kdrive-1.4/linux-keyboard-mediumraw.patch
MAINTAINERS
conf/checksums.ini
conf/local.conf.sample
conf/machine/mpc8313e-rdb.conf
packages/linux/linux-rp-2.6.23/defconfig-spitz
packages/linux/linux-rp-2.6.24/defconfig-spitz
packages/linux/linux-rp_2.6.23.bb
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux_2.6.23.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
packages/navit/files/navit.desktop
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
packages/php/php-native_4.4.4.bb
packages/php/php-native_5.2.0.bb
packages/php/php.inc
packages/php/php_4.4.4.bb
packages/php/php_5.1.4.bb
packages/php/php_5.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:
#
# mt diff -r2641af179102d54034675cfdb4e90ed8d63ee913 -redd46f6b477e2a693c84c2ba999b868f23a733f0
#
#
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [c768b9d1c19df1d7e887abfa05c239ccf9218529]
# to [679a152fab923d34ccb9cd6b19ed77f4b7dac487]
#
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc c768b9d1c19df1d7e887abfa05c239ccf9218529
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 679a152fab923d34ccb9cd6b19ed77f4b7dac487
@@ -886,7 +886,7 @@ PREFERRED_VERSION_libgeda ?= "20050820"
PREFERRED_VERSION_libgc ?= "6.7"
PREFERRED_VERSION_libgcrypt ?= "1.2.3"
PREFERRED_VERSION_libgeda ?= "20050820"
-PREFERRED_VERSION_libgemwidget ?= "0.1"
+PREFERRED_VERSION_libgemwidget ?= "1.0"
PREFERRED_VERSION_libglade ?= "2.6.2"
PREFERRED_VERSION_libglademm ?= "2.4.1"
PREFERRED_VERSION_libgmime ?= "2.1.7"
@@ -918,7 +918,7 @@ PREFERRED_VERSION_libhtml-mason-perl ?=
PREFERRED_VERSION_libhildonhelp ?= "1.9.1"
PREFERRED_VERSION_libhildonmime ?= "1.9.5"
PREFERRED_VERSION_libhtml-mason-perl ?= "1.35"
-PREFERRED_VERSION_libiac ?= "0.1"
+PREFERRED_VERSION_libiac ?= "1.0"
PREFERRED_VERSION_libice ?= "1.0.4"
PREFERRED_VERSION_libiconv ?= "1.11"
PREFERRED_VERSION_libid3 ?= "1.1"
@@ -946,7 +946,7 @@ PREFERRED_VERSION_libmikmod ?= "3.2.0-be
PREFERRED_VERSION_libmatchbox ?= "1.9"
PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
-PREFERRED_VERSION_libmimedir ?= "0.3.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
PREFERRED_VERSION_libmng ?= "1.0.8"
PREFERRED_VERSION_libmodplug ?= "0.7"
PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
#
# mt diff -re870bd2d79dc7b64ecc6d9ebf5a41c7f98b66d9b -redd46f6b477e2a693c84c2ba999b868f23a733f0
#
#
#
# delete "packages/gcc/gcc-4.1.0"
#
# delete "packages/gcc/gcc-4.1.0/arm-nolibfloat.patch"
#
# delete "packages/gcc/gcc-4.1.0/arm-softfloat.patch"
#
# delete "packages/gcc/gcc-4.1.0/ldflags.patch"
#
# delete "packages/gcc/gcc-4.1.0/pr34130.patch"
#
# delete "packages/gcc/gcc-4.1.0/zecke-no-host-includes.patch"
#
# delete "packages/gcc/gcc-4.1.0/zecke-xgcc-cpp.patch"
#
# delete "packages/strace/strace-4.5.14"
#
# delete "packages/strace/strace-4.5.14/arm-eabi.patch"
#
# delete "packages/strace/strace-4.5.14/drop-ctl-proc.patch"
#
# delete "packages/strace/strace-4.5.14/glibc-2.5.patch"
#
# delete "packages/strace/strace-4.5.14/sh-arch-update.patch"
#
# delete "packages/strace/strace-4.5.14/sh-syscall-update.patch"
#
# delete "packages/strace/strace_4.5.14.bb"
#
# rename "packages/ttf-fonts/ttf-dejavu_2.18.bb"
# to "packages/ttf-fonts/ttf-dejavu_2.23.bb"
#
# add_dir "packages/gcc/gcc-4.1.0"
#
# add_dir "packages/libc-client"
#
# add_dir "packages/libexosip2"
#
# add_dir "packages/libexosip2/files"
#
# add_dir "packages/strace/strace-4.5.14"
#
# add_dir "packages/u-boot/u-boot-1.3.1"
#
# add_file "packages/libc-client/libc-client_2007.bb"
# content [dcb090c4d410023a909a329539867a7368d5f4ea]
#
# add_file "packages/libexosip2/files/simplify-flags.patch"
# content [630c340f557e9b7b20fc9f01bb0b1b53206baaca]
#
# add_file "packages/libexosip2/libexosip2_2.2.3.bb"
# content [808625b158ef2d4abf43a342aaba02ec63b2a17d]
#
# add_file "packages/linux/linux-openmoko_2.6.24.bb"
# content [4527abefc5b7568128b1443a52304c3ab1f9f35b]
#
# add_file "packages/linux/linux-rp-2.6.23/mtd-module.patch"
# content [3336d389463dfeab12804b8b425c9451ac9ba8ea]
#
# add_file "packages/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch"
# content [6fb750fdfb34ec9fb77ea05cf1226ffc210c8d83]
#
# add_file "packages/linux/linux-rp-2.6.23/wm8750-treble.patch"
# content [075d3018a7b6514bfd21550eb2cf93372b02ac02]
#
# add_file "packages/linux/linux-rp-2.6.24/mtd-module.patch"
# content [3336d389463dfeab12804b8b425c9451ac9ba8ea]
#
# add_file "packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch"
# content [73fadc16c16d9a7a8e42c53e79e6eba467cdf59b]
#
# add_file "packages/linux/linux-rp-2.6.24/wm8750-treble.patch"
# content [075d3018a7b6514bfd21550eb2cf93372b02ac02]
#
# add_file "packages/strace/strace-4.5.14/arm-eabi.patch"
# content [639027b92d1a3a767c91ca53960b72a1829d12ad]
#
# add_file "packages/strace/strace-4.5.14/drop-ctl-proc.patch"
# content [c1d30e3402d25472d4bd070e1d1c037eb35c24d8]
#
# add_file "packages/strace/strace-4.5.14/glibc-2.5.patch"
# content [39fc25c263abb94f37d2cba803ef5efb6b9534ce]
#
# add_file "packages/strace/strace-4.5.14/sh-arch-update.patch"
# content [893a192f784cc6ecb86aa0700e55a264860240a2]
#
# add_file "packages/strace/strace-4.5.14/sh-syscall-update.patch"
# content [d817cfb859b256a6839d651ac4992d2be22ec3d7]
#
# add_file "packages/strace/strace_4.5.14.bb"
# content [f3944c0411e8d2e28655e1455d5c1e7cd845b84e]
#
# add_file "packages/u-boot/u-boot_1.3.1.bb"
# content [146fc7fff1c04aa2f88d874a7a7ca0f258bc4f59]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/linux-keyboard-mediumraw.patch"
# content [e5ade42dad2df4fd8a283ea21343e22ea1b5b5d6]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.4/linux-keyboard-mediumraw.patch"
# content [faca4d8feba0272517c84f11ac61a39c0b055556]
#
# patch "MAINTAINERS"
# from [134cc9c6964a61ba273449dc3e21800354e848d7]
# to [7689bc2bd76763e490c074c1726f33bf4a344b8b]
#
# patch "conf/checksums.ini"
# from [f3de66c07704795e4d713a57ccd83f857a134a2b]
# to [d46efbb6c50b6c05af0157650b6e3e6a51f5243d]
#
# patch "conf/local.conf.sample"
# from [6489f64f53748259d3ce778d7dcb4a1d20ad3af9]
# to [eea5f30083587d9ac3261c904bbde0f7c622b752]
#
# patch "conf/machine/mpc8313e-rdb.conf"
# from [74259c283b88887c4f38522bae31bc486a835867]
# to [f24e1a2aa898afd23e87bf623adfe947da548a3d]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-spitz"
# from [b7ae462871d969fb588349aa16c4991646c4ff65]
# to [b071f674a2ac8b9b060cc5de413b281a6f19e5c6]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-spitz"
# from [f65cb0f276b3dc6b756efc00689ee05903f1c6d1]
# to [1c089b38d34a93c68659ef90bec902bbbcf436ae]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [bf2b606ecad71b6a7370755bab2aed262e13b27e]
# to [6965363fa2cff8dd8ad9456b52eae4a5f5f5e318]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [f4ce0a6d362f7ef0d1493f8b2e5e3332f72403e8]
# to [9191ec3a826c86540d5d145050269444154acb88]
#
# patch "packages/linux/linux_2.6.23.bb"
# from [8ad01fe63d105bb77ac6f9c29bb95d4288cc9b0b]
# to [a6f0a73d2b5930f50b709b6669aa86d7f65a6d74]
#
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
# from [cb4b1a3fa94063a6a58d7708d18cd876f4054b95]
# to [ce8102726412e1b04363855281ec051dd12b4ef8]
#
# patch "packages/navit/files/navit.desktop"
# from [abe450116dc6bb7263347dd948f736d0e612f95e]
# to [4bd9c1fc6d6d79d62fb6649382c319374e729bfb]
#
# patch "packages/navit/navit.inc"
# from [4e36ed086e689535bed08a5953f1f330300dc53f]
# to [28415a06640e4a381ab952253232f3944e7a3ad5]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [15b167521e9d10044612c9a9841fd32e13f97363]
# to [3ad70f521cf586024807037618604fc516e2a10a]
#
# patch "packages/navit/navit_cvs.bb"
# from [08dc55cf2a02719d9345a11b1fac91807d8b2e86]
# to [60cd23b58b422d69f9b6d3fb1d4e070ad166d8eb]
#
# patch "packages/php/php-native_4.4.4.bb"
# from [9eeba9981baf41f97fef5af6e2cdcfc742a57d6e]
# to [47e925f0ddbe96be21e9dba73e3412fe38ce6f0a]
#
# patch "packages/php/php-native_5.2.0.bb"
# from [18904fb48790405a599d27c48c958710902b361b]
# to [d63921a825ab9861b0bdfe0b1f761b44f25c414e]
#
# patch "packages/php/php.inc"
# from [c315473a94a1152128b9a5e36265761e013dff8d]
# to [05d469fc771d0798c8e8fc750ab8e1c1dde63c41]
#
# patch "packages/php/php_4.4.4.bb"
# from [830201995cc4ff74cc2704326cd886ada812d1e0]
# to [fb6d405a03a5996ba1806426b0a905791173e301]
#
# patch "packages/php/php_5.1.4.bb"
# from [9c66e44fe96affb7d82ed7a6bc9371c158f7d081]
# to [e3f518eac4c616faa17ae879f81b81abae3ad3e2]
#
# patch "packages/php/php_5.2.0.bb"
# from [f5e6351133ed8a63775ea4f3df9f159865e7d2c4]
# to [a163ebe31efaf24ca70addf00fa32e5b9c85c89a]
#
# patch "packages/ttf-fonts/ttf-dejavu_2.23.bb"
# from [d6a59ef2ae0c1a9ebaeabf4cf01a83de1df37d44]
# to [fb12ffa0e0b11e13b88d1a6e8b63489c7c461026]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [c8df66fc28ad69123340b7acdf08b827bc631c09]
# to [350011b7ffab8f9ef0f5d7295afe014941cf3492]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
# from [fc1b8a97acf55bb4abc9d1d2ad120b71d1d4f15a]
# to [b08682b1e497d6999914f7b52000ff0293b6b2ef]
#
============================================================
--- packages/libc-client/libc-client_2007.bb dcb090c4d410023a909a329539867a7368d5f4ea
+++ packages/libc-client/libc-client_2007.bb dcb090c4d410023a909a329539867a7368d5f4ea
@@ -0,0 +1,25 @@
+DESCRIPTION = "UW c-client library for mail protocols"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "University of Washington's Free-Fork License"
+DEPENDS = "libpam openssl"
+
+SRC_URI = "ftp://ftp.cac.washington.edu/imap/c-client.tar.Z"
+
+S = "${WORKDIR}/imap-2007"
+
+EXTRA_OEMAKE = "CC='${CC}'"
+
+HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h"
+
+do_compile() {
+ echo "SSLINCLUDE=${STAGING_INCDIR}/openssl SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS
+ oe_runmake lnp
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/c-client
+ install ${HEADERS} ${STAGING_INCDIR}/c-client
+ install c-client/c-client.a ${STAGING_LIBDIR}/libc-client.a
+}
+
============================================================
--- packages/libexosip2/files/simplify-flags.patch 630c340f557e9b7b20fc9f01bb0b1b53206baaca
+++ packages/libexosip2/files/simplify-flags.patch 630c340f557e9b7b20fc9f01bb0b1b53206baaca
@@ -0,0 +1,27 @@
+diff -urN libeXosip2-2.2.3.orig/src/Makefile.am libeXosip2-2.2.3/src/Makefile.am
+--- libeXosip2-2.2.3.orig/src/Makefile.am 2005-10-07 14:44:38.000000000 +0200
++++ libeXosip2-2.2.3/src/Makefile.am 2008-01-23 16:05:07.000000000 +0100
+@@ -27,7 +27,7 @@
+ jpipe.c jpipe.h jauth.c \
+ sdp_offans.c jpublish.c
+
+-libeXosip2_la_LDFLAGS = -L$(prefix)/lib -version-info $(LIBEXOSIP_SO_VERSION)
++libeXosip2_la_LDFLAGS = -version-info $(LIBEXOSIP_SO_VERSION)
+ libeXosip2_la_LIBADD = -losip2 @EXOSIP_LIB@ @PTHREAD_LIBS@
+
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include -I$(includedir)
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+diff -urN libeXosip2-2.2.3.orig/tools/Makefile.am libeXosip2-2.2.3/tools/Makefile.am
+--- libeXosip2-2.2.3.orig/tools/Makefile.am 2005-07-24 02:11:43.000000000 +0200
++++ libeXosip2-2.2.3/tools/Makefile.am 2008-01-23 16:11:07.000000000 +0100
+@@ -9,8 +9,8 @@
+
+ sip_reg_LDFLAGS = -O @EXOSIP_LIB@ @PTHREAD_LIBS@ @JOSUA_LIB@
+
+-sip_reg_LDADD = -L$(prefix)/lib $(top_builddir)/src/libeXosip2.la -losip2 -losipparser2
++sip_reg_LDADD = $(top_builddir)/src/libeXosip2.la -losip2 -losipparser2
+
+-INCLUDES = -I$(prefix)/include -I$(top_srcdir) -I$(top_srcdir)/include -I$(includedir)
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+
+
============================================================
--- packages/libexosip2/libexosip2_2.2.3.bb 808625b158ef2d4abf43a342aaba02ec63b2a17d
+++ packages/libexosip2/libexosip2_2.2.3.bb 808625b158ef2d4abf43a342aaba02ec63b2a17d
@@ -0,0 +1,19 @@
+DESCRIPTION = "High level Session Initiation Protocol (SIP) library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "libosip2"
+SRCNAME = "libeXosip2"
+LEAD_SONAME = "libeXosip2"
+
+PR = "r0"
+SRC_URI = "http://download.savannah.nongnu.org/releases/exosip/${SRCNAME}-${PV}.tar.gz \
+ file://simplify-flags.patch;patch=1"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit autotools pkgconfig
+EXTRA_OECONF = "--disable-josua"
+
+do_stage() {
+ autotools_stage_all
+}
============================================================
--- packages/linux/linux-openmoko_2.6.24.bb 4527abefc5b7568128b1443a52304c3ab1f9f35b
+++ packages/linux/linux-openmoko_2.6.24.bb 4527abefc5b7568128b1443a52304c3ab1f9f35b
@@ -0,0 +1,60 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko"
+VANILLA_VERSION = "2.6.24"
+KERNEL_RELEASE = "2.6.24"
+
+KERNEL_VERSION = "${KERNEL_RELEASE}"
+
+PV = "${VANILLA_VERSION}+svnr${SRCREV}"
+PR = "r1"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "30008000"
+
+##############################################################
+# source and patches
+#
+SRCREV_FORMAT = "patches-rconfig"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+ svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \
+ svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config "
+
+S = "${WORKDIR}/linux-${VANILLA_VERSION}"
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+#
+ALLOW_EMPTY = "1"
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02'
+
+CMDLINE = "unused -- bootloader passes ATAG list"
+
+###############################################################
+# module configs specific to this kernel
+#
+
+# usb
+module_autoload_ohci-hcd = "ohci-hcd"
+module_autoload_hci_usb = "hci_usb"
+module_autoload_g_ether = "g_ether"
+# audio
+module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
+module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+# sd/mmc
+module_autoload_s3cmci = "s3cmci"
+
+do_prepatch() {
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ mv patches patches.openmoko
+ mv .pc .pc.old
+ mv ${WORKDIR}/config/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig
+}
+
+addtask prepatch after do_unpack before do_patch
============================================================
--- packages/linux/linux-rp-2.6.23/mtd-module.patch 3336d389463dfeab12804b8b425c9451ac9ba8ea
+++ packages/linux/linux-rp-2.6.23/mtd-module.patch 3336d389463dfeab12804b8b425c9451ac9ba8ea
@@ -0,0 +1,13 @@
+Index: linux-2.6.23/drivers/mtd/maps/Kconfig
+===================================================================
+--- linux-2.6.23/drivers/mtd/maps/Kconfig
++++ linux-2.6.23/drivers/mtd/maps/Kconfig
+@@ -600,7 +600,7 @@
+ default "4"
+
+ config MTD_SHARP_SL
+- bool "ROM mapped on Sharp SL Series"
++ tristate "ROM mapped on Sharp SL Series"
+ depends on ARCH_PXA
+ help
+ This enables access to the flash chip on the Sharp SL Series of PDAs.
============================================================
--- packages/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch 6fb750fdfb34ec9fb77ea05cf1226ffc210c8d83
+++ packages/linux/linux-rp-2.6.23/sharpsl-rc-r1.patch 6fb750fdfb34ec9fb77ea05cf1226ffc210c8d83
@@ -0,0 +1,519 @@
+Index: linux-2.6.23/arch/arm/mach-pxa/spitz.c
+===================================================================
+--- linux-2.6.23.orig/arch/arm/mach-pxa/spitz.c
++++ linux-2.6.23/arch/arm/mach-pxa/spitz.c
+@@ -245,6 +245,13 @@ static struct platform_device spitzkbd_d
+ .id = -1,
+ };
+
++/*
++ * Spitz Remote Control Device
++ */
++static struct platform_device sharpsl_rc_device = {
++ .name = "sharpsl-remote-control",
++ .id = -1,
++};
+
+ /*
+ * Spitz LEDs
+@@ -477,6 +484,7 @@ static struct platform_device *devices[]
+ &spitzscoop_device,
+ &spitzssp_device,
+ &spitzkbd_device,
++ &sharpsl_rc_device,
+ &spitzts_device,
+ &spitzbl_device,
+ &spitzled_device,
+Index: linux-2.6.23/drivers/input/keyboard/Kconfig
+===================================================================
+--- linux-2.6.23.orig/drivers/input/keyboard/Kconfig
++++ linux-2.6.23/drivers/input/keyboard/Kconfig
+@@ -154,6 +154,17 @@ config KEYBOARD_SPITZ
+ To compile this driver as a module, choose M here: the
+ module will be called spitzkbd.
+
++config SHARPSL_RC
++ tristate "Sharp SL-Cxx00 Remote Control"
++ depends on PXA_SHARPSL
++ default y
++ help
++ Say Y here to enable the remote on the Sharp Zaurus SL-Cxx00,
++ SL-C1000, SL-C3000 and Sl-C3100 series of PDAs.
++
++ To compile this driver as a module, choose M here: the
++ module will be called sharpsl_rc.
++
+ config KEYBOARD_AMIGA
+ tristate "Amiga keyboard"
+ depends on AMIGA
+Index: linux-2.6.23/drivers/input/keyboard/Makefile
+===================================================================
+--- linux-2.6.23.orig/drivers/input/keyboard/Makefile
++++ linux-2.6.23/drivers/input/keyboard/Makefile
+@@ -15,6 +15,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON) += newton
+ obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
+ obj-$(CONFIG_KEYBOARD_CORGI) += corgikbd.o
+ obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o
++obj-$(CONFIG_SHARPSL_RC) += sharpsl_rc.o
+ obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
+ obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
+ obj-$(CONFIG_KEYBOARD_OMAP) += omap-keypad.o
+Index: linux-2.6.23/drivers/input/keyboard/sharpsl_rc.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/input/keyboard/sharpsl_rc.c
+@@ -0,0 +1,291 @@
++/*
++ * Keyboard driver for Sharp Clamshell Models (SL-Cxx00)
++ *
++ * Copyright (c) 2004-2005 Richard Purdie
++ *
++ * Based on corgikbd.c and Sharp's RC driver
++ *
++ * 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.
++ *
++ */
++
++#define DEBUG 1
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/init.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/jiffies.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++
++#ifdef CONFIG_MACH_SPITZ
++#include <asm/arch/spitz.h>
++#endif
++#ifdef CONFIG_MACH_CORGI
++#include <asm/arch/corgi.h>
++#endif
++
++#include <asm/arch/hardware.h>
++#include <asm/arch/pxa-regs.h>
++#include <as%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list