diff options
author | Richard Purdie <richard@openedhand.com> | 2006-02-03 09:19:56 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-02-03 09:19:56 +0000 |
commit | 6753d5b6e71973a6c08610ab583f81fd0ed47b58 (patch) | |
tree | 7d23e6504d83a45119f5004168dbb07f6c16bf1d /openembedded/packages | |
parent | 4a64818533733e194138a45656aaf14d5a123e98 (diff) | |
download | poky-6753d5b6e71973a6c08610ab583f81fd0ed47b58.tar.gz |
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
Diffstat (limited to 'openembedded/packages')
-rw-r--r-- | openembedded/packages/linux/linux-openzaurus.inc | 5 | ||||
-rw-r--r-- | openembedded/packages/linux/linux-openzaurus_2.6.15.bb | 38 |
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" | |||
25 | CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" | 25 | CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" |
26 | CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" | 26 | CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rw" |
27 | CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw" | 27 | CMDLINE_ROOT_borzoi = "root=/dev/hda1 rootfstype=ext3 rw" |
28 | CMDLINE_OTHER = "dyntick=enable debug" | 28 | CMDLINE_OTHER = "dyntick=enable" |
29 | CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' | ||
29 | 30 | ||
30 | ############################################################## | 31 | ############################################################## |
31 | # Configure memory/ramdisk split for collie | 32 | # Configure memory/ramdisk split for collie |
@@ -37,7 +38,7 @@ CMDLINE_MEM_collie = "mem=${mem}M" | |||
37 | CMDLINE_ROTATE_spitz = "fbcon=rotate:1" | 38 | CMDLINE_ROTATE_spitz = "fbcon=rotate:1" |
38 | CMDLINE_ROTATE_akita = "fbcon=rotate:1" | 39 | CMDLINE_ROTATE_akita = "fbcon=rotate:1" |
39 | CMDLINE_ROTATE_borzoi = "fbcon=rotate:1" | 40 | CMDLINE_ROTATE_borzoi = "fbcon=rotate:1" |
40 | CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER}" | 41 | CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG}" |
41 | 42 | ||
42 | ############################################################### | 43 | ############################################################### |
43 | # Enable or disable ELPP via local.conf - default is "no" | 44 | # 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 @@ | |||
1 | include linux-openzaurus.inc | 1 | include linux-openzaurus.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r2" |
4 | 4 | ||
5 | # Handy URLs | 5 | # Handy URLs |
6 | # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ | 6 | # 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 \ | |||
20 | ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \ | 20 | ${RPSRC}/pxa_i2c_fixes-r5.patch;patch=1 \ |
21 | ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \ | 21 | ${RPSRC}/scoop_cpr_fix-r1.patch;patch=1 \ |
22 | ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \ | 22 | ${RPSRC}/pxa2xx_release-r1.patch;patch=1 \ |
23 | ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \ | ||
23 | ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ | 24 | ${RPSRC}/ide_not_removable-r0.patch;patch=1 \ |
24 | ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \ | 25 | ${RPSRC}/sharpsl_pm_move-r0.patch;patch=1 \ |
25 | ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \ | 26 | ${RPSRC}/sharpsl_pm_gcc4_fix-r0.patch;patch=1 \ |
26 | ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \ | 27 | ${RPSRC}/pcmcia_dev_ids-r3.patch;patch=1 \ |
27 | ${RPSRC}/led_core-r10.patch;patch=1 \ | 28 | ${RPSRC}/led_core-r11.patch;patch=1 \ |
28 | ${RPSRC}/led_triggers-r8.patch;patch=1 \ | 29 | ${RPSRC}/led_triggers-r9.patch;patch=1 \ |
29 | ${RPSRC}/led_trig_timer-r3.patch;patch=1 \ | 30 | ${RPSRC}/led_trig_timer-r4.patch;patch=1 \ |
30 | ${RPSRC}/led_trig_sharpsl_pm-r2.patch;patch=1 \ | 31 | ${RPSRC}/led_trig_sharpsl_pm-r4a.patch;patch=1 \ |
31 | ${RPSRC}/led_zaurus-r7.patch;patch=1 \ | 32 | ${RPSRC}/led_zaurus-r8.patch;patch=1 \ |
32 | ${RPSRC}/led_locomo-r4.patch;patch=1 \ | 33 | ${RPSRC}/led_locomo-r5.patch;patch=1 \ |
33 | ${RPSRC}/led_ide-r1.patch;patch=1 \ | 34 | ${RPSRC}/led_ixp4xx-r0.patch;patch=1 \ |
34 | ${RPSRC}/led_nand-r1.patch;patch=1 \ | 35 | ${RPSRC}/led_tosa-r2.patch;patch=1 \ |
36 | ${RPSRC}/led_ide-r2.patch;patch=1 \ | ||
37 | ${RPSRC}/led_nand-r2.patch;patch=1 \ | ||
35 | ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ | 38 | ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ |
36 | ${RPSRC}/pxa_rtc-r3.patch;patch=1 \ | 39 | ${RPSRC}/pxa_rtc-r3.patch;patch=1 \ |
37 | ${RPSRC}/input_power-r4.patch;patch=1 \ | 40 | ${RPSRC}/input_power-r4.patch;patch=1 \ |
38 | ${RPSRC}/arm_apm_pm_legacy-r1.patch;patch=1 \ | ||
39 | ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ | 41 | ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \ |
40 | ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ | 42 | ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \ |
41 | ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \ | 43 | ${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 \ | |||
47 | ${DOSRC}/tc6393-device-r8.patch;patch=1 \ | 49 | ${DOSRC}/tc6393-device-r8.patch;patch=1 \ |
48 | ${DOSRC}/tc6393_nand-r7.patch;patch=1 \ | 50 | ${DOSRC}/tc6393_nand-r7.patch;patch=1 \ |
49 | ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \ | 51 | ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \ |
50 | ${DOSRC}/tosa-pxaac97-r5.patch;patch=1 \ | 52 | ${RPSRC}/temp/tosa-pxaac97-r5-rp.patch;patch=1 \ |
51 | ${DOSRC}/tosa-tc6393-r1.patch;patch=1 \ | 53 | ${RPSRC}/temp/tosa-tc6393-r1-rp.patch;patch=1 \ |
52 | ${DOSRC}/tosa-power-r9.patch;patch=1 \ | 54 | ${RPSRC}/temp/tosa-power-r9-rp.patch;patch=1 \ |
53 | ${DOSRC}/tc6393fb-r9.patch;patch=1 \ | 55 | ${DOSRC}/tc6393fb-r9.patch;patch=1 \ |
54 | ${DOSRC}/tosa-lcd-r6.patch;patch=1 \ | 56 | ${RPSRC}/temp/tosa-lcd-r6-rp.patch;patch=1 \ |
55 | ${DOSRC}/tosa-bl-r9.patch;patch=1 \ | 57 | ${DOSRC}/tosa-bl-r9.patch;patch=1 \ |
56 | ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \ | 58 | ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \ |
57 | ${RPSRC}/led_tosa-r0.patch;patch=1 \ | ||
58 | ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ | 59 | ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ |
59 | ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ | 60 | ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ |
60 | ${RPSRC}/usb_pxa27x_udc-r0.patch;patch=1 \ | 61 | ${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 \ | |||
63 | ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \ | 64 | ${RPSRC}/alsa/alsa-soc-0.9-0.10rc1.patch;patch=1 \ |
64 | ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \ | 65 | ${RPSRC}/alsa_soc_rpupdate7-r2.patch;patch=1 \ |
65 | ${RPSRC}/alsa_akita_fix-r0.patch;patch=1 \ | 66 | ${RPSRC}/alsa_akita_fix-r0.patch;patch=1 \ |
67 | ${RPSRC}/zaurus_keyboard_tweak-r0.patch;patch=1 \ | ||
68 | ${RPSRC}/corgi_bl_cleanup-r2.patch;patch=1 \ | ||
69 | ${RPSRC}/corgi_bl_generic-r2.patch;patch=1 \ | ||
70 | ${RPSRC}/arm_checksum_memory-r0.patch;patch=1 \ | ||
71 | ${RPSRC}/pxafb_tweaks-r0.patch;patch=1 \ | ||
72 | ${RPSRC}/pxa_clocks-r0.patch;patch=1 \ | ||
66 | ${RPSRC}/pm_changes-r0.patch;patch=1 \ | 73 | ${RPSRC}/pm_changes-r0.patch;patch=1 \ |
74 | ${RPSRC}/sharpsl_pm-do-r1.patch;patch=1 \ | ||
67 | file://add-oz-release-string.patch;patch=1 \ | 75 | file://add-oz-release-string.patch;patch=1 \ |
68 | file://pxa-serial-hack.patch;patch=1 \ | 76 | file://pxa-serial-hack.patch;patch=1 \ |
69 | ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ | 77 | ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ |