merge of '6b8b18ee5d630cef0d9e1ebea010f36e7bdb083c'

     and 'a3ee5d88f6d1100cd285c2fead8e37018bd42a9f'

1 files changed, 61 insertions, 55 deletions

diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index edca1ed1c9..d74a22b652 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -2,68 +2,72 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-r13"
+PR = "${EZX}-r15"
+
 
 require linux.inc
 
 SRC_URI = " \
-    ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-    file://logo_linux_clut224.ppm \
-    \
-    file://patches/patch-2.6.21.4;patch=1 \
-    file://patches/ezx-core.patch;patch=1 \
-    file://patches/ezx-bp.patch;patch=1 \
-    file://patches/ezx-pm.patch;patch=1 \
-    file://patches/ezx-pcap.patch;patch=1 \
-    file://patches/a780-pcap.patch;patch=1 \
-    file://patches/e680-pcap.patch;patch=1 \
-    file://patches/a1200-pcap.patch;patch=1 \
-    file://patches/e6-pcap.patch;patch=1 \
-    file://patches/a780-mci.patch;patch=1 \
-    file://patches/e680-mci.patch;patch=1 \
-    file://patches/a1200-mci.patch;patch=1 \
-    file://patches/e6-mci.patch;patch=1 \
-    file://patches/pxa27x-udc-support.2.patch;patch=1 \
-    file://patches/ezx-emu.patch;patch=1 \
-    file://patches/a780-emu.patch;patch=1 \
-    file://patches/e680-emu.patch;patch=1 \
-    file://patches/ezx-mtd-map.patch;patch=1 \
-    file://patches/ezx-serial-bug-workaround.patch;patch=1 \
-    file://patches/pxa-kbd.patch;patch=1 \
-    file://patches/a780-kbd.patch;patch=1 \
-    file://patches/e680-kbd.patch;patch=1 \
-    file://patches/pcap-ts.patch;patch=1 \
-    file://patches/a780-ts.patch;patch=1 \
-    file://patches/e680-ts.patch;patch=1 \
-    file://patches/a1200-ts.patch;patch=1 \
-    file://patches/e6-ts.patch;patch=1 \
-    file://patches/ezx-eoc.patch;patch=1 \
-    file://patches/a1200-eoc.patch;patch=1 \
-    file://patches/e6-eoc.patch;patch=1 \
-    file://patches/ezx-backlight.patch;patch=1 \
-    file://patches/a780-flip.patch;patch=1 \
-    file://patches/e680-locksw.patch;patch=1 \
-    file://patches/a780-leds.patch;patch=1 \
-    file://patches/e680-leds.patch;patch=1 \
-    file://patches/a780-vibrator.patch;patch=1 \
-    file://patches/mux_cli.patch;patch=1 \
-    file://patches/mux-fix.patch;patch=1 \
-    file://patches/mux-fix-init-errorpath.patch;patch=1 \
-    file://patches/mux-remove-flipbuffers.patch;patch=1 \
-    file://patches/mux-remove-get_halted_bit.patch;patch=1 \
-    file://patches/mux-remove-usbh_finished_resume.patch;patch=1 \
-    file://patches/mux-fix-makefile.patch;patch=1 \
-    file://patches/mux-fix-tty-driver.patch;patch=1 \
-    file://patches/mux-linux-2.6.21-fix.patch;patch=1 \
-    file://patches/asoc-pxa-ssp.patch;patch=1 \
-    file://patches/asoc-fix-loopback.patch;patch=1 \
-    file://patches/ezx-asoc.patch;patch=1 \     
-    file://patches/mtdfix.patch;patch=1 \
-    file://defconfig \
-"
+	${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+	file://logo_linux_clut224.ppm \
+        \
+	file://patches/patch-2.6.21.4;patch=1 \
+	file://patches/ezx-core.patch;patch=1 \
+	file://patches/ezx-bp.patch;patch=1 \
+	file://patches/ezx-pm.patch;patch=1 \
+	file://patches/ezx-pcap.patch;patch=1 \
+        file://patches/a780-pcap.patch;patch=1 \
+        file://patches/e680-pcap.patch;patch=1 \
+        file://patches/a1200-pcap.patch;patch=1 \
+	file://patches/e6-pcap.patch;patch=1 \
+	file://patches/a780-mci.patch;patch=1 \
+	file://patches/e680-mci.patch;patch=1 \
+	file://patches/a1200-mci.patch;patch=1 \
+	file://patches/e6-mci.patch;patch=1 \
+	file://patches/pxa27x-udc-support.2.patch;patch=1 \
+	file://patches/ezx-emu.patch;patch=1 \
+        file://patches/a780-emu.patch;patch=1 \
+        file://patches/e680-emu.patch;patch=1 \
+	file://patches/ezx-mtd-map.patch;patch=1 \
+	file://patches/ezx-serial-bug-workaround.patch;patch=1 \
+	file://patches/pxa-kbd.patch;patch=1 \
+	file://patches/a780-kbd.patch;patch=1 \
+	file://patches/e680-kbd.patch;patch=1 \
+	file://patches/pcap-ts.patch;patch=1 \
+	file://patches/a780-ts.patch;patch=1 \
+	file://patches/e680-ts.patch;patch=1 \
+	file://patches/a1200-ts.patch;patch=1 \
+	file://patches/e6-ts.patch;patch=1 \
+        file://patches/ezx-eoc.patch;patch=1 \
+        file://patches/a1200-eoc.patch;patch=1 \
+	file://patches/e6-eoc.patch;patch=1 \
+	file://patches/ezx-backlight.patch;patch=1 \
+	file://patches/a780-flip.patch;patch=1 \
+	file://patches/e680-locksw.patch;patch=1 \
+	file://patches/a780-leds.patch;patch=1 \
+	file://patches/e680-leds.patch;patch=1 \
+	file://patches/a780-vibrator.patch;patch=1 \
+	file://patches/mux_cli.patch;patch=1 \
+	file://patches/mux-fix.patch;patch=1 \
+	file://patches/mux-fix-init-errorpath.patch;patch=1 \
+	file://patches/mux-remove-flipbuffers.patch;patch=1 \
+	file://patches/mux-remove-get_halted_bit.patch;patch=1 \
+	file://patches/mux-remove-usbh_finished_resume.patch;patch=1 \
+	file://patches/mux-fix-makefile.patch;patch=1 \
+	file://patches/mux-fix-tty-driver.patch;patch=1 \
+	file://patches/mux-linux-2.6.21-fix.patch;patch=1 \
+        file://patches/asoc-pxa-ssp.patch;patch=1 \
+        file://patches/asoc-fix-loopback.patch;patch=1 \
+        file://patches/ezx-asoc.patch;patch=1 \     
+        file://patches/mtdfix.patch;patch=1 \
+        file://patches/lcd_18BPP_support.diff;patch=1 \
+        file://defconfig \
+        \
+	"
 
 S = "${WORKDIR}/linux-${PV}"
 
+
 ##############################################################
 # kernel image resides on a seperate flash partition (for now)
 #
@@ -76,6 +80,7 @@ COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
 # For now the code for serial console is disabled in compress.c
 #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
 CMDLINE_CON = "console=tty1 "
+
 CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
 CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
 # Uncomment to enable dyntick
@@ -95,3 +100,4 @@ KERNEL_IMAGE_MAXSIZE = "1294336"
 #
 #module_autoload_pxaficp_ir = "pxaficp_ir"
 #module_autoload_snd-pcm-oss = "snd-pcm-oss"
+