Merge branch 'master' of git+ssh://openadk.org/git/openadk

2 files changed, 253 insertions, 236 deletions

diff --git a/target/linux/patches/2.6.37/brcm.patch b/target/linux/patches/2.6.37/brcm.patch
index 6ce7fc3c8..c484dc838 100644
--- a/target/linux/patches/2.6.37/brcm.patch
+++ b/target/linux/patches/2.6.37/brcm.patch
@@ -1,45 +1,6 @@
-diff -Nur linux-2.6.37.orig/arch/mips/Kconfig linux-2.6.37/arch/mips/Kconfig
---- linux-2.6.37.orig/arch/mips/Kconfig	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/arch/mips/Kconfig	2011-01-19 22:45:48.000000000 +0100
-@@ -84,6 +84,7 @@
- 	select GENERIC_GPIO
- 	select SYS_HAS_EARLY_PRINTK
- 	select CFE
-+	select SYS_SUPPORTS_ZBOOT_UART16550
- 	help
- 	 Support for BCM47XX based boards
- 
-diff -Nur linux-2.6.37.orig/arch/mips/Makefile linux-2.6.37/arch/mips/Makefile
---- linux-2.6.37.orig/arch/mips/Makefile	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/arch/mips/Makefile	2011-01-19 22:48:04.000000000 +0100
-@@ -76,6 +76,7 @@
- all-$(CONFIG_BOOT_ELF32)	:= $(vmlinux-32)
- all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64)
- all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz
-+all-$(CONFIG_BCM47XX)		+= vmlinuz.elf
- 
- #
- # GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
-@@ -276,7 +277,7 @@
- 	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@
- 
- # boot/compressed
--vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE
-+vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec vmlinuz.elf: $(vmlinux-32) FORCE
- 	$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
- 	   VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@
- 
-@@ -313,6 +314,7 @@
- 	echo '  vmlinuz.ecoff        - ECOFF zboot image'
- 	echo '  vmlinuz.bin          - Raw binary zboot image'
- 	echo '  vmlinuz.srec         - SREC zboot image'
-+	echo '  vmlinuz.elf          - ELF self-relocating zboot image'
- 	echo
- 	echo '  These will be default as apropriate for a configured platform.'
- endef
 diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/Makefile linux-2.6.37/arch/mips/bcm47xx/Makefile
 --- linux-2.6.37.orig/arch/mips/bcm47xx/Makefile	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/arch/mips/bcm47xx/Makefile	2011-01-19 22:45:43.000000000 +0100
++++ linux-2.6.37/arch/mips/bcm47xx/Makefile	2011-04-26 20:26:19.777672932 +0200
 @@ -3,4 +3,4 @@
  # under Linux.
  #
@@ -48,8 +9,8 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/Makefile linux-2.6.37/arch/mips/bc
 +obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o platform.o
 diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/bcm47xx/platform.c
 --- linux-2.6.37.orig/arch/mips/bcm47xx/platform.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37/arch/mips/bcm47xx/platform.c	2011-01-19 22:45:57.000000000 +0100
-@@ -0,0 +1,139 @@
++++ linux-2.6.37/arch/mips/bcm47xx/platform.c	2011-04-26 21:54:17.727672777 +0200
+@@ -0,0 +1,147 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -68,7 +29,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/
 +#include <asm/mach-bcm47xx/nvram.h>
 +
 +#define NVRAM_FLASH_SIZE 0x10000
-+#define CFGFS_FLASH_SIZE (64 * 1024)
++#define CFGFS_FLASH_SIZE (128 * 1024)
 +
 +static struct mtd_partition bcm47xx_partitions[] = {
 +#define SLOT_CFE 0
@@ -150,8 +111,16 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/
 +	trx_hdr = (void *)KSEG1ADDR(mcore->flash_window + 0x40000);
 +
 +	/* devices might have 2, 4 or 8 MB flash size */
++#ifdef BCM47XX_OVERRIDE_FLASHSIZE
++	flash_size = BCM47XX_OVERRIDE_FLASHSIZE;
++	mcore->flash_window_size = flash_size;
++#define BCM47XX_OVERRODE_FLASHSIZE " (overridden)"
++#else
 +	flash_size = mcore->flash_window_size;
-+	printk(KERN_INFO "FLASH SIZE: 0x%x\n", flash_size);
++#define BCM47XX_OVERRODE_FLASHSIZE ""
++#endif
++	printk(KERN_INFO "FLASH SIZE%s: %x\n", BCM47XX_OVERRODE_FLASHSIZE,
++		flash_size);
 +
 +	left = flash_size - 0x40000;
 +	posn = flash_size;
@@ -191,7 +160,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/
 +device_initcall(bcm47xx_register_devices);
 diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/Makefile linux-2.6.37/arch/mips/boot/compressed/Makefile
 --- linux-2.6.37.orig/arch/mips/boot/compressed/Makefile	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/arch/mips/boot/compressed/Makefile	2011-01-19 23:21:26.000000000 +0100
++++ linux-2.6.37/arch/mips/boot/compressed/Makefile	2011-04-26 20:44:04.607661119 +0200
 @@ -58,8 +58,13 @@
  # Calculate the load address of the compressed kernel image
  hostprogs-y := calc_vmlinuz_load_addr
@@ -214,15 +183,58 @@ diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/Makefile linux-2.6.37/arch
 +AFLAGS_selfreloc.o := -DVMLINUZ_LOAD_ADDRESS=$(VMLINUZ_LOAD_ADDRESS)
 +CPPFLAGS_selfreloc.lds := $(KBUILD_CFLAGS)
 +
-+arch/mips/boot/compressed/selfreloc.o: arch/mips/boot/compressed/selfreloc.S vmlinuz.bin
++arch/mips/boot/compressed/selfreloc.o: arch/mips/boot/compressed/selfreloc.S vmlinuz.bin FORCE
 +
-+vmlinuz.elf: arch/mips/boot/compressed/selfreloc.o arch/mips/boot/compressed/selfreloc.lds
++vmlinuz.elf: arch/mips/boot/compressed/selfreloc.o arch/mips/boot/compressed/selfreloc.lds FORCE
 +	$(LD) $(LDFLAGS) -T arch/mips/boot/compressed/selfreloc.lds arch/mips/boot/compressed/selfreloc.o -o $@
 +
 +clean-files := $(objtree)/vmlinuz $(objtree)/vmlinuz.{32,ecoff,bin,srec,elf} $(objtree)/arch/mips/boot/compressed/selfreloc.{o,lds}
+diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/selfreloc.lds.S linux-2.6.37/arch/mips/boot/compressed/selfreloc.lds.S
+--- linux-2.6.37.orig/arch/mips/boot/compressed/selfreloc.lds.S	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37/arch/mips/boot/compressed/selfreloc.lds.S	2011-04-26 20:26:20.347764678 +0200
+@@ -0,0 +1,39 @@
++/*-
++ * written 2010 by Thorsten Glaser <tg@debian.org> based on
++ * arch/mips/kernel/vmlinux.lds and arch/mips/boot/compressed/ld.script
++ */
++
++#include <asm/asm-offsets.h>
++#include <asm/page.h>
++#include <asm-generic/vmlinux.lds.h>
++
++#undef mips
++#define mips mips
++OUTPUT_ARCH(mips)
++ENTRY(selfreloc_start)
++PHDRS {
++	text PT_LOAD FLAGS(7);	/* RWX */
++}
++SECTIONS
++{
++	. = VMLINUX_LOAD_ADDRESS;
++	.text : {
++		*(.text)
++		*(.text.*)
++		*(.rodata)
++		*(.rodata.*)
++		*(.data)
++		*(.data.*)
++		*(.bss)
++		*(.bss.*)
++	} :text
++	/DISCARD/ : {
++		*(.MIPS.options)
++		*(.options)
++		*(.pdr)
++		*(.reginfo)
++		*(.comment)
++		*(.note)
++		*(.gnu.attributes)
++	}
++}
 diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/selfreloc.S linux-2.6.37/arch/mips/boot/compressed/selfreloc.S
 --- linux-2.6.37.orig/arch/mips/boot/compressed/selfreloc.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37/arch/mips/boot/compressed/selfreloc.S	2011-01-19 22:45:57.000000000 +0100
++++ linux-2.6.37/arch/mips/boot/compressed/selfreloc.S	2011-04-26 20:26:20.197673829 +0200
 @@ -0,0 +1,54 @@
 +/*-
 + * written 2011 by Thorsten Glaser <tg@freewrt.org> based on
@@ -278,52 +290,9 @@ diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/selfreloc.S linux-2.6.37/a
 +	.globl	imgend
 +	.p2align 2
 +imgend:
-diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/selfreloc.lds.S linux-2.6.37/arch/mips/boot/compressed/selfreloc.lds.S
---- linux-2.6.37.orig/arch/mips/boot/compressed/selfreloc.lds.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.37/arch/mips/boot/compressed/selfreloc.lds.S	2011-01-19 22:45:48.000000000 +0100
-@@ -0,0 +1,39 @@
-+/*-
-+ * written 2010 by Thorsten Glaser <tg@debian.org> based on
-+ * arch/mips/kernel/vmlinux.lds and arch/mips/boot/compressed/ld.script
-+ */
-+
-+#include <asm/asm-offsets.h>
-+#include <asm/page.h>
-+#include <asm-generic/vmlinux.lds.h>
-+
-+#undef mips
-+#define mips mips
-+OUTPUT_ARCH(mips)
-+ENTRY(selfreloc_start)
-+PHDRS {
-+	text PT_LOAD FLAGS(7);	/* RWX */
-+}
-+SECTIONS
-+{
-+	. = VMLINUX_LOAD_ADDRESS;
-+	.text : {
-+		*(.text)
-+		*(.text.*)
-+		*(.rodata)
-+		*(.rodata.*)
-+		*(.data)
-+		*(.data.*)
-+		*(.bss)
-+		*(.bss.*)
-+	} :text
-+	/DISCARD/ : {
-+		*(.MIPS.options)
-+		*(.options)
-+		*(.pdr)
-+		*(.reginfo)
-+		*(.comment)
-+		*(.note)
-+		*(.gnu.attributes)
-+	}
-+}
 diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/uart-16550.c linux-2.6.37/arch/mips/boot/compressed/uart-16550.c
 --- linux-2.6.37.orig/arch/mips/boot/compressed/uart-16550.c	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/arch/mips/boot/compressed/uart-16550.c	2011-01-19 22:45:48.000000000 +0100
++++ linux-2.6.37/arch/mips/boot/compressed/uart-16550.c	2011-04-26 20:26:20.467673519 +0200
 @@ -18,6 +18,11 @@
  #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset))
  #endif
@@ -336,9 +305,48 @@ diff -Nur linux-2.6.37.orig/arch/mips/boot/compressed/uart-16550.c linux-2.6.37/
  #ifndef PORT
  #error please define the serial port address for your own machine
  #endif
+diff -Nur linux-2.6.37.orig/arch/mips/Kconfig linux-2.6.37/arch/mips/Kconfig
+--- linux-2.6.37.orig/arch/mips/Kconfig	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/mips/Kconfig	2011-04-26 20:26:19.637668480 +0200
+@@ -84,6 +84,7 @@
+ 	select GENERIC_GPIO
+ 	select SYS_HAS_EARLY_PRINTK
+ 	select CFE
++	select SYS_SUPPORTS_ZBOOT_UART16550
+ 	help
+ 	 Support for BCM47XX based boards
+ 
+diff -Nur linux-2.6.37.orig/arch/mips/Makefile linux-2.6.37/arch/mips/Makefile
+--- linux-2.6.37.orig/arch/mips/Makefile	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/mips/Makefile	2011-04-26 20:26:19.647661042 +0200
+@@ -76,6 +76,7 @@
+ all-$(CONFIG_BOOT_ELF32)	:= $(vmlinux-32)
+ all-$(CONFIG_BOOT_ELF64)	:= $(vmlinux-64)
+ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlinuz
++all-$(CONFIG_BCM47XX)		+= vmlinuz.elf
+ 
+ #
+ # GCC uses -G 0 -mabicalls -fpic as default.  We don't want PIC in the kernel
+@@ -276,7 +277,7 @@
+ 	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@
+ 
+ # boot/compressed
+-vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE
++vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec vmlinuz.elf: $(vmlinux-32) FORCE
+ 	$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
+ 	   VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@
+ 
+@@ -313,6 +314,7 @@
+ 	echo '  vmlinuz.ecoff        - ECOFF zboot image'
+ 	echo '  vmlinuz.bin          - Raw binary zboot image'
+ 	echo '  vmlinuz.srec         - SREC zboot image'
++	echo '  vmlinuz.elf          - ELF self-relocating zboot image'
+ 	echo
+ 	echo '  These will be default as apropriate for a configured platform.'
+ endef
 diff -Nur linux-2.6.37.orig/drivers/ssb/driver_mipscore.c linux-2.6.37/drivers/ssb/driver_mipscore.c
 --- linux-2.6.37.orig/drivers/ssb/driver_mipscore.c	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/drivers/ssb/driver_mipscore.c	2011-01-19 22:45:57.000000000 +0100
++++ linux-2.6.37/drivers/ssb/driver_mipscore.c	2011-04-26 20:26:20.597672444 +0200
 @@ -190,10 +190,11 @@
  {
  	struct ssb_bus *bus = mcore->dev->bus;
@@ -354,7 +362,7 @@ diff -Nur linux-2.6.37.orig/drivers/ssb/driver_mipscore.c linux-2.6.37/drivers/s
  			mcore->flash_buswidth = 1;
 diff -Nur linux-2.6.37.orig/init/Kconfig linux-2.6.37/init/Kconfig
 --- linux-2.6.37.orig/init/Kconfig	2011-01-05 01:50:19.000000000 +0100
-+++ linux-2.6.37/init/Kconfig	2011-01-19 22:45:48.000000000 +0100
++++ linux-2.6.37/init/Kconfig	2011-04-26 20:26:20.727673059 +0200
 @@ -158,6 +158,7 @@
  config KERNEL_GZIP
  	bool "Gzip"
diff --git a/target/linux/patches/2.6.37/cris.patch b/target/linux/patches/2.6.37/cris.patch
index 6be88fc18..7f692ed30 100644
--- a/target/linux/patches/2.6.37/cris.patch
+++ b/target/linux/patches/2.6.37/cris.patch
@@ -1,68 +1,6 @@
-diff -Nur linux-2.6.36.orig/arch/cris/Kconfig linux-2.6.36/arch/cris/Kconfig
---- linux-2.6.36.orig/arch/cris/Kconfig	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Kconfig	2010-12-28 20:35:16.000000000 +0100
-@@ -177,6 +177,12 @@
- 	help
- 	  Size of DRAM (decimal in MB) typically 2, 8 or 16.
- 
-+config ETRAX_MTD_SIZE
-+	hex "MTD size (hex)"
-+	default "0x00800000"
-+	help
-+	  Size of MTD device typically 4 or 8 MB.
-+
- config ETRAX_VMEM_SIZE
-        int "Video memory size (dec, in MB)"
-        depends on ETRAX_ARCH_V32 && !ETRAXFS
-@@ -282,7 +288,7 @@
- 	select MTD_CFI_AMDSTD
- 	select MTD_JEDECPROBE if ETRAX_ARCH_V32
- 	select MTD_CHAR
--	select MTD_BLOCK
-+	select MTD_BLOCK_RO
- 	select MTD_PARTITIONS
- 	select MTD_CONCAT
- 	select MTD_COMPLEX_MAPPINGS
-@@ -671,6 +677,11 @@
- 
- source "drivers/ide/Kconfig"
- 
-+#mysteriously part of this standard linux driver was removed from cris build! - info@crisos.org  
-+source "drivers/scsi/Kconfig"
-+
-+source "drivers/media/Kconfig"
-+
- source "drivers/net/Kconfig"
- 
- source "drivers/i2c/Kconfig"
-@@ -686,6 +697,8 @@
- 
- source "fs/Kconfig"
- 
-+source "sound/Kconfig"
-+
- source "drivers/usb/Kconfig"
- 
- source "drivers/uwb/Kconfig"
-diff -Nur linux-2.6.36.orig/arch/cris/Makefile linux-2.6.36/arch/cris/Makefile
---- linux-2.6.36.orig/arch/cris/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/Makefile	2010-12-28 20:35:00.000000000 +0100
-@@ -40,10 +40,10 @@
- 
- LD = $(CROSS_COMPILE)ld -mcrislinux
- 
--OBJCOPYFLAGS := -O binary -R .note -R .comment -S
-+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
- 
- KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
--KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
-+KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -fno-peephole2 $(inc)
- KBUILD_CPPFLAGS += $(inc)
- 
- ifdef CONFIG_FRAME_POINTER
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/axisflashmap.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.37/arch/cris/arch-v10/drivers/axisflashmap.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/drivers/axisflashmap.c	2011-04-27 12:05:31.277662574 +0200
 @@ -113,7 +113,7 @@
  
  /* If no partition-table was found, we use this default-set. */
@@ -208,18 +146,18 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.
  	return err;
  }
  
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/ds1302.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.37/arch/cris/arch-v10/drivers/ds1302.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/drivers/ds1302.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/drivers/ds1302.c	2011-04-27 12:05:31.337661896 +0200
 @@ -22,6 +22,7 @@
- #include <linux/smp_lock.h>
+ #include <linux/mutex.h>
  #include <linux/bcd.h>
  #include <linux/capability.h>
 +#include <linux/device.h>
  
  #include <asm/uaccess.h>
  #include <asm/system.h>
-@@ -499,6 +500,10 @@
+@@ -501,6 +502,10 @@
  	return 0;
  }
  
@@ -230,7 +168,7 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arc
  static int __init ds1302_register(void)
  {
  	ds1302_init();
-@@ -507,6 +512,12 @@
+@@ -509,6 +514,12 @@
  		       ds1302_name, RTC_MAJOR_NR);
  		return -1;
  	}
@@ -243,9 +181,9 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.36/arc
          return 0;
  
  }
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c
---- linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/drivers/gpio.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.37/arch/cris/arch-v10/drivers/gpio.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/drivers/gpio.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/drivers/gpio.c	2011-04-27 12:05:31.377662210 +0200
 @@ -20,6 +20,7 @@
  #include <linux/poll.h>
  #include <linux/init.h>
@@ -254,7 +192,7 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/
  
  #include <asm/etraxgpio.h>
  #include <arch/svinto.h>
-@@ -797,6 +798,10 @@
+@@ -798,6 +799,10 @@
  
  /* main driver initialization routine, called from mem.c */
  
@@ -265,7 +203,7 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/
  static int __init gpio_init(void)
  {
  	int res;
-@@ -810,6 +815,13 @@
+@@ -811,6 +816,13 @@
  		return res;
  	}
  
@@ -279,18 +217,18 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.36/arch/
  	/* Clear all leds */
  #if defined (CONFIG_ETRAX_CSP0_LEDS) ||  defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
  	CRIS_LED_NETWORK_SET(0);
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S
---- linux-2.6.36.orig/arch/cris/arch-v10/lib/hw_settings.S	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/lib/hw_settings.S	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.37/arch/cris/arch-v10/lib/hw_settings.S
+--- linux-2.6.37.orig/arch/cris/arch-v10/lib/hw_settings.S	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/lib/hw_settings.S	2011-04-27 12:05:31.417662330 +0200
 @@ -58,3 +58,5 @@
  	.dword R_PORT_PB_SET
  	.dword PB_SET_VALUE
  	.dword 0 ; No more register values
 +	.ascii "ACME_PART_MAGIC" 
 +	.dword 0xdeadc0de
-diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c linux-2.6.36/arch/cris/arch-v10/mm/init.c
---- linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/arch-v10/mm/init.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/arch-v10/mm/init.c linux-2.6.37/arch/cris/arch-v10/mm/init.c
+--- linux-2.6.37.orig/arch/cris/arch-v10/mm/init.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/arch-v10/mm/init.c	2011-04-27 12:23:55.347672203 +0200
 @@ -184,6 +184,9 @@
  
  	free_area_init_node(0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
@@ -301,9 +239,21 @@ diff -Nur linux-2.6.36.orig/arch/cris/arch-v10/mm/init.c linux-2.6.36/arch/cris/
  
  /* Initialize remaps of some I/O-ports. It is important that this
   * is called before any driver is initialized.
-diff -Nur linux-2.6.36.orig/arch/cris/boot/Makefile linux-2.6.36/arch/cris/boot/Makefile
---- linux-2.6.36.orig/arch/cris/boot/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/Makefile	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/arch/cris/boot/compressed/Makefile linux-2.6.37/arch/cris/boot/compressed/Makefile
+--- linux-2.6.37.orig/arch/cris/boot/compressed/Makefile	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/boot/compressed/Makefile	2011-04-27 12:05:31.567661802 +0200
+@@ -18,7 +18,7 @@
+ OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
+ OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
+ OBJECTS= $(OBJECTS-y) $(obj)/misc.o
+-OBJCOPYFLAGS = -O binary --remove-section=.bss
++#OBJCOPYFLAGS = -O binary --remove-section=.bss
+ 
+ quiet_cmd_image = BUILD   $@
+ cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
+diff -Nur linux-2.6.37.orig/arch/cris/boot/Makefile linux-2.6.37/arch/cris/boot/Makefile
+--- linux-2.6.37.orig/arch/cris/boot/Makefile	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/boot/Makefile	2011-04-27 12:05:31.527662141 +0200
 @@ -5,7 +5,7 @@
  objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
  objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss --remove-section=.note.gnu.build-id
@@ -321,22 +271,80 @@ diff -Nur linux-2.6.36.orig/arch/cris/boot/Makefile linux-2.6.36/arch/cris/boot/
  
  $(obj)/zImage:  $(obj)/compressed/vmlinux
  	@cp $< $@
-diff -Nur linux-2.6.36.orig/arch/cris/boot/compressed/Makefile linux-2.6.36/arch/cris/boot/compressed/Makefile
---- linux-2.6.36.orig/arch/cris/boot/compressed/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/boot/compressed/Makefile	2010-12-28 20:35:00.000000000 +0100
-@@ -18,7 +18,7 @@
- OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
- OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
- OBJECTS= $(OBJECTS-y) $(obj)/misc.o
--OBJCOPYFLAGS = -O binary --remove-section=.bss
-+#OBJCOPYFLAGS = -O binary --remove-section=.bss
+diff -Nur linux-2.6.37.orig/arch/cris/Kconfig linux-2.6.37/arch/cris/Kconfig
+--- linux-2.6.37.orig/arch/cris/Kconfig	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/Kconfig	2011-04-27 12:05:31.187667361 +0200
+@@ -170,6 +170,12 @@
+ 	help
+ 	  Size of DRAM (decimal in MB) typically 2, 8 or 16.
  
- quiet_cmd_image = BUILD   $@
- cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-diff -Nur linux-2.6.36.orig/arch/cris/mm/init.c linux-2.6.36/arch/cris/mm/init.c
---- linux-2.6.36.orig/arch/cris/mm/init.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/cris/mm/init.c	2010-12-28 20:35:11.000000000 +0100
-@@ -81,3 +81,10 @@
++config ETRAX_MTD_SIZE
++	hex "MTD size (hex)"
++	default "0x00800000"
++	help
++	  Size of MTD device typically 4 or 8 MB.
++
+ config ETRAX_VMEM_SIZE
+        int "Video memory size (dec, in MB)"
+        depends on ETRAX_ARCH_V32 && !ETRAXFS
+@@ -275,7 +281,7 @@
+ 	select MTD_CFI_AMDSTD
+ 	select MTD_JEDECPROBE if ETRAX_ARCH_V32
+ 	select MTD_CHAR
+-	select MTD_BLOCK
++	select MTD_BLOCK_RO
+ 	select MTD_PARTITIONS
+ 	select MTD_CONCAT
+ 	select MTD_COMPLEX_MAPPINGS
+@@ -664,6 +670,11 @@
+ 
+ source "drivers/ide/Kconfig"
+ 
++#mysteriously part of this standard linux driver was removed from cris build! - info@crisos.org  
++source "drivers/scsi/Kconfig"
++
++source "drivers/media/Kconfig"
++
+ source "drivers/net/Kconfig"
+ 
+ source "drivers/i2c/Kconfig"
+@@ -679,6 +690,8 @@
+ 
+ source "fs/Kconfig"
+ 
++source "sound/Kconfig"
++
+ source "drivers/usb/Kconfig"
+ 
+ source "drivers/uwb/Kconfig"
+diff -Nur linux-2.6.37.orig/arch/cris/Makefile linux-2.6.37/arch/cris/Makefile
+--- linux-2.6.37.orig/arch/cris/Makefile	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/Makefile	2011-04-27 12:05:31.217662105 +0200
+@@ -40,10 +40,10 @@
+ 
+ LD = $(CROSS_COMPILE)ld -mcrislinux
+ 
+-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
++OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
+ 
+ KBUILD_AFLAGS += -mlinux -march=$(arch-y) $(inc)
+-KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe $(inc)
++KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -fno-peephole2 $(inc)
+ KBUILD_CPPFLAGS += $(inc)
+ 
+ ifdef CONFIG_FRAME_POINTER
+diff -Nur linux-2.6.37.orig/arch/cris/mm/init.c linux-2.6.37/arch/cris/mm/init.c
+--- linux-2.6.37.orig/arch/cris/mm/init.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/arch/cris/mm/init.c	2011-04-27 12:23:46.628914539 +0200
+@@ -16,6 +16,7 @@
+ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+ 
+ unsigned long empty_zero_page;
++EXPORT_SYMBOL(empty_zero_page);
+ 
+ extern char _stext, _edata, _etext; /* From linkerscript */
+ extern char __init_begin, __init_end;
+@@ -81,3 +82,10 @@
          printk (KERN_INFO "Freeing unused kernel memory: %luk freed\n",
  		(unsigned long)((&__init_end - &__init_begin) >> 10));
  }
@@ -347,9 +355,9 @@ diff -Nur linux-2.6.36.orig/arch/cris/mm/init.c linux-2.6.36/arch/cris/mm/init.c
 +	return 0;
 +}
 +#endif
-diff -Nur linux-2.6.36.orig/drivers/net/cris/eth_v10.c linux-2.6.36/drivers/net/cris/eth_v10.c
---- linux-2.6.36.orig/drivers/net/cris/eth_v10.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/net/cris/eth_v10.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/net/cris/eth_v10.c linux-2.6.37/drivers/net/cris/eth_v10.c
+--- linux-2.6.37.orig/drivers/net/cris/eth_v10.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/net/cris/eth_v10.c	2011-04-27 12:05:31.647661894 +0200
 @@ -1718,7 +1718,7 @@
  static void
  e100_netpoll(struct net_device* netdev)
@@ -359,9 +367,9 @@ diff -Nur linux-2.6.36.orig/drivers/net/cris/eth_v10.c linux-2.6.36/drivers/net/
  }
  #endif
  
-diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial/crisv10.c
---- linux-2.6.36.orig/drivers/serial/crisv10.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/serial/crisv10.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/serial/crisv10.c linux-2.6.37/drivers/serial/crisv10.c
+--- linux-2.6.37.orig/drivers/serial/crisv10.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/serial/crisv10.c	2011-04-27 12:05:31.657662263 +0200
 @@ -13,6 +13,7 @@
  #include <linux/errno.h>
  #include <linux/signal.h>
@@ -370,7 +378,7 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
  #include <linux/timer.h>
  #include <linux/interrupt.h>
  #include <linux/tty.h>
-@@ -27,6 +28,7 @@
+@@ -26,6 +27,7 @@
  #include <linux/kernel.h>
  #include <linux/mutex.h>
  #include <linux/bitops.h>
@@ -378,7 +386,7 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
  #include <linux/seq_file.h>
  #include <linux/delay.h>
  #include <linux/module.h>
-@@ -4426,6 +4428,7 @@
+@@ -4431,6 +4433,7 @@
  #endif
  };
  
@@ -386,7 +394,7 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
  static int __init rs_init(void)
  {
  	int i;
-@@ -4559,6 +4562,24 @@
+@@ -4565,6 +4568,24 @@
  #endif
  #endif /* CONFIG_SVINTO_SIM */
  
@@ -411,30 +419,9 @@ diff -Nur linux-2.6.36.orig/drivers/serial/crisv10.c linux-2.6.36/drivers/serial
  	return 0;
  }
  
-diff -Nur linux-2.6.36.orig/drivers/usb/Makefile linux-2.6.36/drivers/usb/Makefile
---- linux-2.6.36.orig/drivers/usb/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/Makefile	2010-12-28 20:35:00.000000000 +0100
-@@ -21,6 +21,7 @@
- obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
- obj-$(CONFIG_USB_HWA_HCD)	+= host/
- obj-$(CONFIG_USB_ISP1760_HCD)	+= host/
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= host/
- obj-$(CONFIG_USB_IMX21_HCD)	+= host/
- 
- obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00/
-diff -Nur linux-2.6.36.orig/drivers/usb/host/Makefile linux-2.6.36/drivers/usb/host/Makefile
---- linux-2.6.36.orig/drivers/usb/host/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/usb/host/Makefile	2010-12-28 20:35:00.000000000 +0100
-@@ -32,5 +32,6 @@
- obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
- obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
- obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o
-+obj-$(CONFIG_ETRAX_USB_HOST)	+= hc-crisv10.o
- obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o
- 
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.36/drivers/usb/host/hc-cris-dbg.h
---- linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-cris-dbg.h	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.37/drivers/usb/host/hc-cris-dbg.h
+--- linux-2.6.37.orig/drivers/usb/host/hc-cris-dbg.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/hc-cris-dbg.h	2011-04-27 12:05:31.847661851 +0200
 @@ -0,0 +1,146 @@
 +
 +/* macros for debug output */
