update to 2.6.25.15 and 2.6.26.2

SVN-Revision: 12242
16 years ago · e5fa05d788
parent c05eb4ba63
commit e5fa05d788
21 changed files with 30 additions and 34 deletions
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@ -25,11 +25,11 @@ endif
 ifeq ($(LINUX_VERSION),2.6.24.7)
  LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
 endif
-ifeq ($(LINUX_VERSION),2.6.25.12)
-  LINUX_KERNEL_MD5SUM:=7c413ecf94a84776aaec6ada5694318c
+ifeq ($(LINUX_VERSION),2.6.25.15)
+  LINUX_KERNEL_MD5SUM:=13ed94f02fc2a11615e3332e1cdf50e7
 endif
-ifeq ($(LINUX_VERSION),2.6.26)
-  LINUX_KERNEL_MD5SUM:=5169d01c405bc3f866c59338e217968c
+ifeq ($(LINUX_VERSION),2.6.26.2)
+  LINUX_KERNEL_MD5SUM:=82472622bd26bed0054790ec3e60ee00
 endif

 # disable the md5sum check for unknown kernel versions
--- a/target/linux/adm5120/Makefile
+++ b/target/linux/adm5120/Makefile
@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk

 BOARD:=adm5120
 BOARDNAME:=Infineon/ADMtek ADM5120
-#LINUX_VERSION:=2.6.25.12
-LINUX_VERSION:=2.6.26
+#LINUX_VERSION:=2.6.25.15
+LINUX_VERSION:=2.6.26.2
 SUBTARGETS:=router_le router_be
 INITRAMFS_EXTRA_FILES:=

--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@ -11,7 +11,7 @@ BOARD:=ar7
 BOARDNAME:=TI AR7
 FEATURES:=squashfs jffs2 atm

-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@ -11,7 +11,7 @@ BOARD:=ar71xx
 BOARDNAME:=Atheros AR71xx
 FEATURES:=squashfs tgz broken

-LINUX_VERSION:=2.6.26
+LINUX_VERSION:=2.6.26.2

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/at91/Makefile
+++ b/target/linux/at91/Makefile
@ -11,7 +11,7 @@ BOARD:=at91
 BOARDNAME:=Atmel AT91
 FEATURES:=squashfs usb

-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/atheros/Makefile
+++ b/target/linux/atheros/Makefile
@ -11,7 +11,7 @@ BOARD:=atheros
 BOARDNAME:=Atheros 231x/5312
 FEATURES:=squashfs jffs2

-LINUX_VERSION:=2.6.26
+LINUX_VERSION:=2.6.26.2

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@ -11,7 +11,7 @@ BOARD:=au1000
 BOARDNAME:=RMI/AMD AU1x00
 FEATURES:=jffs2 usb pci

-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += yamonenv
--- a/target/linux/avr32/Makefile
+++ b/target/linux/avr32/Makefile
@ -10,7 +10,7 @@ ARCH:=avr32
 BOARD:=avr32
 BOARDNAME:=Atmel AVR32
 FEATURES:=squashfs
-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@ -11,7 +11,7 @@ BOARD:=brcm47xx
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs usb

-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-switch kmod-diag
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=brcm63xx
 BOARDNAME:=Broadcom BCM963xx
 FEATURES:=squashfs jffs2 broken usb atm
-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/etrax/Makefile
+++ b/target/linux/etrax/Makefile
@ -10,7 +10,7 @@ ARCH:=cris
 BOARD:=etrax
 BOARDNAME:=Foxboard (ETRAX 100LX)
 FEATURES:=squashfs jffs2 broken
-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch
@ -1,5 +1,5 @@
--- linux-2.6.25.12/drivers/usb/class/cdc-acm.c	2008-07-24 18:14:20.000000000 +0200
-+++ linux-2.6.25.12.new/drivers/usb/class/cdc-acm.c	2008-08-05 21:39:35.000000000 +0200
+--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -531,8 +531,8 @@
 	tasklet_schedule(&acm->urb_task);
 
--- a/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/402-ledtrig_netdev.patch
@ -1,7 +1,5 @@
-Index: linux-2.6.26/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
+--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -200,4 +200,11 @@
 	tristate "LED Morse Trigger"
 	depends on LEDS_TRIGGERS
@ -14,10 +12,8 @@ Index: linux-2.6.26/drivers/leds/Kconfig
 +	  If unsure, say Y.
 +
 endif # NEW_LEDS
-Index: linux-2.6.26/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
+--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -29,3 +29,4 @@
 obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT)	+= ledtrig-heartbeat.o
 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
--- a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch
@ -8,7 +8,7 @@
 static int debug;
 static struct usb_serial *serial_table[SERIAL_TTY_MINORS];	/* initially all NULL */
 static DEFINE_MUTEX(table_lock);
-@@ -812,7 +813,7 @@
+@@ -815,7 +816,7 @@
 			dev_err(&interface->dev, "No free urbs available\n");
 			goto probe_error;
 		}
@ -17,7 +17,7 @@
 		port->bulk_in_size = buffer_size;
 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
 		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_PARM_DESC(debug, "Debug enabled or not");
--- a/target/linux/ifxmips/Makefile
+++ b/target/linux/ifxmips/Makefile
@ -10,7 +10,7 @@ ARCH:=mips
 BOARD:=ifxmips
 BOARDNAME:=Infineon Mips
 FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES:=uboot-ifxmips
--- a/target/linux/ixp4xx/Makefile
+++ b/target/linux/ixp4xx/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=Intel IXP4xx
 FEATURES:=squashfs
 SUBTARGETS=generic harddisk

-LINUX_VERSION:=2.6.26
+LINUX_VERSION:=2.6.26.2

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/magicbox/Makefile
+++ b/target/linux/magicbox/Makefile
@ -11,7 +11,7 @@ BOARD:=magicbox
 BOARDNAME:=Magicbox
 FEATURES:=squashfs pci

-LINUX_VERSION:=2.6.26
+LINUX_VERSION:=2.6.26.2
 LINUX_KARCH:=ppc

 include $(INCLUDE_DIR)/target.mk
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@ -11,7 +11,7 @@ BOARD:=orion
 BOARDNAME:=Marvell Orion
 FEATURES:=squashfs

-LINUX_VERSION:=2.6.26
+LINUX_VERSION:=2.6.26.2

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/ps3/Makefile
+++ b/target/linux/ps3/Makefile
@ -10,7 +10,7 @@ ARCH:=powerpc
 BOARD:=ps3
 BOARDNAME:=Sony PS3 Game Console

-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 KERNEL_CC:=

--- a/target/linux/uml/Makefile
+++ b/target/linux/uml/Makefile
@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux
 FEATURES:=ext2
 LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)

-LINUX_VERSION:=2.6.26
+LINUX_VERSION:=2.6.26.2

 include $(INCLUDE_DIR)/target.mk

--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@ -12,7 +12,7 @@ BOARDNAME:=x86
 FEATURES:=squashfs jffs2 ext2 vdi
 SUBTARGETS=generic

-LINUX_VERSION:=2.6.25.12
+LINUX_VERSION:=2.6.25.15

 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci