mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-13 11:41:06 +02:00
[kernel] update to 2.6.25.15 and 2.6.26.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12242 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
9fb77da451
commit
9c609b5b3b
@ -25,11 +25,11 @@ endif
|
|||||||
ifeq ($(LINUX_VERSION),2.6.24.7)
|
ifeq ($(LINUX_VERSION),2.6.24.7)
|
||||||
LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
|
LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
|
||||||
endif
|
endif
|
||||||
ifeq ($(LINUX_VERSION),2.6.25.12)
|
ifeq ($(LINUX_VERSION),2.6.25.15)
|
||||||
LINUX_KERNEL_MD5SUM:=7c413ecf94a84776aaec6ada5694318c
|
LINUX_KERNEL_MD5SUM:=13ed94f02fc2a11615e3332e1cdf50e7
|
||||||
endif
|
endif
|
||||||
ifeq ($(LINUX_VERSION),2.6.26)
|
ifeq ($(LINUX_VERSION),2.6.26.2)
|
||||||
LINUX_KERNEL_MD5SUM:=5169d01c405bc3f866c59338e217968c
|
LINUX_KERNEL_MD5SUM:=82472622bd26bed0054790ec3e60ee00
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# disable the md5sum check for unknown kernel versions
|
# disable the md5sum check for unknown kernel versions
|
||||||
|
@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
BOARD:=adm5120
|
BOARD:=adm5120
|
||||||
BOARDNAME:=Infineon/ADMtek ADM5120
|
BOARDNAME:=Infineon/ADMtek ADM5120
|
||||||
#LINUX_VERSION:=2.6.25.12
|
#LINUX_VERSION:=2.6.25.15
|
||||||
LINUX_VERSION:=2.6.26
|
LINUX_VERSION:=2.6.26.2
|
||||||
SUBTARGETS:=router_le router_be
|
SUBTARGETS:=router_le router_be
|
||||||
INITRAMFS_EXTRA_FILES:=
|
INITRAMFS_EXTRA_FILES:=
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=ar7
|
|||||||
BOARDNAME:=TI AR7
|
BOARDNAME:=TI AR7
|
||||||
FEATURES:=squashfs jffs2 atm
|
FEATURES:=squashfs jffs2 atm
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=ar71xx
|
|||||||
BOARDNAME:=Atheros AR71xx
|
BOARDNAME:=Atheros AR71xx
|
||||||
FEATURES:=squashfs tgz broken
|
FEATURES:=squashfs tgz broken
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.26
|
LINUX_VERSION:=2.6.26.2
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=at91
|
|||||||
BOARDNAME:=Atmel AT91
|
BOARDNAME:=Atmel AT91
|
||||||
FEATURES:=squashfs usb
|
FEATURES:=squashfs usb
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=atheros
|
|||||||
BOARDNAME:=Atheros 231x/5312
|
BOARDNAME:=Atheros 231x/5312
|
||||||
FEATURES:=squashfs jffs2
|
FEATURES:=squashfs jffs2
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.26
|
LINUX_VERSION:=2.6.26.2
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=au1000
|
|||||||
BOARDNAME:=RMI/AMD AU1x00
|
BOARDNAME:=RMI/AMD AU1x00
|
||||||
FEATURES:=jffs2 usb pci
|
FEATURES:=jffs2 usb pci
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
DEFAULT_PACKAGES += yamonenv
|
DEFAULT_PACKAGES += yamonenv
|
||||||
|
@ -10,7 +10,7 @@ ARCH:=avr32
|
|||||||
BOARD:=avr32
|
BOARD:=avr32
|
||||||
BOARDNAME:=Atmel AVR32
|
BOARDNAME:=Atmel AVR32
|
||||||
FEATURES:=squashfs
|
FEATURES:=squashfs
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=brcm47xx
|
|||||||
BOARDNAME:=Broadcom BCM947xx/953xx
|
BOARDNAME:=Broadcom BCM947xx/953xx
|
||||||
FEATURES:=squashfs usb
|
FEATURES:=squashfs usb
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
DEFAULT_PACKAGES += kmod-switch kmod-diag
|
DEFAULT_PACKAGES += kmod-switch kmod-diag
|
||||||
|
@ -10,7 +10,7 @@ ARCH:=mips
|
|||||||
BOARD:=brcm63xx
|
BOARD:=brcm63xx
|
||||||
BOARDNAME:=Broadcom BCM963xx
|
BOARDNAME:=Broadcom BCM963xx
|
||||||
FEATURES:=squashfs jffs2 broken usb atm
|
FEATURES:=squashfs jffs2 broken usb atm
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ ARCH:=cris
|
|||||||
BOARD:=etrax
|
BOARD:=etrax
|
||||||
BOARDNAME:=Foxboard (ETRAX 100LX)
|
BOARDNAME:=Foxboard (ETRAX 100LX)
|
||||||
FEATURES:=squashfs jffs2 broken
|
FEATURES:=squashfs jffs2 broken
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- linux-2.6.25.12/drivers/usb/class/cdc-acm.c 2008-07-24 18:14:20.000000000 +0200
|
--- a/drivers/usb/class/cdc-acm.c
|
||||||
+++ linux-2.6.25.12.new/drivers/usb/class/cdc-acm.c 2008-08-05 21:39:35.000000000 +0200
|
+++ b/drivers/usb/class/cdc-acm.c
|
||||||
@@ -531,8 +531,8 @@
|
@@ -531,8 +531,8 @@
|
||||||
tasklet_schedule(&acm->urb_task);
|
tasklet_schedule(&acm->urb_task);
|
||||||
|
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
Index: linux-2.6.26/drivers/leds/Kconfig
|
--- a/drivers/leds/Kconfig
|
||||||
===================================================================
|
+++ b/drivers/leds/Kconfig
|
||||||
--- linux-2.6.26.orig/drivers/leds/Kconfig 2008-08-04 15:03:44.000000000 +0200
|
|
||||||
+++ linux-2.6.26/drivers/leds/Kconfig 2008-08-04 15:04:18.000000000 +0200
|
|
||||||
@@ -200,4 +200,11 @@
|
@@ -200,4 +200,11 @@
|
||||||
tristate "LED Morse Trigger"
|
tristate "LED Morse Trigger"
|
||||||
depends on LEDS_TRIGGERS
|
depends on LEDS_TRIGGERS
|
||||||
@ -14,10 +12,8 @@ Index: linux-2.6.26/drivers/leds/Kconfig
|
|||||||
+ If unsure, say Y.
|
+ If unsure, say Y.
|
||||||
+
|
+
|
||||||
endif # NEW_LEDS
|
endif # NEW_LEDS
|
||||||
Index: linux-2.6.26/drivers/leds/Makefile
|
--- a/drivers/leds/Makefile
|
||||||
===================================================================
|
+++ b/drivers/leds/Makefile
|
||||||
--- linux-2.6.26.orig/drivers/leds/Makefile 2008-08-04 15:03:40.000000000 +0200
|
|
||||||
+++ linux-2.6.26/drivers/leds/Makefile 2008-08-04 15:04:29.000000000 +0200
|
|
||||||
@@ -29,3 +29,4 @@
|
@@ -29,3 +29,4 @@
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
|
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
|
||||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
static int debug;
|
static int debug;
|
||||||
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
|
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
|
||||||
static DEFINE_MUTEX(table_lock);
|
static DEFINE_MUTEX(table_lock);
|
||||||
@@ -812,7 +813,7 @@
|
@@ -815,7 +816,7 @@
|
||||||
dev_err(&interface->dev, "No free urbs available\n");
|
dev_err(&interface->dev, "No free urbs available\n");
|
||||||
goto probe_error;
|
goto probe_error;
|
||||||
}
|
}
|
||||||
@ -17,7 +17,7 @@
|
|||||||
port->bulk_in_size = buffer_size;
|
port->bulk_in_size = buffer_size;
|
||||||
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
|
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
|
||||||
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
|
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
|
||||||
@@ -1226,3 +1227,5 @@
|
@@ -1229,3 +1230,5 @@
|
||||||
|
|
||||||
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
module_param(debug, bool, S_IRUGO | S_IWUSR);
|
||||||
MODULE_PARM_DESC(debug, "Debug enabled or not");
|
MODULE_PARM_DESC(debug, "Debug enabled or not");
|
||||||
|
@ -10,7 +10,7 @@ ARCH:=mips
|
|||||||
BOARD:=ifxmips
|
BOARD:=ifxmips
|
||||||
BOARDNAME:=Infineon Mips
|
BOARDNAME:=Infineon Mips
|
||||||
FEATURES:=squashfs jffs2
|
FEATURES:=squashfs jffs2
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
DEFAULT_PACKAGES:=uboot-ifxmips
|
DEFAULT_PACKAGES:=uboot-ifxmips
|
||||||
|
@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx
|
|||||||
FEATURES:=squashfs
|
FEATURES:=squashfs
|
||||||
SUBTARGETS=generic harddisk
|
SUBTARGETS=generic harddisk
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.26
|
LINUX_VERSION:=2.6.26.2
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=magicbox
|
|||||||
BOARDNAME:=Magicbox
|
BOARDNAME:=Magicbox
|
||||||
FEATURES:=squashfs pci
|
FEATURES:=squashfs pci
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.26
|
LINUX_VERSION:=2.6.26.2
|
||||||
LINUX_KARCH:=ppc
|
LINUX_KARCH:=ppc
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
@ -11,7 +11,7 @@ BOARD:=orion
|
|||||||
BOARDNAME:=Marvell Orion
|
BOARDNAME:=Marvell Orion
|
||||||
FEATURES:=squashfs
|
FEATURES:=squashfs
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.26
|
LINUX_VERSION:=2.6.26.2
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ ARCH:=powerpc
|
|||||||
BOARD:=ps3
|
BOARD:=ps3
|
||||||
BOARDNAME:=Sony PS3 Game Console
|
BOARDNAME:=Sony PS3 Game Console
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
KERNEL_CC:=
|
KERNEL_CC:=
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
|
|||||||
FEATURES:=ext2
|
FEATURES:=ext2
|
||||||
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
|
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.26
|
LINUX_VERSION:=2.6.26.2
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ BOARDNAME:=x86
|
|||||||
FEATURES:=squashfs jffs2 ext2 vdi
|
FEATURES:=squashfs jffs2 ext2 vdi
|
||||||
SUBTARGETS=generic
|
SUBTARGETS=generic
|
||||||
|
|
||||||
LINUX_VERSION:=2.6.25.12
|
LINUX_VERSION:=2.6.25.15
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
|
DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
|
||||||
|
Loading…
x
Reference in New Issue
Block a user