From f42f64dac6856629fa8e79187ab96d3343d639a7 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 27 Mar 2008 22:17:30 +0000 Subject: Sharp CE-RHx support update * added CE-RH2 support for Akita * added CE-RH1 support for c7x0 * patch comments --- packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch | 10 ++ packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch | 180 +++++++++++++++++++++ packages/linux/linux-rp_2.6.24.bb | 9 +- 3 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch diff --git a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch index 32a94c7cea..bed41c55d5 100644 --- a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch +++ b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch @@ -1,3 +1,13 @@ +This patch adds support for Sharp CE-RH2 on Spitz. + +It is not clean enough to be upstreamed: +- It is a bit syslog-noisy. +- Does not support other Zaurus models. +- Maybe split to more parts: + * MAX1111 driver + * linear input device + * virtual keyboard on top of linear input device + Index: linux-2.6.24/arch/arm/mach-pxa/spitz.c =================================================================== --- linux-2.6.24.orig/arch/arm/mach-pxa/spitz.c 2008-03-10 17:05:37.000000000 +0000 diff --git a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch new file mode 100644 index 0000000000..3927ffeccf --- /dev/null +++ b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch @@ -0,0 +1,180 @@ +This patch adds support for Sharp CE-RH2 on Akita and CE-RH1 on C7x0. + +This patch is a bit ugly: +- Device specific functions should be moved to platform infrastructure. +- Maybe define generic *_scoopexp functions handling Akita x Spitz differences. + +Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c +=================================================================== +--- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 20:47:28.000000000 +0000 ++++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 22:36:40.000000000 +0000 +@@ -21,12 +21,10 @@ + #include + #include + +-#ifdef CONFIG_MACH_SPITZ ++#include + #include +-#endif +-#ifdef CONFIG_MACH_CORGI ++#include + #include +-#endif + + #include + #include +@@ -42,12 +40,8 @@ + unsigned char key; + }; + +-#ifdef CONFIG_MACH_SPITZ +-#define REMOTE_AKIN_PULLUP SPITZ_SCP2_AKIN_PULLUP +-#define REMOTE_SCOOP_DEVICE spitzscoop2_device +-#define REMOTE_GPIO_INT SPITZ_GPIO_AK_INT +-#define REMOTE_IRQ_INT SPITZ_IRQ_GPIO_AK_INT +-static struct remote_control_key remote_keys[] = { ++static struct remote_control_key remote_keys_spitz[] = { ++ /* CE-RH2 values */ + { 25, 35, KEY_STOPCD}, + { 55, 65, KEY_PLAYPAUSE}, + { 85, 95, KEY_NEXTSONG}, +@@ -56,23 +50,15 @@ + { 180, 190, KEY_MUTE}, + { 215, 225, KEY_VOLUMEDOWN}, + }; +-#endif +-#ifdef CONFIG_MACH_CORGI +-#define REMOTE_AKIN_PULLUP CORGI_SCP_AKIN_PULLUP +-#define REMOTE_SCOOP_DEVICE corgiscoop_device +-#define REMOTE_GPIO_INT CORGI_GPIO_AK_INT +-#define REMOTE_IRQ_INT CORGI_IRQ_GPIO_AK_INT +-static struct remote_control_key remote_keys[] = { +- //These need to be fixed for the CE-RH1's values +- { 25, 35, KEY_STOPCD}, +- { 55, 65, KEY_PLAYPAUSE}, +- { 85, 95, KEY_NEXTSONG}, +- { 115, 125, KEY_VOLUMEUP}, +- { 145, 155, KEY_PREVIOUSSONG}, +- { 180, 190, KEY_MUTE}, +- { 215, 225, KEY_VOLUMEDOWN}, ++static struct remote_control_key remote_keys_corgi[] = { ++ /* CE-RH1 values */ ++ { 27, 35, KEY_STOPCD}, ++ { 7, 13, KEY_PLAYPAUSE}, ++ { 77, 93, KEY_NEXTSONG}, ++ { 115, 132, KEY_VOLUMEUP}, ++ { 46, 58, KEY_PREVIOUSSONG}, ++ { 170, 186, KEY_VOLUMEDOWN}, + }; +-#endif + + #define RELEASE_HI 230 + #define MAX_EARPHONE 6 +@@ -98,9 +84,17 @@ + static int get_remocon_raw(void) + { + int i, val; ++ struct remote_control_key *remote_keys; ++ ++ if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita()) ++ remote_keys = remote_keys_spitz; ++ else ++ remote_keys = remote_keys_corgi; + + val = sharpsl_pm_pxa_read_max1111(MAX1111_REMCOM); +- for (i = 0; i < ARRAY_SIZE(remote_keys); ++i) { ++ for (i = 0; i < (machine_is_borzoi() || machine_is_spitz() || machine_is_akita() ? ++ ARRAY_SIZE(remote_keys_spitz) : ARRAY_SIZE(remote_keys_corgi)); ++ ++i) { + if (val >= remote_keys[i].min + && val <= remote_keys[i].max) { + printk("get_remocon_raw: VAL=%i, KEY=%i\n", val, remote_keys[i].key); +@@ -121,8 +115,12 @@ + data->state = 0; + data->last_key = 0; + +- reset_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); +- ++ if (machine_is_borzoi() || machine_is_spitz()) ++ reset_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ else if (machine_is_akita()) ++ akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); ++ else ++ reset_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); + mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); + } + return IRQ_HANDLED; +@@ -182,7 +180,12 @@ + if (timer) { + mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); + } else { +- set_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); ++ if (machine_is_borzoi() || machine_is_spitz()) ++ set_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ else if (machine_is_akita()) ++ akita_set_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); ++ else ++ set_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); + data->handling_press = 0; + } + } +@@ -192,6 +195,7 @@ + struct sharpsl_rc *sharpsl_rc; + struct input_dev *input_dev; + int i, ret; ++ struct remote_control_key *remote_keys; + + dev_dbg(&pdev->dev, "sharpsl_rc_probe\n"); + +@@ -225,17 +229,32 @@ + + input_dev->evbit[0] = BIT(EV_KEY); + +- for (i = 0; i <= ARRAY_SIZE(remote_keys); i++) ++ if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita()) ++ remote_keys = remote_keys_spitz; ++ else ++ remote_keys = remote_keys_corgi; ++ for (i = 0; i < (machine_is_borzoi() || machine_is_spitz() || machine_is_akita() ? ++ ARRAY_SIZE(remote_keys_spitz) : ARRAY_SIZE(remote_keys_corgi)); ++ ++i) + set_bit(remote_keys[i].key, input_dev->keybit); + + input_register_device(sharpsl_rc->input); + +- pxa_gpio_mode(REMOTE_GPIO_INT | GPIO_IN); +- ret = request_irq(REMOTE_IRQ_INT, +- sharpsl_rc_interrupt, +- IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED, +- "sharpsl_rc", +- sharpsl_rc); ++ if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita()) { ++ pxa_gpio_mode(SPITZ_GPIO_AK_INT | GPIO_IN); ++ ret = request_irq(SPITZ_IRQ_GPIO_AK_INT, ++ sharpsl_rc_interrupt, ++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED, ++ "sharpsl_rc", ++ sharpsl_rc); ++ } else { ++ pxa_gpio_mode(CORGI_GPIO_AK_INT | GPIO_IN); ++ ret = request_irq(CORGI_IRQ_GPIO_AK_INT, ++ sharpsl_rc_interrupt, ++ IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_SHARED, ++ "sharpsl_rc", ++ sharpsl_rc); ++ } + if (ret < 0) { + dev_dbg(&pdev->dev, "Can't get IRQ: %d!\n", i); + kfree(sharpsl_rc); +@@ -252,7 +271,10 @@ + + dev_dbg(&pdev->dev, "sharpsl_rc_remove\n"); + +- free_irq(REMOTE_IRQ_INT, sharpsl_rc); ++ if (machine_is_borzoi() || machine_is_spitz() || machine_is_akita()) ++ free_irq(SPITZ_IRQ_GPIO_AK_INT, sharpsl_rc); ++ else ++ free_irq(CORGI_IRQ_GPIO_AK_INT, sharpsl_rc); + del_timer_sync(&sharpsl_rc->rctimer); + input_unregister_device(sharpsl_rc->input); + kfree(sharpsl_rc); diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 2b13fc47f1..5522692318 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r5" +PR = "r6" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" @@ -183,6 +183,7 @@ SRC_URI_append_akita = "\ file://mtd-module.patch;patch=1;status=external \ file://wm8750-treble.patch;patch=1;status=external \ file://sharpsl-rc-r1.patch;patch=1 \ + file://sharpsl-rc-r2.patch;patch=1 \ " SRC_URI_append_spitz = "\ @@ -190,6 +191,12 @@ SRC_URI_append_spitz = "\ file://wm8750-treble.patch;patch=1;status=external \ file://spitz_h_rewrite.patch;patch=1;status=external \ file://sharpsl-rc-r1.patch;patch=1 \ + file://sharpsl-rc-r2.patch;patch=1 \ + " + +SRC_URI_append_c7x0 = "\ + file://sharpsl-rc-r1.patch;patch=1 \ + file://sharpsl-rc-r2.patch;patch=1 \ " SRC_URI_append_htcuniversal ="\ -- cgit v1.2.3 From cf24aa67b9d1eff14109dd95d74eb727c50635a0 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 27 Mar 2008 22:31:45 +0000 Subject: kernel.bbclass,linux.inc: move dependency on u-boot-openmoko-native to kernel.bbclass --- classes/kernel.bbclass | 4 +++- packages/linux/linux.inc | 14 -------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index f111c9f092..06ae2466ea 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -5,6 +5,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} v KERNEL_IMAGETYPE ?= "zImage" +# Add dependency on mkimage for kernels that build a uImage + python __anonymous () { import bb @@ -12,7 +14,7 @@ python __anonymous () { kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or '' if kerneltype == 'uImage': depends = bb.data.getVar("DEPENDS", d, 1) - depends = "%s u-boot-mkimage-native" % depends + depends = "%s u-boot-mkimage-openmoko-native" % depends bb.data.setVar("DEPENDS", depends, d) } diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index 66636ba50e..e46061610d 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -4,20 +4,6 @@ LICENSE = "GPL" inherit kernel -# Add dependency on mkimage for kernels that build a uImage - -python __anonymous () { - - import bb - - kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or '' - if kerneltype == 'uImage': - depends = bb.data.getVar("DEPENDS", d, 1) - depends = "%s u-boot-mkimage-openmoko-native" % depends - bb.data.setVar("DEPENDS", depends, d) -} - - RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" # Specify the commandline for your device -- cgit v1.2.3 From e6dc7f865766178bd2aa9514eac2431d1cc0187a Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Thu, 27 Mar 2008 22:47:41 +0000 Subject: linux-rp_2.6.24.bb: reenable accidently diabled hctuni.patch --- packages/linux/linux-rp_2.6.24.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 2b13fc47f1..41f804337f 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -58,6 +58,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \ file://binutils-buildid-arm.patch;patch=1 \ file://versatile-armv6.patch;patch=1 \ + file://htcuni.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-hx2000 \ file://defconfig-collie \ @@ -74,7 +75,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \ # FIXMEs before made default # ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack -# file://htcuni.patch;patch=1 \ # Add this to enable pm debug code (useful with a serial lead) # ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1 -- cgit v1.2.3 From 8fb289de060b5778d79f0ffa16f5bdfccf28112c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 28 Mar 2008 03:55:03 +0000 Subject: ftpd-topfield: Updated to 0.7.5 and added the syslog patch --- packages/ftpd-topfield/files/syslog.patch | 26 ++++++++++++++++++++ packages/ftpd-topfield/ftpd-topfield_0.7.4.bb | 32 ------------------------- packages/ftpd-topfield/ftpd-topfield_0.7.5.bb | 34 +++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 packages/ftpd-topfield/files/syslog.patch delete mode 100755 packages/ftpd-topfield/ftpd-topfield_0.7.4.bb create mode 100755 packages/ftpd-topfield/ftpd-topfield_0.7.5.bb diff --git a/packages/ftpd-topfield/files/syslog.patch b/packages/ftpd-topfield/files/syslog.patch new file mode 100644 index 0000000000..8c2bf294f5 --- /dev/null +++ b/packages/ftpd-topfield/files/syslog.patch @@ -0,0 +1,26 @@ +--- ftpd-topfield/ftpd.c~ 2008-02-16 09:49:30.000000000 +1030 ++++ ftpd-topfield/ftpd.c 2008-03-24 21:45:15.000000000 +1030 +@@ -1190,6 +1190,7 @@ + if (debug) { + fprintf(stderr, "Transfer failed %lld bytes %s\n", (long long)current, srcpath); + } ++ syslog(LOG_INFO, "retrieve: Failed transfer of %s @%Ld", srcpath, (long long)current); + perror_reply (550, name); + } + +@@ -1363,6 +1364,7 @@ + #endif + + if (ret != 0) { ++ syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current); + perror_reply (553, name); + + LOGCMD (*mode == 'w' ? "put" : "append", name); +@@ -1451,6 +1453,7 @@ + } + } + ++ syslog(LOG_INFO, "store: Failed transfer of %s @%Ld", destpath, (long long)current); + /* Failed to cancel the put, so give up */ + perror_reply (426, "Data Connection"); + } diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb deleted file mode 100755 index 356a6018a2..0000000000 --- a/packages/ftpd-topfield/ftpd-topfield_0.7.4.bb +++ /dev/null @@ -1,32 +0,0 @@ -# This package builds the ftpd-topfield program -DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" -HOMEPAGE = "http://sourceforge.net/projects/puppy" -SECTION = "net" -LICENSE = "MIT" - -SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_4 \ - cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_4 \ - file://init" - -# The source will end up in the subdirectory 'ftpd-topfield' - no release name -S = "${WORKDIR}/ftpd-topfield" - -inherit update-rc.d - -INITSCRIPT_NAME = "ftpd-topfield" -INITSCRIPT_PARAMS = "defaults" - -# Just the one package at present - -inherit autotools - -do_compile() { - oe_runmake -} - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield - install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield -} diff --git a/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb new file mode 100755 index 0000000000..74a3743b1e --- /dev/null +++ b/packages/ftpd-topfield/ftpd-topfield_0.7.5.bb @@ -0,0 +1,34 @@ +# This package builds the ftpd-topfield program +DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR" +HOMEPAGE = "http://sourceforge.net/projects/puppy" +SECTION = "net" +LICENSE = "MIT" +PR = "r1" + +SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_5 \ + cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_5 \ + file://syslog.patch;patch=1 \ + file://init" + +# The source will end up in the subdirectory 'ftpd-topfield' - no release name +S = "${WORKDIR}/ftpd-topfield" + +inherit update-rc.d + +INITSCRIPT_NAME = "ftpd-topfield" +INITSCRIPT_PARAMS = "defaults" + +# Just the one package at present + +inherit autotools + +do_compile() { + oe_runmake +} + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield + install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield +} -- cgit v1.2.3 From 1996478c0eaa363bb1a3e2d7cb4e0def12ab3bd9 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 28 Mar 2008 05:59:37 +0000 Subject: defconfigs: Update ixp4xxx 2.6.24.4 defconfigs to disable PREEMPT, and switch from "cubic" to "reno" as the default TCP congestion control algorithm (avoids a kernel crash) --- packages/linux/linux-ixp4xx/defconfig-2.6.24.4 | 24 ++++++++++++++++++---- .../linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 | 24 ++++++++++++++++++---- packages/linux/linux-ixp4xx_2.6.24.4.bb | 2 +- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 index 0a3c0eb47d..de78fc3741 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 @@ -30,7 +30,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -217,7 +216,7 @@ CONFIG_PCI_SYSCALL=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_HZ=100 CONFIG_AEABI=y CONFIG_OABI_COMPAT=y @@ -304,9 +303,26 @@ CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set CONFIG_IPV6=m diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 index 01f91b572a..2a382b34b3 100644 --- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 +++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4 @@ -30,7 +30,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set @@ -217,7 +216,7 @@ CONFIG_PCI_SYSCALL=y CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_HZ=100 CONFIG_AEABI=y CONFIG_OABI_COMPAT=y @@ -305,9 +304,26 @@ CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m -# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_CONG_WESTWOOD is not set +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_TCP_CONG_HSTCP is not set +# CONFIG_TCP_CONG_HYBLA is not set +# CONFIG_TCP_CONG_VEGAS is not set +# CONFIG_TCP_CONG_SCALABLE is not set +# CONFIG_TCP_CONG_LP is not set +# CONFIG_TCP_CONG_VENO is not set +# CONFIG_TCP_CONG_YEAH is not set +# CONFIG_TCP_CONG_ILLINOIS is not set +# CONFIG_DEFAULT_BIC is not set +# CONFIG_DEFAULT_CUBIC is not set +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +CONFIG_DEFAULT_RENO=y +CONFIG_DEFAULT_TCP_CONG="reno" # CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set CONFIG_IPV6=m diff --git a/packages/linux/linux-ixp4xx_2.6.24.4.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb index d7ccb4c096..1964c23839 100644 --- a/packages/linux/linux-ixp4xx_2.6.24.4.bb +++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.24.4" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ -- cgit v1.2.3 From afe5d3df5c2cbf5c41436c522fb7a3e78f0052fd Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Fri, 28 Mar 2008 13:16:26 +0000 Subject: Sharp Remote sharpsl-rc-r2.patch fix. --- packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch index 3927ffeccf..6fb34ec179 100644 --- a/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch +++ b/packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch @@ -6,8 +6,8 @@ This patch is a bit ugly: Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c =================================================================== ---- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 20:47:28.000000000 +0000 -+++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c 2008-03-07 22:36:40.000000000 +0000 +--- linux-2.6.24.orig/drivers/input/keyboard/sharpsl_rc.c 2008-03-08 19:29:02.000000000 +0000 ++++ linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c 2008-03-08 22:23:35.000000000 +0000 @@ -21,12 +21,10 @@ #include #include @@ -96,11 +96,11 @@ Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c - reset_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); - + if (machine_is_borzoi() || machine_is_spitz()) -+ reset_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ reset_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); + else if (machine_is_akita()) + akita_reset_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); + else -+ reset_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); ++ reset_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); mod_timer(&data->rctimer, jiffies + msecs_to_jiffies(RC_POLL_MS)); } return IRQ_HANDLED; @@ -110,11 +110,11 @@ Index: linux-2.6.24/drivers/input/keyboard/sharpsl_rc.c } else { - set_scoop_gpio(&REMOTE_SCOOP_DEVICE.dev, REMOTE_AKIN_PULLUP); + if (machine_is_borzoi() || machine_is_spitz()) -+ set_scoop_gpio(&platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); ++ set_scoop_gpio(platform_scoop_config->devs[1].dev, SPITZ_SCP2_AKIN_PULLUP); + else if (machine_is_akita()) + akita_set_ioexp(&akitaioexp_device.dev, AKITA_IOEXP_AKIN_PULLUP); + else -+ set_scoop_gpio(&platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); ++ set_scoop_gpio(platform_scoop_config->devs[0].dev, CORGI_SCP_AKIN_PULLUP); data->handling_press = 0; } } -- cgit v1.2.3 From 85039a6820d07a4cdcb7485dff31c3045a314c7d Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Fri, 28 Mar 2008 14:45:21 +0000 Subject: package.bbclass: fix handling of kernel-modules which end with '-dev' Kernel-modules which end with -dev get update-modules-dev as RRECOMMENDS so update-modules-dev gets pulled in images. So we blacklist kernel-module packages for now. --- classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index eb43856c55..814715e1fa 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -904,7 +904,7 @@ python package_depchains() { for suffix in pkgs: for pkg in pkgs[suffix]: (base, func) = pkgs[suffix][pkg] - if suffix == "-dev": + if suffix == "-dev" and not pkg.startswith("kernel-module-"): pkg_adddeprrecs(pkg, base, suffix, func, depends, d) if len(pkgs[suffix]) == 1: pkg_addrrecs(pkg, base, suffix, func, rdepends, d) -- cgit v1.2.3