upgrade all targets to Linux 2.6.34

2 files changed, 20 insertions, 87 deletions

diff --git a/target/ag241/patches/ar7.patch b/target/ag241/patches/ar7.patch
index 7fe9f03c0..dcaaa2ec7 100644
--- a/target/ag241/patches/ar7.patch
+++ b/target/ag241/patches/ar7.patch
@@ -1,29 +1,8 @@
-diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/platform.c linux-2.6.33.1/arch/mips/ar7/platform.c
---- linux-2.6.33.1.orig/arch/mips/ar7/platform.c	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/arch/mips/ar7/platform.c	2010-03-28 19:26:53.000000000 +0200
-@@ -509,7 +509,7 @@
- 
- 	memset(uart_port, 0, sizeof(struct uart_port) * 2);
- 
--	uart_port[0].type = PORT_16550A;
-+	uart_port[0].type = PORT_AR7;
- 	uart_port[0].line = 0;
- 	uart_port[0].irq = AR7_IRQ_UART0;
- 	uart_port[0].uartclk = ar7_bus_freq() / 2;
-@@ -524,7 +524,7 @@
- 
- 	/* Only TNETD73xx have a second serial port */
- 	if (ar7_has_second_uart()) {
--		uart_port[1].type = PORT_16550A;
-+		uart_port[1].type = PORT_AR7;
- 		uart_port[1].line = 1;
- 		uart_port[1].irq = AR7_IRQ_UART1;
- 		uart_port[1].uartclk = ar7_bus_freq() / 2;
-diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/prom.c linux-2.6.33.1/arch/mips/ar7/prom.c
---- linux-2.6.33.1.orig/arch/mips/ar7/prom.c	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/arch/mips/ar7/prom.c	2010-03-28 19:26:53.000000000 +0200
-@@ -219,6 +219,14 @@
- 	if (strstr(prom_getcmdline(), "console="))
+diff -Nur linux-2.6.34.orig/arch/mips/ar7/prom.c linux-2.6.34/arch/mips/ar7/prom.c
+--- linux-2.6.34.orig/arch/mips/ar7/prom.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/mips/ar7/prom.c	2010-05-28 15:52:26.960965976 +0200
+@@ -206,6 +206,14 @@
+ 	if (strstr(arcs_cmdline, "console="))
  		return;
  
 +#ifdef CONFIG_KGDB
@@ -37,26 +16,9 @@ diff -Nur linux-2.6.33.1.orig/arch/mips/ar7/prom.c linux-2.6.33.1/arch/mips/ar7/
  	s = prom_getenv("modetty0");
  	if (s) {
  		baud = simple_strtoul(s, &p, 10);
-diff -Nur linux-2.6.33.1.orig/arch/mips/include/asm/page.h linux-2.6.33.1/arch/mips/include/asm/page.h
---- linux-2.6.33.1.orig/arch/mips/include/asm/page.h	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/arch/mips/include/asm/page.h	2010-03-28 19:26:53.000000000 +0200
-@@ -200,8 +200,11 @@
- #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
- 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
--#define UNCAC_ADDR(addr)	((addr) - PAGE_OFFSET + UNCAC_BASE)
--#define CAC_ADDR(addr)		((addr) - UNCAC_BASE + PAGE_OFFSET)
-+#define UNCAC_ADDR(addr)       ((addr) - PAGE_OFFSET + UNCAC_BASE +    \
-+                                PHYS_OFFSET)
-+#define CAC_ADDR(addr)         ((addr) - UNCAC_BASE + PAGE_OFFSET -    \
-+                                PHYS_OFFSET)
-+
- 
- #include <asm-generic/memory_model.h>
- #include <asm-generic/getorder.h>
-diff -Nur linux-2.6.33.1.orig/arch/mips/Kconfig linux-2.6.33.1/arch/mips/Kconfig
---- linux-2.6.33.1.orig/arch/mips/Kconfig	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/arch/mips/Kconfig	2010-03-28 19:26:53.000000000 +0200
+diff -Nur linux-2.6.34.orig/arch/mips/Kconfig linux-2.6.34/arch/mips/Kconfig
+--- linux-2.6.34.orig/arch/mips/Kconfig	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/mips/Kconfig	2010-05-28 15:52:27.142223192 +0200
 @@ -34,7 +34,6 @@
  	select CEVT_R4K
  	select CSRC_R4K
@@ -65,38 +27,9 @@ diff -Nur linux-2.6.33.1.orig/arch/mips/Kconfig linux-2.6.33.1/arch/mips/Kconfig
  	select SWAP_IO_SPACE
  	select SYS_HAS_CPU_MIPS32_R1
  	select SYS_HAS_EARLY_PRINTK
-diff -Nur linux-2.6.33.1.orig/arch/mips/kernel/traps.c linux-2.6.33.1/arch/mips/kernel/traps.c
---- linux-2.6.33.1.orig/arch/mips/kernel/traps.c	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/arch/mips/kernel/traps.c	2010-03-28 19:26:53.000000000 +0200
-@@ -1283,9 +1283,22 @@
- 
- 	exception_handlers[n] = handler;
- 	if (n == 0 && cpu_has_divec) {
--		*(u32 *)(ebase + 0x200) = 0x08000000 |
--					  (0x03ffffff & (handler >> 2));
--		local_flush_icache_range(ebase + 0x200, ebase + 0x204);
-+              if ((handler ^ (ebase + 4)) & 0xfc000000) {
-+                      /* lui k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
-+                      /* ori k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x204) =
-+                                      0x375a0000 | (handler & 0xffff);
-+                      /* jr k0 */
-+                      *(u32 *)(ebase + 0x208) = 0x03400008;
-+                      /* nop */
-+                      *(u32 *)(ebase + 0x20C) = 0x00000000;
-+                      flush_icache_range(ebase + 0x200, ebase + 0x210);
-+              } else {
-+                      *(u32 *)(ebase + 0x200) =
-+                              0x08000000 | (0x03ffffff & (handler >> 2));
-+                      flush_icache_range(ebase + 0x200, ebase + 0x204);
-+              }
- 	}
- 	return (void *)old_handler;
- }
-diff -Nur linux-2.6.33.1.orig/drivers/mtd/ar7part.c linux-2.6.33.1/drivers/mtd/ar7part.c
---- linux-2.6.33.1.orig/drivers/mtd/ar7part.c	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/drivers/mtd/ar7part.c	2010-03-28 19:26:53.000000000 +0200
+diff -Nur linux-2.6.34.orig/drivers/mtd/ar7part.c linux-2.6.34/drivers/mtd/ar7part.c
+--- linux-2.6.34.orig/drivers/mtd/ar7part.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/drivers/mtd/ar7part.c	2010-05-28 15:52:27.232223555 +0200
 @@ -28,7 +28,7 @@
  #include <linux/bootmem.h>
  #include <linux/magic.h>
@@ -128,9 +61,9 @@ diff -Nur linux-2.6.33.1.orig/drivers/mtd/ar7part.c linux-2.6.33.1/drivers/mtd/a
  	*pparts = ar7_parts;
  	return AR7_PARTS;
  }
-diff -Nur linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c linux-2.6.33.1/drivers/mtd/maps/physmap.c
---- linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/drivers/mtd/maps/physmap.c	2010-03-28 19:26:53.000000000 +0200
+diff -Nur linux-2.6.34.orig/drivers/mtd/maps/physmap.c linux-2.6.34/drivers/mtd/maps/physmap.c
+--- linux-2.6.34.orig/drivers/mtd/maps/physmap.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/drivers/mtd/maps/physmap.c	2010-05-28 15:52:27.281073432 +0200
 @@ -79,7 +79,7 @@
  					"map_rom",
  					NULL };
@@ -140,10 +73,10 @@ diff -Nur linux-2.6.33.1.orig/drivers/mtd/maps/physmap.c linux-2.6.33.1/drivers/
  #endif
  
  static int physmap_flash_probe(struct platform_device *dev)
-diff -Nur linux-2.6.33.1.orig/drivers/serial/8250.c linux-2.6.33.1/drivers/serial/8250.c
---- linux-2.6.33.1.orig/drivers/serial/8250.c	2010-03-15 17:09:39.000000000 +0100
-+++ linux-2.6.33.1/drivers/serial/8250.c	2010-03-28 19:26:53.000000000 +0200
-@@ -2715,7 +2715,11 @@
+diff -Nur linux-2.6.34.orig/drivers/serial/8250.c linux-2.6.34/drivers/serial/8250.c
+--- linux-2.6.34.orig/drivers/serial/8250.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/drivers/serial/8250.c	2010-05-28 15:52:27.330968429 +0200
+@@ -2746,7 +2746,11 @@
  {
  	struct uart_8250_port *up = (struct uart_8250_port *)port;
  
diff --git a/target/ag241/target.mk b/target/ag241/target.mk
index 3bb051ea2..90a85803e 100644
--- a/target/ag241/target.mk
+++ b/target/ag241/target.mk
@@ -1,7 +1,7 @@
 ARCH:=			mips
 CPU_ARCH:=		mipsel
-KERNEL_VERSION:=	2.6.33.1
+KERNEL_VERSION:=	2.6.34
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		73b514ec918b88a45656be191b1ee226
+KERNEL_MD5SUM:=		10eebcb0178fb4540e2165bfd7efc7ad
 TARGET_OPTIMIZATION:=	-Os -pipe
 TARGET_CFLAGS_ARCH:=    -march=mips32