diff options
author | Richard Purdie <rpurdie@rpsys.net> | 2005-09-15 08:48:15 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-15 08:48:15 +0000 |
commit | e9c519ed2b5fbff5dbe69075be4c65f8d3ba4b77 (patch) | |
tree | 66a2d6f08cc75a33a8324a01ed9b4fc7bde2204c /packages/linux | |
parent | a6b4fc3c123369ffe906536fdbcae2fd61aff0b7 (diff) |
linuz-oz-2.6: Upgrade to 2.6.13-mm3. This fixes the sysfs problems people were seeing.
Diffstat (limited to 'packages/linux')
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/.mtn2git_empty (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/add-elpp-stuff.patch (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/add-oz-release-string.patch (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/connectplus-remove-ide-HACK.patch (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-c7x0 (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-collie (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-ipaq-pxa-2.6 (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-poodle (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-spitz (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-tosa (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/dtl1_cs-add-socket-revE.patch (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus-2.6.13-mm3/pxa-serial-hack.patch (renamed from packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch) | 52 | ||||
-rw-r--r-- | packages/linux/linux-openzaurus_2.6.13-mm3.bb (renamed from packages/linux/linux-openzaurus_2.6.13-mm1.bb) | 29 |
13 files changed, 35 insertions, 46 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.13-mm3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/.mtn2git_empty +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/.mtn2git_empty diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-mm3/add-elpp-stuff.patch index 04ab185f4f..04ab185f4f 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/add-elpp-stuff.patch +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/add-elpp-stuff.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.13-mm3/add-oz-release-string.patch index 22a6fd3943..22a6fd3943 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/add-oz-release-string.patch +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/add-oz-release-string.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.13-mm3/connectplus-remove-ide-HACK.patch index 4414b21191..4414b21191 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/connectplus-remove-ide-HACK.patch +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/connectplus-remove-ide-HACK.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-c7x0 index 542bedc9f6..542bedc9f6 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-c7x0 diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-collie index 9f51b61169..9f51b61169 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-collie +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-collie diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6 b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-ipaq-pxa-2.6 index 8b41380784..8b41380784 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-ipaq-pxa-2.6 +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-ipaq-pxa-2.6 diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-poodle index a0810f8381..a0810f8381 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-poodle +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-poodle diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-spitz index e61a999627..e61a999627 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-spitz diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-tosa index dd1e70fa03..dd1e70fa03 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/defconfig-tosa +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/defconfig-tosa diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-mm3/dtl1_cs-add-socket-revE.patch index 9fe3bd06d3..9fe3bd06d3 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/dtl1_cs-add-socket-revE.patch +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/dtl1_cs-add-socket-revE.patch diff --git a/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.13-mm3/pxa-serial-hack.patch index ee761b75ad..7892a0f929 100644 --- a/packages/linux/linux-openzaurus-2.6.13-mm1/pxa-serial-hack.patch +++ b/packages/linux/linux-openzaurus-2.6.13-mm3/pxa-serial-hack.patch @@ -1,8 +1,8 @@ -Index: 2.6-bk/drivers/serial/8250.c +Index: linux-2.6.13/drivers/serial/8250.c =================================================================== ---- 2.6-bk.orig/drivers/serial/8250.c 2004-09-15 11:00:58.000000000 +0100 -+++ 2.6-bk/drivers/serial/8250.c 2004-09-30 13:23:22.202968787 +0100 -@@ -2033,7 +2033,12 @@ +--- linux-2.6.13.orig/drivers/serial/8250.c 2005-09-15 09:26:00.000000000 +0100 ++++ linux-2.6.13/drivers/serial/8250.c 2005-09-15 09:28:49.000000000 +0100 +@@ -2312,7 +2312,12 @@ .devfs_name = "tts/", .dev_name = "ttyS", .major = TTY_MAJOR, @@ -15,20 +15,20 @@ Index: 2.6-bk/drivers/serial/8250.c .nr = UART_NR, .cons = SERIAL8250_CONSOLE, }; -Index: 2.6-bk/drivers/serial/serial_core.c +Index: linux-2.6.13/drivers/serial/serial_core.c =================================================================== ---- 2.6-bk.orig/drivers/serial/serial_core.c 2004-09-30 09:03:27.000000000 +0100 -+++ 2.6-bk/drivers/serial/serial_core.c 2004-09-30 13:23:22.205967977 +0100 -@@ -1958,7 +1958,7 @@ - static inline void - uart_report_port(struct uart_driver *drv, struct uart_port *port) - { -- printk("%s%d", drv->dev_name, port->line); -+ printk("%s%d", drv->dev_name, port->line + drv->name_base); - printk(" at "); - switch (port->iotype) { - case UPIO_PORT: -@@ -2127,6 +2127,7 @@ +--- linux-2.6.13.orig/drivers/serial/serial_core.c 2005-09-15 09:26:00.000000000 +0100 ++++ linux-2.6.13/drivers/serial/serial_core.c 2005-09-15 09:30:16.000000000 +0100 +@@ -1969,7 +1969,7 @@ + } + + printk(KERN_INFO "%s%d at %s (irq = %d) is a %s\n", +- drv->dev_name, port->line, address, port->irq, uart_type(port)); ++ drv->dev_name, port->line + drv->name_base, address, port->irq, uart_type(port)); + } + + static void +@@ -2133,6 +2133,7 @@ normal->driver_name = drv->driver_name; normal->devfs_name = drv->devfs_name; normal->name = drv->dev_name; @@ -36,11 +36,11 @@ Index: 2.6-bk/drivers/serial/serial_core.c normal->major = drv->major; normal->minor_start = drv->minor; normal->type = TTY_DRIVER_TYPE_SERIAL; -Index: 2.6-bk/include/linux/serial_core.h +Index: linux-2.6.13/include/linux/serial_core.h =================================================================== ---- 2.6-bk.orig/include/linux/serial_core.h 2004-09-15 11:00:59.000000000 +0100 -+++ 2.6-bk/include/linux/serial_core.h 2004-09-30 13:23:22.206967707 +0100 -@@ -290,6 +290,7 @@ +--- linux-2.6.13.orig/include/linux/serial_core.h 2005-09-15 09:26:03.000000000 +0100 ++++ linux-2.6.13/include/linux/serial_core.h 2005-09-15 09:28:49.000000000 +0100 +@@ -318,6 +318,7 @@ const char *driver_name; const char *dev_name; const char *devfs_name; @@ -48,11 +48,11 @@ Index: 2.6-bk/include/linux/serial_core.h int major; int minor; int nr; -Index: linux-2.6.11/drivers/serial/serial_cs.c +Index: linux-2.6.13/drivers/serial/serial_cs.c =================================================================== ---- linux-2.6.11.orig/drivers/serial/serial_cs.c 2005-06-13 23:28:12.000000000 +0100 -+++ linux-2.6.11/drivers/serial/serial_cs.c 2005-06-14 00:18:08.000000000 +0100 -@@ -331,7 +331,7 @@ +--- linux-2.6.13.orig/drivers/serial/serial_cs.c 2005-09-15 09:26:00.000000000 +0100 ++++ linux-2.6.13/drivers/serial/serial_cs.c 2005-09-15 09:28:49.000000000 +0100 +@@ -298,7 +298,7 @@ kio_addr_t iobase, int irq) { struct uart_port port; @@ -61,7 +61,7 @@ Index: linux-2.6.11/drivers/serial/serial_cs.c memset(&port, 0, sizeof (struct uart_port)); port.iobase = iobase; -@@ -348,10 +348,16 @@ +@@ -315,10 +315,16 @@ return -EINVAL; } diff --git a/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-mm3.bb index 1aee33c312..7078c1a24a 100644 --- a/packages/linux/linux-openzaurus_2.6.13-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-mm3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r7" +PR = "r0" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -15,30 +15,20 @@ BASRC = "http://www.orca.cx/zaurus/patches" # Handy URLs # http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 \ # http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.12-rc4-git1.bz2;patch=1 \ -# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc6.bz2;patch=1 \ +# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \ +# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \ + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ - ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm1/2.6.13-mm1.bz2;patch=1 \ - ${RPSRC}/pxa_pcmcia_init-r1.patch;patch=1 \ - ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \ + ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13/2.6.13-mm3/2.6.13-mm3.bz2;patch=1 \ ${RPSRC}/borzoi_machtype-r0.patch;patch=1 \ - ${RPSRC}/sharp_multi_pcmcia-r4.patch;patch=1 \ - ${RPSRC}/rmk_mmc_updates-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_detection-r1.patch;patch=1 \ - ${RPSRC}/corgi_mmc_detect-r0.patch;patch=1 \ - ${RPSRC}/scoop_typefix-r0.patch;patch=1 \ - ${RPSRC}/sharpsl_ssp-r4.patch;patch=1 \ - ${RPSRC}/sharpsl_lcd-r4.patch;patch=1 \ - ${RPSRC}/sharpsl_ts-r6.patch;patch=1 \ - ${RPSRC}/sharpsl_bl-r5.patch;patch=1 \ - ${RPSRC}/spitzkbd-r3.patch;patch=1 \ - ${RPSRC}/spitz_base-r17.patch;patch=1 \ + ${RPSRC}/sharpsl_bl_miss-r0.patch;patch=1 \ ${RPSRC}/sharpsl_mtd_extras-r1.patch;patch=1 \ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \ + ${RPSRC}/pxa_i2c_fixes-r0.patch;patch=1 \ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \ ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \ ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \ @@ -49,7 +39,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${RPSRC}/spitzcf-r3.patch;patch=1 \ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \ - ${RPSRC}/rmk-i2c-pxa-r2.patch;patch=1 \ ${RPSRC}/pxa_irda-r3.patch;patch=1 \ ${RPSRC}/corgi_irda-r3.patch;patch=1 \ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \ @@ -67,9 +56,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \ ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \ ${DOSRC}/tc6393-device-r5.patch;patch=1 \ ${DOSRC}/tc6393_nand-r6.patch;patch=1 \ - ${DOSRC}/tosa-machine-base-r9.patch;patch=1 \ + ${RPSRC}/temp/tosa-machine-base-r10.patch;patch=1 \ ${DOSRC}/tosa-keyboard-r6.patch;patch=1 \ - ${DOSRC}/tc6393fb-r6.patch;patch=1 \ + ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \ ${DOSRC}/tosa-power-r6.patch;patch=1 \ ${DOSRC}/tosa-mmc-r5.patch;patch=1 \ ${DOSRC}/tosa-udc-r4.patch;patch=1 \ |