From ad91de86f521b239a749b9ab5de7d2eb45e9fd8b Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 17 Jun 2008 12:57:04 +0000 Subject: [kernel] upgrade to 2.6.25.7, and refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11523 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/etrax/patches/100-compile_fixes.patch | 36 ++++++++-------------- target/linux/etrax/patches/200-samsung_flash.patch | 8 ++--- target/linux/etrax/patches/201-flashsize.patch | 20 +++++------- target/linux/etrax/patches/300-sysfs.patch | 12 +++----- target/linux/etrax/patches/301-usb_support.patch | 25 ++++++--------- 5 files changed, 38 insertions(+), 63 deletions(-) (limited to 'target/linux/etrax/patches') diff --git a/target/linux/etrax/patches/100-compile_fixes.patch b/target/linux/etrax/patches/100-compile_fixes.patch index 6a976d8ff..61cbf1b1d 100644 --- a/target/linux/etrax/patches/100-compile_fixes.patch +++ b/target/linux/etrax/patches/100-compile_fixes.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/Makefile 2008-06-09 17:00:36.381498250 +0200 -+++ linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile 2008-06-09 17:00:40.967491000 +0200 +--- a/arch/cris/arch-v10/boot/Makefile ++++ b/arch/cris/arch-v10/boot/Makefile @@ -2,7 +2,6 @@ # arch/cris/arch-v10/boot/Makefile # @@ -18,10 +16,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile $(obj)/zImage: $(obj)/compressed/vmlinux @cp $< $@ -Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-09 17:00:36.381498250 +0200 -+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-09 17:00:40.967491000 +0200 +--- a/arch/cris/arch-v10/boot/compressed/Makefile ++++ b/arch/cris/arch-v10/boot/compressed/Makefile @@ -2,12 +2,10 @@ # arch/cris/arch-v10/boot/compressed/Makefile # @@ -49,10 +45,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile $(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE $(call if_changed,image) -Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-09 17:00:36.381498250 +0200 -+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-09 17:00:40.967491000 +0200 +--- a/arch/cris/arch-v10/boot/compressed/misc.c ++++ b/arch/cris/arch-v10/boot/compressed/misc.c @@ -5,7 +5,7 @@ * adapted for Linux. * @@ -117,10 +111,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c - puts("Done. Now booting the kernel.\n"); + putstr("Done. Now booting the kernel.\n"); } -Index: linux-2.6.25.4/arch/cris/arch-v10/mm/init.c -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/mm/init.c 2008-06-09 17:00:36.385496500 +0200 -+++ linux-2.6.25.4/arch/cris/arch-v10/mm/init.c 2008-06-09 17:00:40.967491000 +0200 +--- a/arch/cris/arch-v10/mm/init.c ++++ b/arch/cris/arch-v10/mm/init.c @@ -184,6 +184,9 @@ free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0); @@ -131,10 +123,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/mm/init.c /* Initialize remaps of some I/O-ports. It is important that this * is called before any driver is initialized. -Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/head.S -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/head.S 2008-06-09 17:00:36.385496500 +0200 -+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/head.S 2008-06-09 17:00:40.971489250 +0200 +--- a/arch/cris/arch-v10/boot/compressed/head.S ++++ b/arch/cris/arch-v10/boot/compressed/head.S @@ -10,13 +10,14 @@ #define ASSEMBLER_MACROS_ONLY @@ -289,10 +279,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/head.S +cmd_line_addr: .dword 0 #include "../../lib/hw_settings.S" -Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/decompress.ld -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-05-15 17:00:12.000000000 +0200 -+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-06-09 17:12:54.930425750 +0200 +--- a/arch/cris/arch-v10/boot/compressed/decompress.ld ++++ b/arch/cris/arch-v10/boot/compressed/decompress.ld @@ -1,4 +1,4 @@ -OUTPUT_FORMAT(elf32-us-cris) +OUTPUT_FORMAT(elf32-cris) diff --git a/target/linux/etrax/patches/200-samsung_flash.patch b/target/linux/etrax/patches/200-samsung_flash.patch index f15c1116b..ac4ac6781 100644 --- a/target/linux/etrax/patches/200-samsung_flash.patch +++ b/target/linux/etrax/patches/200-samsung_flash.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c -+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -297,8 +297,8 @@ struct mtd_info *cfi_cmdset_0002(struct +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c +@@ -297,8 +297,8 @@ return NULL; } diff --git a/target/linux/etrax/patches/201-flashsize.patch b/target/linux/etrax/patches/201-flashsize.patch index 0348bb049..859bb46fd 100644 --- a/target/linux/etrax/patches/201-flashsize.patch +++ b/target/linux/etrax/patches/201-flashsize.patch @@ -1,18 +1,14 @@ -Index: linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/lib/hw_settings.S -+++ linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S +--- a/arch/cris/arch-v10/lib/hw_settings.S ++++ b/arch/cris/arch-v10/lib/hw_settings.S @@ -60,3 +60,5 @@ .dword R_PORT_PB_SET .dword PB_SET_VALUE .dword 0 ; No more register values + .ascii "ACME_PART_MAGIC" + .dword 0xdeadc0de -Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c -=================================================================== ---- linux-2.6.25.4.orig/arch/cris/arch-v10/drivers/axisflashmap.c -+++ linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c -@@ -113,7 +113,7 @@ static struct map_info map_cse1 = { +--- a/arch/cris/arch-v10/drivers/axisflashmap.c ++++ b/arch/cris/arch-v10/drivers/axisflashmap.c +@@ -113,7 +113,7 @@ /* If no partition-table was found, we use this default-set. */ #define MAX_PARTITIONS 7 @@ -21,7 +17,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c /* * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the -@@ -122,19 +122,14 @@ static struct map_info map_cse1 = { +@@ -122,19 +122,14 @@ */ static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = { { @@ -46,7 +42,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c } }; -@@ -281,6 +276,11 @@ static int __init init_axis_flash(void) +@@ -281,6 +276,11 @@ struct partitiontable_entry *ptable; int use_default_ptable = 1; /* Until proven otherwise. */ const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n"; @@ -58,7 +54,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c if (!(mymtd = flash_probe())) { /* There's no reason to use this module if no flash chip can -@@ -292,6 +292,31 @@ static int __init init_axis_flash(void) +@@ -292,6 +292,31 @@ mymtd->name, mymtd->size); axisflash_mtd = mymtd; } diff --git a/target/linux/etrax/patches/300-sysfs.patch b/target/linux/etrax/patches/300-sysfs.patch index 4ffc15d66..3b0378421 100644 --- a/target/linux/etrax/patches/300-sysfs.patch +++ b/target/linux/etrax/patches/300-sysfs.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/drivers/serial/crisv10.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/serial/crisv10.c -+++ linux-2.6.25.4/drivers/serial/crisv10.c -@@ -27,6 +27,7 @@ static char *serial_version = "$Revision +--- a/drivers/serial/crisv10.c ++++ b/drivers/serial/crisv10.c +@@ -27,6 +27,7 @@ #include #include #include @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/drivers/serial/crisv10.c #include #include -@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op +@@ -4384,6 +4385,7 @@ .tiocmset = rs_tiocmset }; @@ -18,7 +16,7 @@ Index: linux-2.6.25.4/drivers/serial/crisv10.c static int __init rs_init(void) { -@@ -4518,6 +4520,24 @@ rs_init(void) +@@ -4518,6 +4520,24 @@ #endif #endif /* CONFIG_SVINTO_SIM */ diff --git a/target/linux/etrax/patches/301-usb_support.patch b/target/linux/etrax/patches/301-usb_support.patch index 8e80eea53..5b443d42f 100644 --- a/target/linux/etrax/patches/301-usb_support.patch +++ b/target/linux/etrax/patches/301-usb_support.patch @@ -1,6 +1,5 @@ -diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/Makefile source-2.6.25-rc8/drivers/usb/Makefile ---- clean-2.6.25-rc8/drivers/usb/Makefile 2008-04-07 10:26:24.000000000 +0200 -+++ source-2.6.25-rc8/drivers/usb/Makefile 2008-04-07 10:29:40.000000000 +0200 +--- a/drivers/usb/Makefile ++++ b/drivers/usb/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_USB_SL811_HCD) += host/ obj-$(CONFIG_USB_U132_HCD) += host/ @@ -9,18 +8,16 @@ diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/dr obj-$(CONFIG_USB_ACM) += class/ obj-$(CONFIG_USB_PRINTER) += class/ -diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/Makefile source-2.6.25-rc8/drivers/usb/host/Makefile ---- clean-2.6.25-rc8/drivers/usb/host/Makefile 2008-04-07 10:26:24.000000000 +0200 -+++ source-2.6.25-rc8/drivers/usb/host/Makefile 2008-04-07 10:29:40.000000000 +0200 +--- a/drivers/usb/host/Makefile ++++ b/drivers/usb/host/Makefile @@ -17,3 +17,5 @@ obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o +#obj-$(CONFIG_USB_CARNEOL) += hc-crisv10.o +obj-$(CONFIG_ETRAX_USB_HOST) += hc-crisv10.o -diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h source-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h ---- clean-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h 1970-01-01 01:00:00.000000000 +0100 -+++ source-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h 2008-04-07 10:29:40.000000000 +0200 +--- /dev/null ++++ b/drivers/usb/host/hc-cris-dbg.h @@ -0,0 +1,143 @@ + +/* macros for debug output */ @@ -165,9 +162,8 @@ diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/dr + }; \ + s; \ + }) -diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.c source-2.6.25-rc8/drivers/usb/host/hc-crisv10.c ---- clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.c 1970-01-01 01:00:00.000000000 +0100 -+++ source-2.6.25-rc8/drivers/usb/host/hc-crisv10.c 2008-04-07 10:29:40.000000000 +0200 +--- /dev/null ++++ b/drivers/usb/host/hc-crisv10.c @@ -0,0 +1,4800 @@ +/* + * @@ -4969,9 +4965,8 @@ diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/dr +/* Module hooks */ +module_init(module_hcd_init); +module_exit(module_hcd_exit); -diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.h source-2.6.25-rc8/drivers/usb/host/hc-crisv10.h ---- clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.h 1970-01-01 01:00:00.000000000 +0100 -+++ source-2.6.25-rc8/drivers/usb/host/hc-crisv10.h 2008-04-07 10:29:40.000000000 +0200 +--- /dev/null ++++ b/drivers/usb/host/hc-crisv10.h @@ -0,0 +1,331 @@ +#ifndef __LINUX_ETRAX_USB_H +#define __LINUX_ETRAX_USB_H -- cgit v1.2.3