From e1e63224d9bd7b25a18b435ee5b7e543368fe117 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Jul 2006 15:22:09 +0000 Subject: linux-oz-2.6: Sync with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@504 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/packages/linux/linux-openzaurus.inc | 4 +- .../packages/linux/linux-openzaurus_2.6.16.bb | 42 ++++++------ .../packages/linux/linux-openzaurus_2.6.17.bb | 78 ++++++++++++---------- 3 files changed, 69 insertions(+), 55 deletions(-) (limited to 'openembedded') diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc index 64da31ea7a..984002784a 100644 --- a/openembedded/packages/linux/linux-openzaurus.inc +++ b/openembedded/packages/linux/linux-openzaurus.inc @@ -1,6 +1,8 @@ DESCRIPTION = "2.6 Linux Development Kernel for Zaurus devices and iPAQ hx2750." SECTION = "kernel" -MAINTAINER = "Richard Purdie , Michael 'Mickey' Lauer " +MAINTAINER = "Richard Purdie , \ + Michael 'Mickey' Lauer , \ + Marcin 'Hrw' Juszkiewicz " LICENSE = "GPL" inherit kernel diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.16.bb b/openembedded/packages/linux/linux-openzaurus_2.6.16.bb index 0116d3098a..08a64160c1 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 = "r37" +PR = "r38" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -60,12 +60,13 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${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}/mmc_oops_fix-r1.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}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=pending \ + file://00-hostap.patch;patch=1;status=pending \ + file://10-pcnet.patch;patch=1;status=pending \ ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \ ${RPSRC}/asoc_fixups-r0.patch;patch=1 \ ${RPSRC}/hx2750_base-r24.patch;patch=1 \ @@ -76,32 +77,32 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ ${RPSRC}/hx2750_test1-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/input_power-r4.patch;patch=1 \ - ${RPSRC}/jffs2_longfilename-r1.patch;patch=1 \ ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ - ${RPSRC}/collie_frontlight-r1.patch;patch=1 \ - ${RPSRC}/zaurus_reboot-r0.patch;patch=1 \ + ${RPSRC}/collie_frontlight-r1.patch;patch=1;status=pending \ + ${RPSRC}/zaurus_reboot-r0.patch;patch=1;status=merged \ ${RPSRC}/sharpsl_pm_fixes1-r0.patch;patch=1 \ ${RPSRC}/pm_changes-r1.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ ${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}/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://hrw-pcmcia-ids-r2.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 \ + ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ + ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ + ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ + file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ + ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ + ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \ + ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ + ${RPSRC}/poodle_ts_hack-r0.patch;patch=1;status=hack \ + file://pxa-serial-hack.patch;patch=1;status=hack \ + file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \ + file://squashfs3.0-2.6.15.patch;patch=1;status=external \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa270 \ file://defconfig-collie \ @@ -111,6 +112,9 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ file://defconfig-qemuarm \ file://defconfig-tosa " +# Add this to enable pm debug code (useful with a serial lead) +# ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1 + # Disabled until I find the reason this gives issues with cdc_subset # ${RPSRC}/usb_rndis_tweaks-r0.patch;patch=1 \ diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.17.bb b/openembedded/packages/linux/linux-openzaurus_2.6.17.bb index 354e6ce84b..2a34a6614d 100644 --- a/openembedded/packages/linux/linux-openzaurus_2.6.17.bb +++ b/openembedded/packages/linux/linux-openzaurus_2.6.17.bb @@ -1,6 +1,8 @@ include linux-openzaurus.inc -PR = "r4" +PR = "r5" + +DEFAULT_PREFERENCE = "-1" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ @@ -14,20 +16,19 @@ PR = "r4" # Hacks should clearly named and at the bottom # ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ - ${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}/jffs2_longfilename-r1.patch;patch=1;status=pending \ - ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \ - file://00-hostap.patch;patch=1;status=pending \ - file://10-pcnet.patch;patch=1;status=pending \ - ${RPSRC}/zaurus_reboot-r3.patch;patch=1 \ - ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1 \ - ${RPSRC}/poodle_ssp-r1.patch;patch=1 \ - ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1 \ - ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1 \ - ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1 \ + ${RPSRC}/poodle_partsize-r0.patch;patch=1;status=merged \ + ${RPSRC}/jffs2_longfilename-r1.patch;patch=1;status=merged \ + ${RPSRC}/locomo_led_default_trigger-r0.patch;patch=1;status=merged \ + ${RPSRC}/zaurus_reboot-r3.patch;patch=1;status=merged \ + ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \ + ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \ + ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \ + ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=merged \ + ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \ + ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=merged \ + ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \ + file://00-hostap.patch;patch=1;status=merged \ + file://10-pcnet.patch;patch=1;status=merged \ ${RPSRC}/asoc-v0.11pre2-oz.patch;patch=1 \ ${RPSRC}/asoc_updates-r1.patch;patch=1 \ ${RPSRC}/hx2750_base-r25.patch;patch=1 \ @@ -43,17 +44,18 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ ${RPSRC}/pm_changes-r1.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 \ + ${DOSRC}/kexec-arm-r3.patch;patch=1 \ ${RPSRC}/locomo_kbd_tweak-r0.patch;patch=1 \ ${RPSRC}/poodle_pm-r1.patch;patch=1 \ ${RPSRC}/pxafb_changeres-r0.patch;patch=1 \ - ${RPSRC}/input_modalias_fix-r0.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ file://hrw-pcmcia-ids-r2.patch;patch=1 \ ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \ ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \ file://add-oz-release-string.patch;patch=1;status=unmergable \ + ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \ + ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \ ${RPSRC}/integrator_rgb-r0.patch;patch=1;status=hack \ ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \ file://pxa-serial-hack.patch;patch=1;status=hack \ @@ -77,36 +79,42 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \ # http://tglx.de/projects/armirq/2.6.17-rc3/patch-2.6.17-rc3-armirq4.patch;patch=1 \ # ${RPSRC}/../pxa27x_overlay-r0.patch;patch=1 \ -# These patches would really help collie/poodle but we -# need someone to maintain them -# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 -# (Pavel Machek's git tree has updated versions of this?) -# Also parts were recently committed to mainline by rmk (drivers/mfd/) -# ${JLSRC}/zaurus-base-2.6.11.diff.gz;patch=1 -# (This is mostly in mainline now?) -# ${JLSRC}/zaurus-local-2.6.11.diff.gz;patch=1 \ -# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \ +# Is anything out of this still needed? Parts were commited to mainline by rmk (drivers/mfd/) +# (Pavel Machek's git tree has updated versions of this?) +# ${JLSRC}/zaurus-lcd-2.6.11.diff.gz;patch=1 + +# These patches are extracted from Pavel Machek's git tree +# (diff against vanilla kernel) +SRC_URI_append_collie = "\ + ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \ + ${DOSRC}/collie/collie-r0.patch;patch=1 \ + ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \ + ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \ + ${DOSRC}/collie/collie-mcp-r0.patch;patch=1 \ + ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \ +# ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \ + " SRC_URI_append_tosa = "\ ${CHSRC}/usb-ohci-hooks-r1.patch;patch=1 \ ${CHSRC}/tmio-core-r4.patch;patch=1 \ - ${CHSRC}/tmio-tc6393-r5.patch;patch=1 \ + ${DOSRC}/temp/tmio-tc6393-r6.patch;patch=1 \ ${CHSRC}/tmio-nand-r5.patch;patch=1 \ - ${CHSRC}/tmio-ohci-r3.patch;patch=1 \ + ${DOSRC}/temp/tmio-ohci-r4.patch;patch=1 \ ${CHSRC}/tmio-fb-r6.patch;patch=1 \ - ${DOSRC}/tosa-keyboard-r14.patch;patch=1 \ + ${DOSRC}/tosa-keyboard-r17.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r6.patch;patch=1 \ ${DOSRC}/tosa-tmio-r6.patch;patch=1 \ - ${DOSRC}/tosa-power-r15.patch;patch=1 \ - ${DOSRC}/tosa-tmio-lcd-r7.patch;patch=1 \ - ${DOSRC}/tosa-bluetooth-r6.patch;patch=1 \ + ${DOSRC}/tosa-power-r17.patch;patch=1 \ + ${DOSRC}/tosa-tmio-lcd-r8.patch;patch=1 \ + ${DOSRC}/tosa-bluetooth-r8.patch;patch=1 \ ${DOSRC}/wm97xx-lg7-r0.patch;patch=1 \ - ${DOSRC}/wm9712-suspend-cold-res-r0.patch;patch=1 \ + ${DOSRC}/wm9712-suspend-cold-res-r1.patch;patch=1 \ ${DOSRC}/sharpsl-pm-postresume-r0.patch;patch=1 \ ${DOSRC}/wm97xx-dig-restore-r0.patch;patch=1 \ ${DOSRC}/wm97xx-miscdevs-resume-r0.patch;patch=1 \ - ${DOSRC}/wm9712-reset-loop-r0.patch;patch=1 \ - ${DOSRC}/tosa-asoc-r1.patch;patch=1 " + ${DOSRC}/wm9712-reset-loop-r1.patch;patch=1" +# ${DOSRC}/tosa-asoc-r1.patch;patch=1 " S = "${WORKDIR}/linux-2.6.17" -- cgit v1.2.3-54-g00ecf