linux-oz-2.6: Kernel updates syncing with OE to update the LED patch series and add some misc bugfixes

git-svn-id: https://svn.o-hand.com/repos/poky@248 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 26 insertions, 17 deletions

diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc
index 7b7a6e72f2..2fc6f58007 100644
--- a/openembedded/packages/linux/linux-openzaurus.inc
+++ b/openembedded/packages/linux/linux-openzaurus.inc
@@ -25,7 +25,8 @@ CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
 CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
 CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw"
 CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw"
-CMDLINE_OTHER = "dyntick=enable debug"
+CMDLINE_OTHER = "dyntick=enable"
+CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
 
 ##############################################################
 # Configure memory/ramdisk split for collie
@@ -37,7 +38,7 @@ CMDLINE_MEM_collie = "mem=${mem}M"
 CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
 CMDLINE_ROTATE_akita = "fbcon=rotate:1"
 CMDLINE_ROTATE_borzoi = "fbcon=rotate:1"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER}"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}"
 
 ###############################################################
 # Enable or disable ELPP via local.conf - default is "no"
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.15.bb b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
index 99a22936f2..6e092702d1 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.15.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r0"
+PR = "r2"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -20,22 +20,24 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \
            ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \
            ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \
+           ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
            ${RPSRC}/ide_not_removable-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \
            ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \
-           ${RPSRC}/led_core-r10.patch;patch=1 \
-           ${RPSRC}/led_triggers-r8.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r3.patch;patch=1 \
-           ${RPSRC}/led_trig_sharpsl_pm-r2.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r7.patch;patch=1 \
-           ${RPSRC}/led_locomo-r4.patch;patch=1 \
-           ${RPSRC}/led_ide-r1.patch;patch=1 \
-           ${RPSRC}/led_nand-r1.patch;patch=1 \
+           ${RPSRC}/led_core-r11.patch;patch=1 \
+           ${RPSRC}/led_triggers-r9.patch;patch=1 \
+           ${RPSRC}/led_trig_timer-r4.patch;patch=1 \
+           ${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 \
+           ${RPSRC}/led_zaurus-r8.patch;patch=1 \
+           ${RPSRC}/led_locomo-r5.patch;patch=1 \
+           ${RPSRC}/led_ixp4xx-r0.patch;patch=1 \
+           ${RPSRC}/led_tosa-r2.patch;patch=1 \    
+           ${RPSRC}/led_ide-r2.patch;patch=1 \
+           ${RPSRC}/led_nand-r2.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r3.patch;patch=1 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
-           ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
            ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \
@@ -47,14 +49,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${DOSRC}/tc6393-device-r8.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r7.patch;patch=1 \
            ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \
-           ${DOSRC}/tosa-pxaac97-r5.patch;patch=1 \
-           ${DOSRC}/tosa-tc6393-r1.patch;patch=1 \
-           ${DOSRC}/tosa-power-r9.patch;patch=1 \
+           ${RPSRC}/temp/tosa-pxaac97-r5-rp.patch;patch=1 \
+           ${RPSRC}/temp/tosa-tc6393-r1-rp.patch;patch=1 \
+           ${RPSRC}/temp/tosa-power-r9-rp.patch;patch=1 \
            ${DOSRC}/tc6393fb-r9.patch;patch=1 \
-           ${DOSRC}/tosa-lcd-r6.patch;patch=1 \
+           ${RPSRC}/temp/tosa-lcd-r6-rp.patch;patch=1 \
            ${DOSRC}/tosa-bl-r9.patch;patch=1 \
            ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \
-           ${RPSRC}/led_tosa-r0.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \         
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
@@ -63,7 +64,14 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \
            ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \
            ${RPSRC}/alsa_akita_fix-r0.patch;patch=1 \
+           ${RPSRC}/zaurus_keyboard_tweak-r0.patch;patch=1 \
+           ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \
+           ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \
+           ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \
+           ${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \
+           ${RPSRC}/pxa_clocks-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r0.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-do-r1.patch;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \