summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/linux/a780+e680-kernels-2.6.bb2
-rw-r--r--packages/linux/a780-kernel-2.6.bb2
-rw-r--r--packages/linux/e680-kernel-2.6.bb2
-rw-r--r--packages/linux/linux-ezx/defconfig-a7804
-rw-r--r--packages/linux/linux-ezx/defconfig-e68025
-rw-r--r--packages/linux/linux-ezx/touchscreen-fix-r0.patch19
-rw-r--r--packages/linux/linux-ezx_2.6.16.13.bb6
7 files changed, 43 insertions, 17 deletions
diff --git a/packages/linux/a780+e680-kernels-2.6.bb b/packages/linux/a780+e680-kernels-2.6.bb
new file mode 100644
index 0000000000..62d01b7e0f
--- /dev/null
+++ b/packages/linux/a780+e680-kernels-2.6.bb
@@ -0,0 +1,2 @@
+COMPATIBLE_MACHINE = "a780"
+DEPENDS = "a780-kernel-2.6 e680-kernel-2.6"
diff --git a/packages/linux/a780-kernel-2.6.bb b/packages/linux/a780-kernel-2.6.bb
new file mode 100644
index 0000000000..d141f90b55
--- /dev/null
+++ b/packages/linux/a780-kernel-2.6.bb
@@ -0,0 +1,2 @@
+MACHINE = "a780"
+require linux-ezx_2.6.16.13.bb
diff --git a/packages/linux/e680-kernel-2.6.bb b/packages/linux/e680-kernel-2.6.bb
new file mode 100644
index 0000000000..df5624384e
--- /dev/null
+++ b/packages/linux/e680-kernel-2.6.bb
@@ -0,0 +1,2 @@
+MACHINE = "e680"
+require linux-ezx_2.6.16.13.bb
diff --git a/packages/linux/linux-ezx/defconfig-a780 b/packages/linux/linux-ezx/defconfig-a780
index 2e871b5d08..bc94f511c9 100644
--- a/packages/linux/linux-ezx/defconfig-a780
+++ b/packages/linux/linux-ezx/defconfig-a780
@@ -152,8 +152,8 @@ CONFIG_XSCALE_PMU=y
#
# Kernel Features
#
-# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
# CONFIG_AEABI is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
diff --git a/packages/linux/linux-ezx/defconfig-e680 b/packages/linux/linux-ezx/defconfig-e680
index 2d41817c51..ded3c1d670 100644
--- a/packages/linux/linux-ezx/defconfig-e680
+++ b/packages/linux/linux-ezx/defconfig-e680
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16.13
-# Sun May 21 21:11:16 2006
+# Thu May 18 19:40:25 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -122,7 +122,7 @@ CONFIG_PXA27x=y
CONFIG_IWMMXT=y
CONFIG_PXA_SPI=y
CONFIG_PXA_EZX_PCAP=y
-CONFIG_PXA_EZX_PCAP_EMU=y
+CONFIG_PXA_EZX_PCAP_EMU=m
#
# Processor Type
@@ -152,8 +152,8 @@ CONFIG_XSCALE_PMU=y
#
# Kernel Features
#
-# CONFIG_PREEMPT is not set
-# CONFIG_NO_IDLE_HZ is not set
+CONFIG_PREEMPT=y
+CONFIG_NO_IDLE_HZ=y
# CONFIG_AEABI is not set
# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
CONFIG_SELECT_MEMORY_MODEL=y
@@ -171,7 +171,7 @@ CONFIG_ALIGNMENT_TRAP=y
#
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttyS2,115200n8 console=tty1 noinitrd root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off debug"
+CONFIG_CMDLINE="mem=32M root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=1 ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off console=ttyS2,115200n8 console=tty0"
# CONFIG_XIP_KERNEL is not set
#
@@ -210,9 +210,9 @@ CONFIG_NET=y
# Networking options
#
# CONFIG_NETDEBUG is not set
-CONFIG_PACKET=m
+CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=m
+CONFIG_UNIX=y
CONFIG_XFRM=y
CONFIG_XFRM_USER=m
CONFIG_NET_KEY=m
@@ -672,7 +672,7 @@ CONFIG_INPUT=y
#
# CONFIG_INPUT_MOUSEDEV is not set
# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_TSDEV=m
CONFIG_INPUT_TSDEV_SCREEN_X=240
CONFIG_INPUT_TSDEV_SCREEN_Y=320
CONFIG_INPUT_EVDEV=y
@@ -700,8 +700,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_MTOUCH is not set
# CONFIG_TOUCHSCREEN_MK712 is not set
CONFIG_TOUCHSCREEN_PCAP=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
+# CONFIG_INPUT_MISC is not set
#
# Hardware I/O ports
@@ -839,9 +838,9 @@ CONFIG_SPI_BITBANG=m
# Motorola EZX devices
#
# CONFIG_KEYPAD_A780 is not set
-CONFIG_KEYPAD_E680=y
+# CONFIG_KEYPAD_E680 is not set
# CONFIG_KEYLIGHT_A780 is not set
-CONFIG_FMRADIO_E680=y
+# CONFIG_FMRADIO_E680 is not set
#
# Multimedia Capabilities Port drivers
@@ -1103,7 +1102,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
#
CONFIG_PROC_FS=y
CONFIG_SYSFS=y
-# CONFIG_TMPFS is not set
+CONFIG_TMPFS=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
CONFIG_RELAYFS_FS=m
diff --git a/packages/linux/linux-ezx/touchscreen-fix-r0.patch b/packages/linux/linux-ezx/touchscreen-fix-r0.patch
new file mode 100644
index 0000000000..7d19a887fc
--- /dev/null
+++ b/packages/linux/linux-ezx/touchscreen-fix-r0.patch
@@ -0,0 +1,19 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- linux-2.6.16/drivers/input/touchscreen/pcap_ts.c~touchscreen-fix-r0 2006-05-30 23:18:22.000000000 +0200
++++ linux-2.6.16/drivers/input/touchscreen/pcap_ts.c 2006-05-30 23:29:34.000000000 +0200
+@@ -126,10 +126,7 @@
+ if (ret < 0)
+ return ret;
+
+- if (tmp & 0x00400000)
+- return -EIO;
+-
+- if (pcap_ts->read_state == COORDINATE) {
++ if (pcap_ts->read_state == COORDINATE && !(tmp & 0x00400000)) {
+ pcap_ts->x = (tmp & SSP_PCAP_ADD1_VALUE_MASK);
+ pcap_ts->y = (tmp & SSP_PCAP_ADD2_VALUE_MASK)
+ >>SSP_PCAP_ADD2_VALUE_SHIFT;
diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index 1ae6377bdd..7e4b4e62de 100644
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
LICENSE = "GPL"
DEPENDS += "quilt-native"
EZX = "ezx6"
-PR = "${EZX}-r3"
+PR = "${EZX}-r4"
inherit kernel
@@ -15,6 +15,7 @@ inherit kernel
SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-exz6-symlink-fix.tar.bz2 \
+ file://touchscreen-fix-r0.patch;patch=1 \
file://defconfig-a780 \
file://defconfig-e680"
S = "${WORKDIR}/linux-2.6.16"
@@ -41,7 +42,7 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL
module_autoload_pxaficp_ir = "pxaficp_ir"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
-do_patch() {
+do_ezxpatch() {
mv ${WORKDIR}/patches ${S} && cd ${S} && quilt push -av
}
@@ -93,3 +94,4 @@ do_deploy() {
do_deploy[dirs] = "${S}"
addtask deploy before do_package after do_install
+addtask ezxpatch before do_patch after do_unpack