@@ -582,9 +569,9 @@ diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-cris-dbg.h linux-2.6.36/drivers/
 +		};							\
 +		s;							\
 +	})
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c linux-2.6.36/drivers/usb/host/hc-crisv10.c
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/hc-crisv10.c linux-2.6.37/drivers/usb/host/hc-crisv10.c
+--- linux-2.6.37.orig/drivers/usb/host/hc-crisv10.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/hc-crisv10.c	2011-04-27 12:05:31.867662137 +0200
 @@ -0,0 +1,4801 @@
 +/*
 + *
@@ -5387,9 +5374,9 @@ diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.c linux-2.6.36/drivers/u
 +/* Module hooks */
 +module_init(module_hcd_init);
 +module_exit(module_hcd_exit);
-diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h linux-2.6.36/drivers/usb/host/hc-crisv10.h
---- linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36/drivers/usb/host/hc-crisv10.h	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/hc-crisv10.h linux-2.6.37/drivers/usb/host/hc-crisv10.h
+--- linux-2.6.37.orig/drivers/usb/host/hc-crisv10.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/hc-crisv10.h	2011-04-27 12:05:31.917663433 +0200
 @@ -0,0 +1,331 @@
 +#ifndef __LINUX_ETRAX_USB_H
 +#define __LINUX_ETRAX_USB_H
