summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb10
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb55
-rw-r--r--packages/linux/unslung-kernel/defconfig13
-rw-r--r--packages/linux/unslung-kernel_2.4.22.l2.3r63.bb2
4 files changed, 51 insertions, 29 deletions
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index ef1a97d2e4..f3204a3030 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -32,19 +32,19 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
${RPSRC}/archive/pxa_irda-r1.patch;patch=1 \
${RPSRC}/archive/pxaudc_susres-r1.patch;patch=1 \
- ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \
+ ${RPSRC}/archive/sharp_multi_pcmcia-r2.patch;patch=1 \
${RPSRC}/archive/pxa_turbo-r0.patch;patch=1 \
${RPSRC}/archive/sharpsl_mapprom-r1.patch;patch=1 \
${RPSRC}/archive/input_power-r1.patch;patch=1 \
- ${RPSRC}/corgi_irda-r2.patch;patch=1 \
- ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
+ ${RPSRC}/archive/corgi_irda-r2.patch;patch=1 \
+ ${RPSRC}/archive/corgi_base_extras1-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
${RPSRC}/archive/corgi_power-r22.patch;patch=1 \
- ${RPSRC}/corgi_power1-r1.patch;patch=1 \
+ ${RPSRC}/archive/corgi_power1-r1.patch;patch=1 \
${RPSRC}/archive/ide_fixes-r1.patch;patch=1 \
${RPSRC}/archive/mmc_sd-r4.patch;patch=1 \
${RPSRC}/mmc_timeout-r0.patch;patch=1 \
- ${RPSRC}/corgi_snd-r6.patch;patch=1 \
+ ${RPSRC}/archive/corgi_snd-r6.patch;patch=1 \
${RPSRC}/archive/w100_split-r5-r1.patch;patch=1 \
${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
${DOSRC}/tc6393-device-r2.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 065d5d9eb8..a29faf201f 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r11"
+PR = "r16"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -38,23 +38,38 @@ BASRC = "http://www.orca.cx/zaurus/patches"
# Patches submitted upstream are towards top of this list
+# Hacks should clearly named and at the bottom
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \
${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
- ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
- ${RPSRC}/pxa_irda-r2.patch;patch=1 \
+ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
+ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
+ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
+ ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
+ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
+ ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
+ ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
- ${RPSRC}/input_power-r2.patch;patch=1 \
- ${RPSRC}/corgi_irda-r2.patch;patch=1 \
- ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_lcd-r1.patch;patch=1 \
+ ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
+ ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm-r1.patch;patch=1 \
+ ${RPSRC}/corgi_pm-r0.patch;patch=1 \
+ ${RPSRC}/spitzkbd-r1.patch;patch=1 \
+ ${RPSRC}/spitzcf-r1.patch;patch=1 \
+ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
+ ${RPSRC}/pxa_irda-r3.patch;patch=1 \
+ ${RPSRC}/corgi_irda-r3.patch;patch=1 \
+ ${RPSRC}/input_power-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
- ${RPSRC}/corgi_power-r24.patch;patch=1 \
- ${RPSRC}/corgi_power1-r1.patch;patch=1 \
- ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
- ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \
${RPSRC}/corgi_snd-r10.patch;patch=1 \
${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
${RPSRC}/spitz_mtd-r0.patch;patch=1 \
@@ -79,21 +94,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
- ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
- ${RPSRC}/spitzbase-r5.patch;patch=1 \
- ${RPSRC}/spitzkbd-r1.patch;patch=1 \
- ${RPSRC}/spitzssp-r4.patch;patch=1 \
- ${RPSRC}/spitzbl-r1.patch;patch=1 \
- ${RPSRC}/spitzts-r1.patch;patch=1 \
- ${RPSRC}/spitzcf-r1.patch;patch=1 \
- ${RPSRC}/spitz_power-r1.patch;patch=1 \
- ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
- ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/spitz_base-r10.patch;patch=1 \
+ ${RPSRC}/spitz_pm-r0.patch;patch=1 \
${RPSRC}/scoop_susres-r0.patch;patch=1 \
- ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \
+ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
- ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
file://add-oz-release-string.patch;patch=1 \
file://add-elpp-stuff.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1 \
@@ -153,6 +159,11 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
#
ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
+###############################################################
+# module configs specific to this kernel
+#
+module_autoload_pxaficp_ir = "pxaficp_ir"
+
do_configure() {
install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index 208041c6d6..d9a01070d5 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -596,7 +596,18 @@ CONFIG_PPP_BSDCOMP=m
#
# Wireless LAN (non-hamradio)
#
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
+# CONFIG_STRIP is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_ARLAN is not set
+# CONFIG_AIRONET4500 is not set
+# CONFIG_AIRONET4500_NONCS is not set
+# CONFIG_AIRONET4500_PROC is not set
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PCI_HERMES is not set
+CONFIG_NET_WIRELESS=y
#
# Token Ring devices
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 0a7a8f3dd2..4acc6d7a5f 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb
DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r2"
+PR = "r3"
KERNEL_SUFFIX = "unslung"