linux-oz-2.6: Sync with OE. Includes .bb cleanup, patch classification and poky specific logo handling

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

1 files changed, 62 insertions, 55 deletions

diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.16.bb b/openembedded/packages/linux/linux-openzaurus_2.6.16.bb
index 00eb85ca0d..0116d3098a 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r22"
+PR = "r37"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -13,47 +13,61 @@ PR = "r22"
 # Patches submitted upstream are towards top of this list 
 # Hacks should clearly named and at the bottom
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
-           file://rmk-mmc1.patch;patch=1 \
-           file://rmk-mmc2.patch;patch=1 \
-           file://integrator_rgb-r0.patch;patch=1 \
-           ${RPSRC}/led_core-r15.patch;patch=1 \
-           ${RPSRC}/led_triggers-r14.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r8.patch;patch=1 \
-           ${RPSRC}/led_trig_sharpsl_pm-r5.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r10.patch;patch=1 \
-           ${RPSRC}/led_locomo-r7.patch;patch=1 \
-           ${RPSRC}/led_ixp4xx-r2.patch;patch=1 \
-           ${RPSRC}/led_tosa-r5.patch;patch=1 \
-           ${RPSRC}/led_ide-r6.patch;patch=1 \
-           ${RPSRC}/led_nand-r3.patch;patch=1 \
-           ${RPSRC}/ide_end_request-r1.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-library-functions.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-arm-cleanup-r1.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-class.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-class-fix.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-class-fix-2.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-i2c-cleanup-r1.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-sysfs-interface.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-proc-interface.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-dev-interface.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-x1205-driver.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-test-device-driver.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-ds1672-driver.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-pcf8563-driver.patch;patch=1 \
-           ${RPSRC}/rtc-subsystem-rs5c372-driver.patch;patch=1 \
-           ${RPSRC}/rtc_class_pxa-r2.patch;patch=1 \
-           ${RPSRC}/rmk_pxa_mmc_timeout-r0.patch;patch=1 \
-           ${RPSRC}/integrator_rtc-r0.patch;patch=1 \
-           ${RPSRC}/zaurus_keyboard_tweak-r3.patch;patch=1 \
-           ${RPSRC}/arm_eabi_enum_fix-r0.patch;patch=1 \
-           ${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \
-           ${RPSRC}/spitz_kbd_fix-r0.patch;patch=1 \
-           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
-           ${RPSRC}/fbmem_fix-r1.patch;patch=1 \
+           file://rmk-mmc1.patch;patch=1;status=merged \
+           file://rmk-mmc2.patch;patch=1;status=merged \
+           ${RPSRC}/led_core-r15.patch;patch=1;status=merged \
+           ${RPSRC}/led_triggers-r14.patch;patch=1;status=merged \
+           ${RPSRC}/led_trig_timer-r8.patch;patch=1;status=merged \
+           ${RPSRC}/led_trig_sharpsl_pm-r5.patch;patch=1;status=merged \
+           ${RPSRC}/led_zaurus-r10.patch;patch=1;status=merged \
+           ${RPSRC}/led_locomo-r7.patch;patch=1;status=merged \
+           ${RPSRC}/led_ixp4xx-r2.patch;patch=1;status=merged \
+           ${RPSRC}/led_tosa-r5.patch;patch=1;status=merged \
+           ${RPSRC}/led_ide-r6.patch;patch=1;status=merged \
+           ${RPSRC}/led_nand-r3.patch;patch=1;status=merged \
+           ${RPSRC}/ide_end_request-r1.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-library-functions.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-arm-cleanup-r1.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-class.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-class-fix.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-class-fix-2.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-i2c-cleanup-r1.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-sysfs-interface.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-proc-interface.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-dev-interface.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-x1205-driver.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-test-device-driver.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-ds1672-driver.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-pcf8563-driver.patch;patch=1;status=merged \
+           ${RPSRC}/rtc-subsystem-rs5c372-driver.patch;patch=1;status=merged \
+           ${RPSRC}/rtc_class_pxa-r2.patch;patch=1;status=merged \
+           ${RPSRC}/rmk_pxa_mmc_timeout-r0.patch;patch=1;status=merged \
+           ${RPSRC}/integrator_rtc-r0.patch;patch=1;status=merged \
+           ${RPSRC}/zaurus_keyboard_tweak-r3.patch;patch=1;status=merged \
+           ${RPSRC}/arm_eabi_enum_fix-r0.patch;patch=1;status=merged \
+           ${RPSRC}/pxafb_tweaks-r0.patch;patch=1;status=merged \
+           ${RPSRC}/spitz_kbd_fix-r0.patch;patch=1;status=merged \
+           ${RPSRC}/fbmem_fix-r1.patch;patch=1;status=merged \
+           ${RPSRC}/scoop_linkage-r0.patch;patch=1;status=merged \
+           ${RPSRC}/ssp_cleanup-r0.patch;patch=1;status=merged \
+           ${RPSRC}/misc_fix1-r0.patch;patch=1;status=merged \
+           ${RPSRC}/corgi_bl_cleanup-r3.patch;patch=1;status=merged \
+           ${RPSRC}/corgi_bl_generic-r3.patch;patch=1;status=merged \
+           ${RPSRC}/w100_accel1-r0.patch;patch=1;status=merged \
+           ${RPSRC}/poodle_memsize-r0.patch;patch=1;status=merged \
+           ${RPSRC}/led_class_kconfig-r0.patch;patch=1;status=merged \
+           ${RPSRC}/led_maintainer-r0.patch;patch=1;status=merged \
+           ${RPSRC}/led_sysfs_fix-r0.patch;patch=1;status=merged \
+           ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1;status=merged \
+           ${RPSRC}/pxaohci_pwrlimit-r0.patch;patch=1;status=merged \
+           ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
+           ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
+           ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=pending \
            ${RPSRC}/mmc_oops_fix-r0.patch;patch=1 \
-           ${RPSRC}/scoop_linkage-r0.patch;patch=1 \
-           ${RPSRC}/ssp_cleanup-r0.patch;patch=1 \
+           ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \
+           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
            ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
+           ${RPSRC}/asoc_fixups-r0.patch;patch=1 \
            ${RPSRC}/hx2750_base-r24.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r5.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
@@ -64,37 +78,30 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r1.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
-           ${RPSRC}/misc_fix1-r0.patch;patch=1 \
-           ${RPSRC}/corgi_bl_cleanup-r3.patch;patch=1 \
-           ${RPSRC}/corgi_bl_generic-r3.patch;patch=1 \
-           ${RPSRC}/w100_accel1-r0.patch;patch=1 \
-           ${RPSRC}/poodle_partsize-r0.patch;patch=1 \
-           ${RPSRC}/poodle_memsize-r0.patch;patch=1 \
            ${RPSRC}/collie_frontlight-r1.patch;patch=1 \
-           ${RPSRC}/zlib_inflate-r3.patch;patch=1 \
            ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \
-           ${RPSRC}/asoc_fixups-r0.patch;patch=1 \
            ${RPSRC}/pm_changes-r1.patch;patch=1 \
-           ${RPSRC}/led_class_kconfig-r0.patch;patch=1 \
-           ${RPSRC}/led_maintainer-r0.patch;patch=1 \
-           ${RPSRC}/led_sysfs_fix-r0.patch;patch=1 \
-           ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1 \
            ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \
            ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \
            ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
-           ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \
            ${RPSRC}/poodle_ts_hack-r0.patch;patch=1 \
+           ${RPSRC}/integrator_rgb-r0.patch;patch=1 \
+           ${RPSRC}/logo_oh-r0.patch.bz2;patch=1 \
+           ${RPSRC}/logo_oz-r1.patch.bz2;patch=1 \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
            ${RPSRC}/pxa-linking-bug.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
-           file://24-hostap_cs_id.diff;patch=1 \
            file://hrw-pcmcia-ids-r2.patch;patch=1 \
-           file://oh-logo.patch;patch=1 \
+           file://00-hostap.patch;patch=1 \
+           file://locomo-kbd-hotkeys.patch;patch=1 \
+           file://locomo-sysrq+keyrepeat.patch;patch=1 \
+           file://locomo-lcd-def-bightness.patch;patch=1 \
+           file://squashfs3.0-2.6.15.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \