diff options
| -rw-r--r-- | target/linux/etrax/patches/100-compile_fixes.patch | 44 | ||||
| -rw-r--r-- | target/linux/etrax/patches/200-samsung_flash.patch | 8 | ||||
| -rw-r--r-- | target/linux/etrax/patches/201-flashsize.patch | 20 | ||||
| -rw-r--r-- | target/linux/etrax/patches/300-sysfs.patch | 12 | ||||
| -rw-r--r-- | target/linux/etrax/patches/301-usb_support.patch | 39 |
5 files changed, 66 insertions, 57 deletions
diff --git a/target/linux/etrax/patches/100-compile_fixes.patch b/target/linux/etrax/patches/100-compile_fixes.patch index d9eb5971d..0455f1f44 100644 --- a/target/linux/etrax/patches/100-compile_fixes.patch +++ b/target/linux/etrax/patches/100-compile_fixes.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.25.1/arch/cris/arch-v10/boot/Makefile +Index: linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/boot/Makefile 2008-05-03 18:16:00.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/boot/Makefile 2008-05-03 18:16:12.000000000 +0100 +--- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/Makefile ++++ linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile @@ -2,10 +2,10 @@ # arch/cris/arch-v10/boot/Makefile # @@ -15,7 +15,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/boot/Makefile targets := Image $(obj)/Image: vmlinux FORCE -@@ -14,7 +14,6 @@ +@@ -14,7 +14,6 @@ $(obj)/Image: vmlinux FORCE $(obj)/compressed/vmlinux: $(obj)/Image FORCE $(Q)$(MAKE) $(build)=$(obj)/compressed $@ @@ -23,10 +23,10 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/boot/Makefile $(obj)/zImage: $(obj)/compressed/vmlinux @cp $< $@ -Index: linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/Makefile +Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/boot/compressed/Makefile 2008-05-03 18:16:00.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/Makefile 2008-05-03 18:16:12.000000000 +0100 +--- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/Makefile ++++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile @@ -2,12 +2,11 @@ # arch/cris/arch-v10/boot/compressed/Makefile # @@ -42,7 +42,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/Makefile OBJCOPYFLAGS = -O binary --remove-section=.bss quiet_cmd_image = BUILD $@ -@@ -22,10 +21,10 @@ +@@ -22,10 +21,10 @@ $(obj)/decompress.bin: $(obj)/decompress $(call if_changed,objcopy) $(obj)/head.o: $(obj)/head.S .config @@ -55,10 +55,10 @@ Index: linux-2.6.25.1/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.1/arch/cris/arch-v10/boot/compressed/misc.c +Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/boot/compressed/misc.c 2008-05-03 18:16:00.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/misc.c 2008-05-03 18:16:12.000000000 +0100 +--- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/misc.c ++++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c @@ -5,7 +5,7 @@ * adapted for Linux. * @@ -68,7 +68,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/misc.c * adaptation for Linux/CRIS Axis Communications AB, 1999 * */ -@@ -99,7 +99,7 @@ +@@ -99,7 +99,7 @@ static void error(char *m); static void gzip_mark(void **); static void gzip_release(void **); @@ -77,7 +77,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/misc.c /* the "heap" is put directly after the BSS ends, at end */ -@@ -139,7 +139,7 @@ +@@ -139,7 +139,7 @@ static void gzip_release(void **ptr) /* decompressor info and error messages to serial console */ static void @@ -86,7 +86,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/misc.c { #ifndef CONFIG_ETRAX_DEBUG_PORT_NULL while(*s) { -@@ -209,9 +209,9 @@ +@@ -209,9 +209,9 @@ flush_window() static void error(char *x) { @@ -99,7 +99,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/boot/compressed/misc.c while(1); /* Halt */ } -@@ -257,14 +257,7 @@ +@@ -257,14 +257,7 @@ decompress_kernel() makecrc(); @@ -116,13 +116,17 @@ Index: linux-2.6.25.1/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.1/arch/cris/arch-v10/mm/init.c +Index: linux-2.6.25.4/arch/cris/arch-v10/mm/init.c =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/mm/init.c 2008-05-03 18:18:51.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/mm/init.c 2008-05-03 18:18:53.000000000 +0100 -@@ -113,3 +113,6 @@ - (unsigned long)((&__init_end - &__init_begin) >> 10)); +--- linux-2.6.25.4.orig/arch/cris/arch-v10/mm/init.c ++++ linux-2.6.25.4/arch/cris/arch-v10/mm/init.c +@@ -184,6 +184,9 @@ paging_init(void) + + free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0); } +void free_initrd_mem(unsigned long start, unsigned long end) +{ +} + + /* Initialize remaps of some I/O-ports. It is important that this + * is called before any driver is initialized. diff --git a/target/linux/etrax/patches/200-samsung_flash.patch b/target/linux/etrax/patches/200-samsung_flash.patch index 7b5e65e46..f15c1116b 100644 --- a/target/linux/etrax/patches/200-samsung_flash.patch +++ b/target/linux/etrax/patches/200-samsung_flash.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c +Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c =================================================================== ---- linux-2.6.25.1.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-03 20:09:19.000000000 +0100 -+++ linux-2.6.25.1/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-03 20:10:57.000000000 +0100 -@@ -297,8 +297,8 @@ +--- 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 return NULL; } diff --git a/target/linux/etrax/patches/201-flashsize.patch b/target/linux/etrax/patches/201-flashsize.patch index 4982963d3..0348bb049 100644 --- a/target/linux/etrax/patches/201-flashsize.patch +++ b/target/linux/etrax/patches/201-flashsize.patch @@ -1,18 +1,18 @@ -Index: linux-2.6.25.1/arch/cris/arch-v10/lib/hw_settings.S +Index: linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/lib/hw_settings.S 2008-05-03 20:25:16.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/lib/hw_settings.S 2008-05-03 20:25:35.000000000 +0100 +--- 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 @@ -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.1/arch/cris/arch-v10/drivers/axisflashmap.c +Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c =================================================================== ---- linux-2.6.25.1.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2008-05-03 20:27:28.000000000 +0100 -+++ linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c 2008-05-03 20:34:54.000000000 +0100 -@@ -113,7 +113,7 @@ +--- 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 = { /* If no partition-table was found, we use this default-set. */ #define MAX_PARTITIONS 7 @@ -21,7 +21,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c /* * 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] = { { @@ -46,7 +46,7 @@ Index: linux-2.6.25.1/arch/cris/arch-v10/drivers/axisflashmap.c } }; -@@ -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"; @@ -58,7 +58,7 @@ Index: linux-2.6.25.1/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 @@ +@@ -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 f153a6ccc..4ffc15d66 100644 --- a/target/linux/etrax/patches/300-sysfs.patch +++ b/target/linux/etrax/patches/300-sysfs.patch @@ -1,8 +1,8 @@ -Index: linux-2.6.25.1/drivers/serial/crisv10.c +Index: linux-2.6.25.4/drivers/serial/crisv10.c =================================================================== ---- linux-2.6.25.1.orig/drivers/serial/crisv10.c 2008-05-03 20:54:24.000000000 +0100 -+++ linux-2.6.25.1/drivers/serial/crisv10.c 2008-05-03 21:07:48.000000000 +0100 -@@ -27,6 +27,7 @@ +--- 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 #include <linux/kernel.h> #include <linux/mutex.h> #include <linux/bitops.h> @@ -10,7 +10,7 @@ Index: linux-2.6.25.1/drivers/serial/crisv10.c #include <asm/io.h> #include <asm/irq.h> -@@ -4384,6 +4385,7 @@ +@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op .tiocmset = rs_tiocmset }; @@ -18,7 +18,7 @@ Index: linux-2.6.25.1/drivers/serial/crisv10.c 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 8e80eea53..bfe5c70cf 100644 --- a/target/linux/etrax/patches/301-usb_support.patch +++ b/target/linux/etrax/patches/301-usb_support.patch @@ -1,7 +1,8 @@ -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 -@@ -16,6 +16,7 @@ +Index: linux-2.6.25.4/drivers/usb/Makefile +=================================================================== +--- linux-2.6.25.4.orig/drivers/usb/Makefile ++++ linux-2.6.25.4/drivers/usb/Makefile +@@ -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/ @@ -9,18 +10,20 @@ 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 -@@ -17,3 +17,5 @@ +Index: linux-2.6.25.4/drivers/usb/host/Makefile +=================================================================== +--- linux-2.6.25.4.orig/drivers/usb/host/Makefile ++++ linux-2.6.25.4/drivers/usb/host/Makefile +@@ -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 +#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 +Index: linux-2.6.25.4/drivers/usb/host/hc-cris-dbg.h +=================================================================== +--- /dev/null ++++ linux-2.6.25.4/drivers/usb/host/hc-cris-dbg.h @@ -0,0 +1,143 @@ + +/* macros for debug output */ @@ -165,9 +168,10 @@ 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 +Index: linux-2.6.25.4/drivers/usb/host/hc-crisv10.c +=================================================================== +--- /dev/null ++++ linux-2.6.25.4/drivers/usb/host/hc-crisv10.c @@ -0,0 +1,4800 @@ +/* + * @@ -4969,9 +4973,10 @@ 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 +Index: linux-2.6.25.4/drivers/usb/host/hc-crisv10.h +=================================================================== +--- /dev/null ++++ linux-2.6.25.4/drivers/usb/host/hc-crisv10.h @@ -0,0 +1,331 @@ +#ifndef __LINUX_ETRAX_USB_H +#define __LINUX_ETRAX_USB_H |