@@ -5722,9 +5709,31 @@ diff -Nur linux-2.6.36.orig/drivers/usb/host/hc-crisv10.h linux-2.6.36/drivers/u
 +#define USB_SB_command__full__yes       1
 +
 +#endif
-diff -Nur linux-2.6.36.orig/lib/klist.c linux-2.6.36/lib/klist.c
---- linux-2.6.36.orig/lib/klist.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/lib/klist.c	2010-12-28 20:35:00.000000000 +0100
+diff -Nur linux-2.6.37.orig/drivers/usb/host/Makefile linux-2.6.37/drivers/usb/host/Makefile
+--- linux-2.6.37.orig/drivers/usb/host/Makefile	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/usb/host/Makefile	2011-04-27 12:05:31.787668204 +0200
+@@ -32,6 +32,7 @@
+ obj-$(CONFIG_USB_R8A66597_HCD)	+= r8a66597-hcd.o
+ obj-$(CONFIG_USB_ISP1760_HCD)	+= isp1760.o
+ obj-$(CONFIG_USB_HWA_HCD)	+= hwa-hc.o
++obj-$(CONFIG_ETRAX_USB_HOST)	+= hc-crisv10.o
+ obj-$(CONFIG_USB_IMX21_HCD)	+= imx21-hcd.o
+ obj-$(CONFIG_USB_FSL_MPH_DR_OF)	+= fsl-mph-dr-of.o
+ obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
+diff -Nur linux-2.6.37.orig/drivers/usb/Makefile linux-2.6.37/drivers/usb/Makefile
+--- linux-2.6.37.orig/drivers/usb/Makefile	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/drivers/usb/Makefile	2011-04-27 12:05:31.717665249 +0200
+@@ -21,6 +21,7 @@
+ obj-$(CONFIG_USB_R8A66597_HCD)	+= host/
+ obj-$(CONFIG_USB_HWA_HCD)	+= host/
+ obj-$(CONFIG_USB_ISP1760_HCD)	+= host/
++obj-$(CONFIG_ETRAX_USB_HOST)	+= host/
+ obj-$(CONFIG_USB_IMX21_HCD)	+= host/
+ 
+ obj-$(CONFIG_USB_C67X00_HCD)	+= c67x00/
+diff -Nur linux-2.6.37.orig/lib/klist.c linux-2.6.37/lib/klist.c
+--- linux-2.6.37.orig/lib/klist.c	2011-01-05 01:50:19.000000000 +0100
++++ linux-2.6.37/lib/klist.c	2011-04-27 12:05:31.967661872 +0200
 @@ -60,7 +60,7 @@
  {
  	knode->n_klist = klist;