From a4ffbea09c88fbe9cefcf0080eda0809598f3ee1 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 7 Nov 2008 08:44:56 +0000 Subject: [kernel] update to 2.6.25.19, and refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/etrax/patches/100-compile_fixes.patch | 18 +++++++++--------- target/linux/etrax/patches/101-cris-eth-driver.patch | 2 +- target/linux/etrax/patches/200-samsung_flash.patch | 2 +- target/linux/etrax/patches/201-flashsize.patch | 8 ++++---- target/linux/etrax/patches/300-sysfs.patch | 6 +++--- target/linux/etrax/patches/301-usb_support.patch | 4 ++-- 6 files changed, 20 insertions(+), 20 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 ea6d08e86f..ecb930712b 100644 --- a/target/linux/etrax/patches/100-compile_fixes.patch +++ b/target/linux/etrax/patches/100-compile_fixes.patch @@ -1,6 +1,6 @@ --- a/arch/cris/Makefile +++ b/arch/cris/Makefile -@@ -33,7 +33,7 @@ +@@ -33,7 +33,7 @@ endif LD = $(CROSS_COMPILE)ld -mcrislinux @@ -21,7 +21,7 @@ subdir- := compressed rescue targets := Image -@@ -14,7 +11,6 @@ +@@ -14,7 +11,6 @@ $(obj)/Image: vmlinux FORCE $(obj)/compressed/vmlinux: $(obj)/Image FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ @@ -45,7 +45,7 @@ quiet_cmd_image = BUILD $@ cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@ -@@ -22,10 +18,10 @@ +@@ -22,10 +18,10 @@ $(obj)/decompress.bin: $(obj)/decompress $(call if_changed,objcopy) $(obj)/head.o: $(obj)/head.S .config @@ -93,7 +93,7 @@ beq dram_init_finished nop -@@ -36,91 +37,91 @@ +@@ -36,91 +37,91 @@ dram_init_finished: ;; Initiate the PA and PB ports @@ -233,7 +233,7 @@ * adaptation for Linux/CRIS Axis Communications AB, 1999 * */ -@@ -99,12 +99,12 @@ +@@ -99,12 +99,12 @@ static void error(char *m); static void gzip_mark(void **); static void gzip_release(void **); @@ -249,7 +249,7 @@ #include "../../../../../lib/inflate.c" -@@ -139,7 +139,7 @@ +@@ -139,7 +139,7 @@ static void gzip_release(void **ptr) /* decompressor info and error messages to serial console */ static void @@ -258,7 +258,7 @@ { #ifndef CONFIG_ETRAX_DEBUG_PORT_NULL while(*s) { -@@ -209,9 +209,9 @@ +@@ -209,9 +209,9 @@ flush_window() static void error(char *x) { @@ -271,7 +271,7 @@ while(1); /* Halt */ } -@@ -257,14 +257,7 @@ +@@ -257,14 +257,7 @@ decompress_kernel() makecrc(); @@ -290,7 +290,7 @@ } --- a/arch/cris/arch-v10/mm/init.c +++ b/arch/cris/arch-v10/mm/init.c -@@ -184,6 +184,9 @@ +@@ -184,6 +184,9 @@ paging_init(void) free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0); } diff --git a/target/linux/etrax/patches/101-cris-eth-driver.patch b/target/linux/etrax/patches/101-cris-eth-driver.patch index f73b379ddc..8ffe07377e 100644 --- a/target/linux/etrax/patches/101-cris-eth-driver.patch +++ b/target/linux/etrax/patches/101-cris-eth-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c -@@ -1707,7 +1707,7 @@ +@@ -1707,7 +1707,7 @@ e100_set_network_leds(int active) static void e100_netpoll(struct net_device* netdev) { diff --git a/target/linux/etrax/patches/200-samsung_flash.patch b/target/linux/etrax/patches/200-samsung_flash.patch index ac4ac67818..5353106cad 100644 --- a/target/linux/etrax/patches/200-samsung_flash.patch +++ b/target/linux/etrax/patches/200-samsung_flash.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -297,8 +297,8 @@ +@@ -297,8 +297,8 @@ struct mtd_info *cfi_cmdset_0002(struct return NULL; } diff --git a/target/linux/etrax/patches/201-flashsize.patch b/target/linux/etrax/patches/201-flashsize.patch index 859bb46fdc..4c4fa81d04 100644 --- a/target/linux/etrax/patches/201-flashsize.patch +++ b/target/linux/etrax/patches/201-flashsize.patch @@ -8,7 +8,7 @@ + .dword 0xdeadc0de --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c -@@ -113,7 +113,7 @@ +@@ -113,7 +113,7 @@ static struct map_info map_cse1 = { /* If no partition-table was found, we use this default-set. */ #define MAX_PARTITIONS 7 @@ -17,7 +17,7 @@ /* * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the -@@ -122,19 +122,14 @@ +@@ -122,19 +122,14 @@ static struct map_info map_cse1 = { */ static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = { { @@ -42,7 +42,7 @@ } }; -@@ -281,6 +276,11 @@ +@@ -281,6 +276,11 @@ static int __init init_axis_flash(void) 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"; @@ -54,7 +54,7 @@ if (!(mymtd = flash_probe())) { /* There's no reason to use this module if no flash chip can -@@ -292,6 +292,31 @@ +@@ -292,6 +292,31 @@ static int __init init_axis_flash(void) 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 3b0378421a..a7bebe52d8 100644 --- a/target/linux/etrax/patches/300-sysfs.patch +++ b/target/linux/etrax/patches/300-sysfs.patch @@ -1,6 +1,6 @@ --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c -@@ -27,6 +27,7 @@ +@@ -27,6 +27,7 @@ static char *serial_version = "$Revision #include #include #include @@ -8,7 +8,7 @@ #include #include -@@ -4384,6 +4385,7 @@ +@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op .tiocmset = rs_tiocmset }; @@ -16,7 +16,7 @@ static int __init rs_init(void) { -@@ -4518,6 +4520,24 @@ +@@ -4518,6 +4520,24 @@ rs_init(void) #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 5b443d42fa..51de789fa1 100644 --- a/target/linux/etrax/patches/301-usb_support.patch +++ b/target/linux/etrax/patches/301-usb_support.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile -@@ -16,6 +16,7 @@ +@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD) += host/ obj-$(CONFIG_USB_SL811_HCD) += host/ obj-$(CONFIG_USB_U132_HCD) += host/ obj-$(CONFIG_USB_R8A66597_HCD) += host/ @@ -10,7 +10,7 @@ obj-$(CONFIG_USB_PRINTER) += class/ --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile -@@ -17,3 +17,5 @@ +@@ -17,3 +17,5 @@ obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o -- cgit v1.2.3