Upgrade brcm63xx to 2.6.24

SVN-Revision: 10455

5 files changed, 128 insertions, 427 deletions

diff --git a/target/linux/brcm63xx/patches/001-bcm963xx.patch b/target/linux/brcm63xx/patches/001-bcm963xx.patch
index f85ceb9c8d..728d5ba546 100644
--- a/target/linux/brcm63xx/patches/001-bcm963xx.patch
+++ b/target/linux/brcm63xx/patches/001-bcm963xx.patch
@@ -1,119 +1,75 @@
-diff -urN linux-2.6.19/arch/mips/Kconfig linux-2.6.19.new/arch/mips/Kconfig
---- linux-2.6.19/arch/mips/Kconfig	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/mips/Kconfig	2006-12-16 18:46:31.000000000 +0100
-@@ -4,6 +4,10 @@
- 	# Horrible source of confusion.  Die, die, die ...
- 	select EMBEDDED
- 
-+config CFE
-+       bool
-+       # Common Firmware Environment
-+
- mainmenu "Linux/MIPS Kernel Configuration"
- 
- menu "Machine selection"
-@@ -15,6 +15,18 @@
- 	prompt "System type"
- 	default SGI_IP22
- 
-+config BCM963XX 
-+	bool "Support for Broadcom BCM963xx SoC"
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select SYS_SUPPORTS_BIG_ENDIAN
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select HW_HAS_PCI
-+	select DMA_NONCOHERENT
-+	select IRQ_CPU
-+	select CFE
-+	help
-+	 This is a fmaily of boards based on the Broadcom MIPS32
-+
- config MACH_ALCHEMY
- 	bool "Alchemy processor based machines"
- 
-diff -urN linux-2.6.19/arch/mips/Makefile linux-2.6.19.new/arch/mips/Makefile
---- linux-2.6.19/arch/mips/Makefile	2006-12-16 17:36:29.000000000 +0100
-+++ linux-2.6.19.new/arch/mips/Makefile	2006-12-16 18:46:31.000000000 +0100
-@@ -158,6 +158,19 @@
- #
- 
- #
-+# Broadcom BCM963xx SoC
-+#
-+core-$(CONFIG_BCM963XX)	+= arch/mips/bcm963xx/
-+cflags-$(CONFIG_BCM963XX)     	+= -Iinclude/asm-mips/mach-bcm963xx
-+load-$(CONFIG_BCM963XX)	+= 0xffffffff80010000
+diff -urN linux-2.6.24/arch/mips/Kconfig linux-2.6.24.new/arch/mips/Kconfig
+--- linux-2.6.24/arch/mips/Kconfig	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/mips/Kconfig	2008-02-13 16:20:49.000000000 +0100
+@@ -67,6 +67,17 @@
+ 	help
+ 	 Support for BCM47XX based boards
+ 
++config BCM963XX
++       bool "Support for Broadcom BCM963xx SoC"
++       select SYS_SUPPORTS_32BIT_KERNEL
++       select SYS_SUPPORTS_BIG_ENDIAN
++       select SYS_HAS_CPU_MIPS32_R1
++       select HW_HAS_PCI
++       select DMA_NONCOHERENT
++       select IRQ_CPU
++       help
++         This is a fmaily of boards based on the Broadcom MIPS32
 +
-+
-+#
-+# Common Firmware Environment
-+#
-+core-$(CONFIG_CFE)             += arch/mips/cfe/
-+
-+#
- # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
- #
- core-$(CONFIG_MACH_JAZZ)	+= arch/mips/jazz/
-diff -urN linux-2.6.19/arch/mips/kernel/cpu-probe.c linux-2.6.19.new/arch/mips/kernel/cpu-probe.c
---- linux-2.6.19/arch/mips/kernel/cpu-probe.c	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/mips/kernel/cpu-probe.c	2006-12-16 18:46:31.000000000 +0100
-@@ -590,6 +590,28 @@
- 		return;
- }
- 
-+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
-+{
-+       decode_configs(c);
-+       switch (c->processor_id & 0xff00) {
-+       case PRID_IMP_BCM6338:
-+               c->cputype = CPU_BCM6338;
-+               break;
-+       case PRID_IMP_BCM6345:
-+               c->cputype = CPU_BCM6345;
-+               break;
-+       case PRID_IMP_BCM6348:
-+               c->cputype = CPU_BCM6348;
-+               break;
+ config MIPS_COBALT
+ 	bool "Cobalt Server"
+ 	select CEVT_R4K
+diff -urN linux-2.6.24/arch/mips/kernel/cpu-probe.c linux-2.6.24.new/arch/mips/kernel/cpu-probe.c
+--- linux-2.6.24/arch/mips/kernel/cpu-probe.c	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/mips/kernel/cpu-probe.c	2008-02-13 16:23:21.000000000 +0100
+@@ -796,6 +796,18 @@
+ 	case PRID_IMP_BCM4710:
+ 		c->cputype = CPU_BCM4710;
+ 		break;
++//	case PRID_IMP_BCM6338:
++//		c->cputype = CPU_BCM6338;
++//		break;
++	case PRID_IMP_BCM6345:
++		c->cputype = CPU_BCM6345;
++		break;
++	case PRID_IMP_BCM6348:
++		c->cputype = CPU_BCM6348;
++		break;
 +	case PRID_IMP_BCM6358:
 +		c->cputype = CPU_BCM6358;
 +		break;
-+       default:
-+               c->cputype = CPU_UNKNOWN;
-+               break;
-+       }
-+}
-+
- static inline void cpu_probe_mips(struct cpuinfo_mips *c)
- {
- 	decode_configs(c);
-@@ -724,6 +743,9 @@
- 	case PRID_COMP_LEGACY:
- 		cpu_probe_legacy(c);
+ 	default:
+ 		c->cputype = CPU_UNKNOWN;
  		break;
-+        case PRID_COMP_BROADCOM:
-+                cpu_probe_broadcom(c);
-+                break;
- 	case PRID_COMP_MIPS:
- 		cpu_probe_mips(c);
- 		break;
-diff -urN linux-2.6.19/arch/mips/kernel/proc.c linux-2.6.19.new/arch/mips/kernel/proc.c
---- linux-2.6.19/arch/mips/kernel/proc.c	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/mips/kernel/proc.c	2006-12-16 18:46:31.000000000 +0100
-@@ -84,6 +84,10 @@
- 	[CPU_VR4181A]	= "NEC VR4181A",
- 	[CPU_SR71000]	= "Sandcraft SR71000",
- 	[CPU_PR4450]	= "Philips PR4450",
-+	[CPU_BCM6338]   = "BCM6338",
-+	[CPU_BCM6345]   = "BCM6345",
-+	[CPU_BCM6348]   = "BCM6348",
-+	[CPU_BCM6358]	= "BCM6358",
- };
- 
- 
-diff -urN linux-2.6.19/arch/mips/mm/c-r4k.c linux-2.6.19.new/arch/mips/mm/c-r4k.c
---- linux-2.6.19/arch/mips/mm/c-r4k.c	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/mips/mm/c-r4k.c	2006-12-16 18:46:31.000000000 +0100
-@@ -852,6 +852,13 @@
+@@ -878,6 +890,10 @@
+ 	case CPU_SR71000:	name = "Sandcraft SR71000"; break;
+ 	case CPU_BCM3302:	name = "Broadcom BCM3302"; break;
+ 	case CPU_BCM4710:	name = "Broadcom BCM4710"; break;
++	case CPU_BCM6338:	name = "Broadcom BCM6338"; break;
++	case CPU_BCM6345:	name = "Broadcom BCM6345"; break;
++	case CPU_BCM6348:	name = "Broadcom BCM6348"; break;
++	case CPU_BCM6358:	name = "Broadcom BCM6358"; break;
+ 	case CPU_PR4450:	name = "Philips PR4450"; break;
+ 	case CPU_LOONGSON2:	name = "ICT Loongson-2"; break;
+ 	default:
+diff -urN linux-2.6.24/arch/mips/Makefile linux-2.6.24.new/arch/mips/Makefile
+--- linux-2.6.24/arch/mips/Makefile	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/mips/Makefile	2008-02-13 16:21:21.000000000 +0100
+@@ -543,6 +543,10 @@
+ cflags-$(CONFIG_BCM47XX)	+= -Iinclude/asm-mips/mach-bcm47xx
+ load-$(CONFIG_BCM47XX)		:= 0xffffffff80001000
+ 
++core-$(CONFIG_BCM963XX)		+= arch/mips/bcm963xx/
++cflags-$(CONFIG_BCM963XX)	+= -Iinclude/asm-mips/mach-bcm963xx
++load-$(CONFIG_BCM963XX)		:= 0xffffffff8001000
++
+ #
+ # SNI RM
+ #
+diff -urN linux-2.6.24/arch/mips/mm/c-r4k.c linux-2.6.24.new/arch/mips/mm/c-r4k.c
+--- linux-2.6.24/arch/mips/mm/c-r4k.c	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/mips/mm/c-r4k.c	2008-02-13 16:24:29.000000000 +0100
+@@ -878,6 +878,13 @@
  		if (!(config & MIPS_CONF_M))
  			panic("Don't know how to probe P-caches on this cpu.");
  
@@ -127,96 +83,63 @@ diff -urN linux-2.6.19/arch/mips/mm/c-r4k.c linux-2.6.19.new/arch/mips/mm/c-r4k.
  		/*
  		 * So we seem to be a MIPS32 or MIPS64 CPU
  		 * So let's probe the I-cache ...
-diff -urN linux-2.6.19/arch/mips/mm/tlbex.c linux-2.6.19.new/arch/mips/mm/tlbex.c
---- linux-2.6.19/arch/mips/mm/tlbex.c	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/mips/mm/tlbex.c	2006-12-16 18:46:31.000000000 +0100
-@@ -892,6 +892,10 @@
- 	case CPU_4KSC:
- 	case CPU_20KC:
+diff -urN linux-2.6.24/arch/mips/mm/tlbex.c linux-2.6.24.new/arch/mips/mm/tlbex.c
+--- linux-2.6.24/arch/mips/mm/tlbex.c	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/mips/mm/tlbex.c	2008-02-13 16:25:08.000000000 +0100
+@@ -910,6 +910,10 @@
  	case CPU_25KF:
-+	case CPU_BCM6338:
+ 	case CPU_BCM3302:
+ 	case CPU_BCM4710:
++//	case CPU_BCM6338:
 +	case CPU_BCM6345:
 +	case CPU_BCM6348:
 +	case CPU_BCM6358:
- 		tlbw(p);
- 		break;
- 
-diff -urN linux-2.6.19/arch/mips/pci/Makefile linux-2.6.19.new/arch/mips/pci/Makefile
---- linux-2.6.19/arch/mips/pci/Makefile	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/arch/mips/pci/Makefile	2006-12-16 18:48:18.000000000 +0100
-@@ -16,6 +16,7 @@
- obj-$(CONFIG_PCI_VR41XX)	+= ops-vr41xx.o pci-vr41xx.o
- obj-$(CONFIG_NEC_CMBVR4133)	+= fixup-vr4133.o
- obj-$(CONFIG_MARKEINS)		+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
+ 	case CPU_LOONGSON2:
+ 		if (m4kc_tlbp_war())
+ 			i_nop(p);
+diff -urN linux-2.6.24/arch/mips/pci/Makefile linux-2.6.24.new/arch/mips/pci/Makefile
+--- linux-2.6.24/arch/mips/pci/Makefile	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/arch/mips/pci/Makefile	2008-02-13 16:27:33.000000000 +0100
+@@ -48,3 +48,4 @@
+ obj-$(CONFIG_VICTOR_MPC30X)	+= fixup-mpc30x.o
+ obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o
+ obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o
 +obj-$(CONFIG_BCM963XX)		+= fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o
+diff -urN linux-2.6.24/include/asm-mips/bootinfo.h linux-2.6.24.new/include/asm-mips/bootinfo.h
+--- linux-2.6.24/include/asm-mips/bootinfo.h	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/include/asm-mips/bootinfo.h	2008-02-13 16:26:05.000000000 +0100
+@@ -197,6 +197,10 @@
+  */
+ #define MACH_GROUP_BRCM		23	/* Broadcom			*/
+ #define  MACH_BCM47XX		1	/* Broadcom BCM47XX		*/
++#define  MACH_BCM96338          2
++#define  MACH_BCM96345          3
++#define  MACH_BCM96348          4
++#define  MACH_BCM96358          5
  
- #
- # These are still pretty much in the old state, watch, go blind.
-diff -urN linux-2.6.19/include/asm-mips/bootinfo.h linux-2.6.19.new/include/asm-mips/bootinfo.h
---- linux-2.6.19/include/asm-mips/bootinfo.h	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/include/asm-mips/bootinfo.h	2006-12-16 18:46:31.000000000 +0100
-@@ -213,6 +213,15 @@
- #define MACH_GROUP_NEC_EMMA2RH 25	/* NEC EMMA2RH (was 23)		*/
- #define  MACH_NEC_MARKEINS	0	/* NEC EMMA2RH Mark-eins	*/
- 
-+/*
-+ * Valid machtype for group BRCM
-+ */
-+#define MACH_GROUP_BRCM        23      /* Broadcom boards              */
-+#define MACH_BCM96338          0
-+#define MACH_BCM96345          1
-+#define MACH_BCM96348          2
-+#define MACH_BCM96358		3
-+
  #define CL_SIZE			COMMAND_LINE_SIZE
  
- const char *get_system_type(void);
-diff -urN linux-2.6.19/include/asm-mips/cpu.h linux-2.6.19.new/include/asm-mips/cpu.h
---- linux-2.6.19/include/asm-mips/cpu.h	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/include/asm-mips/cpu.h	2006-12-16 18:46:31.000000000 +0100
-@@ -103,6 +103,14 @@
+diff -urN linux-2.6.24/include/asm-mips/cpu.h linux-2.6.24.new/include/asm-mips/cpu.h
+--- linux-2.6.24/include/asm-mips/cpu.h	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/include/asm-mips/cpu.h	2008-02-13 16:27:13.000000000 +0100
+@@ -111,6 +111,10 @@
  
- #define PRID_IMP_SR71000        0x0400
+ #define PRID_IMP_BCM4710	0x4000
+ #define PRID_IMP_BCM3302	0x9000
++//#define PRID_IMP_BCM6338        0x9000
++#define PRID_IMP_BCM6345        0x8000
++#define PRID_IMP_BCM6348        0x9100
++#define PRID_IMP_BCM6358        0xA000
  
-+/* These are the PRID's for when 23:16 == PRID_COMP_BROADCOM
-+ */
-+
-+#define PRID_IMP_BCM6338       	0x9000
-+#define PRID_IMP_BCM6345       	0x8000
-+#define PRID_IMP_BCM6348       	0x9100
-+#define PRID_IMP_BCM6358		0xA000
-+
  /*
   * Definitions for 7:0 on legacy processors
-  */
-@@ -200,7 +207,11 @@
- #define CPU_SB1A		62
- #define CPU_74K			63
- #define CPU_R14000		64
--#define CPU_LAST		64
-+#define CPU_BCM6338             65
-+#define CPU_BCM6345             66
-+#define CPU_BCM6348             67
-+#define CPU_BCM6358		 68	
-+#define CPU_LAST		68
- 
- /*
-  * ISA Level encodings
-diff -urN linux-2.6.19/include/asm-mips/module.h linux-2.6.19.new/include/asm-mips/module.h
---- linux-2.6.19/include/asm-mips/module.h	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/include/asm-mips/module.h	2006-12-16 19:03:22.000000000 +0100
-@@ -112,6 +112,14 @@
- #define MODULE_PROC_FAMILY "RM9000 "
- #elif defined CONFIG_CPU_SB1
- #define MODULE_PROC_FAMILY "SB1 "
-+#elif defined CONFIG_CPU_BCM6338
-+#define MODULE_PROC_FAMILY "BCM6338 "
-+#elif defined CONFIG_CPU_BCM6345
-+#define MODULE_PROC_FAMILY "BCM6345 "
-+#elif defined CONFIG_CPU_BCM6348
-+#define MODULE_PROC_FAMILY "BCM6348 "
-+#elif defined CONFIG_CPU_BCM6358
-+#define MODULE_PROC_FAMILY "BCM6358 "
- #else
- #error MODULE_PROC_FAMILY undefined for your processor configuration
- #endif
+@@ -196,7 +200,8 @@
+ 	 */
+ 	CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,
+ 	CPU_AU1100, CPU_AU1200, CPU_AU1500, CPU_AU1550, CPU_PR4450,
+-	CPU_BCM3302, CPU_BCM4710,
++	CPU_BCM3302, CPU_BCM4710, CPU_BCM6338, CPU_BCM6345, CPU_BCM6348,
++	CPU_BCM6358,
+ 
+ 	/*
+ 	 * MIPS64 class processors
diff --git a/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch b/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
index 69dadf038d..2f9e92e0fd 100644
--- a/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
+++ b/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
@@ -1,8 +1,8 @@
-diff -urN linux-2.6.21.1/drivers/serial/Makefile linux-2.6.21.1.new/drivers/serial/Makefile
---- linux-2.6.21.1/drivers/serial/Makefile	2007-04-27 23:49:26.000000000 +0200
-+++ linux-2.6.21.1.new/drivers/serial/Makefile	2007-05-30 20:32:27.000000000 +0200
-@@ -62,3 +62,4 @@
- obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
+diff -urN linux-2.6.24/drivers/serial/Makefile linux-2.6.24.new/drivers/serial/Makefile
+--- linux-2.6.24/drivers/serial/Makefile	2008-02-13 16:44:47.000000000 +0100
++++ linux-2.6.24.new/drivers/serial/Makefile	2008-02-13 16:45:12.000000000 +0100
+@@ -65,3 +65,4 @@
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
+ obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 +obj-$(CONFIG_BCM963XX) += bcm63xx_cons.o
diff --git a/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
index 08c91bea1b..3884dc1ce1 100644
--- a/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
@@ -15,14 +15,6 @@ diff -urN linux-2.6.19/drivers/mtd/maps/Kconfig linux-2.6.19.new/drivers/mtd/map
  config MTD_DILNETPC
  	tristate "CFI Flash device mapped on DIL/Net PC"
  	depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
-diff -urN linux-2.6.19/drivers/mtd/maps/Makefile linux-2.6.19.new/drivers/mtd/maps/Makefile
---- linux-2.6.19/drivers/mtd/maps/Makefile	2006-11-29 22:57:37.000000000 +0100
-+++ linux-2.6.19.new/drivers/mtd/maps/Makefile	2006-12-18 17:21:07.000000000 +0100
-@@ -72,3 +72,4 @@
- obj-$(CONFIG_MTD_OMAP_NOR)	+= omap_nor.o
- obj-$(CONFIG_MTD_MTX1)		+= mtx-1_flash.o
- obj-$(CONFIG_MTD_TQM834x)	+= tqm834x.o
-+obj-$(CONFIG_MTD_BCM963XX)      += bcm963xx-flash.o
 diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboot.c
 --- linux-2.6.19/drivers/mtd/redboot.c	2006-12-18 17:09:14.000000000 +0100
 +++ linux-2.6.19.new/drivers/mtd/redboot.c	2006-12-18 17:14:26.000000000 +0100
@@ -61,3 +53,11 @@ diff -urN linux-2.6.19/drivers/mtd/redboot.c linux-2.6.19.new/drivers/mtd/redboo
  
  		/* I'm sure the JFFS2 code has done me permanent damage.
  		 * I now think the following is _normal_
+diff -urN linux-2.6.24/drivers/mtd/maps/Makefile linux-2.6.24.new/drivers/mtd/maps/Makefile
+--- linux-2.6.24/drivers/mtd/maps/Makefile	2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24.new/drivers/mtd/maps/Makefile	2008-02-13 16:30:02.000000000 +0100
+@@ -69,3 +69,4 @@
+ obj-$(CONFIG_MTD_OMAP_NOR)	+= omap_nor.o
+ obj-$(CONFIG_MTD_MTX1)		+= mtx-1_flash.o
+ obj-$(CONFIG_MTD_INTEL_VR_NOR)	+= intel_vr_nor.o
++obj-$(CONFIG_MTD_BCM963XX)	+= bcm963xx-flash.o
diff --git a/target/linux/brcm63xx/patches/100-atm_hacks.patch b/target/linux/brcm63xx/patches/100-atm_hacks.patch
deleted file mode 100644
index 7535c223e7..0000000000
--- a/target/linux/brcm63xx/patches/100-atm_hacks.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -urN linux-2.6.19.1/include/linux/atm.h linux-2.6.19.1.new/include/linux/atm.h
---- linux-2.6.19.1/include/linux/atm.h	2006-12-11 20:32:53.000000000 +0100
-+++ linux-2.6.19.1.new/include/linux/atm.h	2007-01-07 18:38:50.000000000 +0100
-@@ -48,6 +48,9 @@
- #define ATM_AAL2	2		/* AAL2 (VBR) */
- #define ATM_AAL34	3		/* AAL3/4 (data) */
- #define ATM_AAL5	5		/* AAL5 (data) */
-+#if defined(CONFIG_MIPS_BCM963XX)
-+#define ATM_BCM_AAL0    14              /* "raw" ATM cells */
-+#endif
- 
- /*
-  * socket option name coding functions
-diff -urN linux-2.6.19.1/include/linux/atmbr2684.h linux-2.6.19.1.new/include/linux/atmbr2684.h
---- linux-2.6.19.1/include/linux/atmbr2684.h	2006-12-11 20:32:53.000000000 +0100
-+++ linux-2.6.19.1.new/include/linux/atmbr2684.h	2007-01-07 18:24:01.000000000 +0100
-@@ -78,6 +78,10 @@
- 	__u8	vpn_id[7];
- 	int	send_padding;	/* unsupported */
- 	int	min_size;	/* we will pad smaller packets than this */
-+#if defined(CONFIG_MIPS_BCM963XX)
-+#define FILTER_PPPOE	1
-+	int	proto_filter;	/* protocol filter flag, current only PPPoE */
-+#endif
- };
- 
- /*
-diff -urN linux-2.6.19.1/include/linux/atmdev.h linux-2.6.19.1.new/include/linux/atmdev.h
---- linux-2.6.19.1/include/linux/atmdev.h	2006-12-11 20:32:53.000000000 +0100
-+++ linux-2.6.19.1.new/include/linux/atmdev.h	2007-01-07 18:37:34.000000000 +0100
-@@ -29,6 +29,10 @@
- #define ATM_DS3_PCR	(8000*12)
- 			/* DS3: 12 cells in a 125 usec time slot */
- 
-+#if defined(CONFIG_MIPS_BCM963XX)
-+#define atm_sk(__sk) ((struct atm_vcc *)(__sk)->sk_protinfo)
-+#define ATM_SD(s)      (atm_sk((s)->sk))
-+#endif
- 
- #define __AAL_STAT_ITEMS \
-     __HANDLE_ITEM(tx);			/* TX okay */ \
-@@ -111,6 +115,9 @@
- #define ATM_BACKEND_RAW		0	
- #define ATM_BACKEND_PPP		1	/* PPPoATM - RFC2364 */
- #define ATM_BACKEND_BR2684	2	/* Bridged RFC1483/2684 */
-+#if defined(CONFIG_MIPS_BCM963XX)
-+#define ATM_BACKEND_RT2684      3       /* Routed RFC1483/2684 */
-+#endif
- 
- /* for ATM_GETTYPE */
- #define ATM_ITFTYP_LEN	8	/* maximum length of interface type name */
-@@ -274,6 +281,9 @@
- 
- 
- enum {
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	ATM_DF_CLOSE,           /* close device when last VCC is closed */
-+#endif
- 	ATM_DF_REMOVED,		/* device was removed from atm_devs list */
- };
- 
-@@ -285,8 +295,10 @@
- #define ATM_ATMOPT_CLP	1	/* set CLP bit */
- 
- struct atm_vcc {
-+#if !defined(CONFIG_MIPS_BCM963XX)
- 	/* struct sock has to be the first member of atm_vcc */
- 	struct sock	sk;
-+#endif
- 	unsigned long	flags;		/* VCC flags (ATM_VF_*) */
- 	short		vpi;		/* VPI and VCI (types must be equal */
- 					/* with sockaddr) */
-@@ -303,6 +315,9 @@
- 	void		*dev_data;	/* per-device data */
- 	void		*proto_data;	/* per-protocol data */
- 	struct k_atm_aal_stats *stats;	/* pointer to AAL stats group */
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	struct sock	*sk;		/* socket backpointer */
-+#endif
- 	/* SVC part --- may move later ------------------------------------- */
- 	short		itf;		/* interface number */
- 	struct sockaddr_atmsvc local;
-@@ -332,7 +347,11 @@
- 
- struct atm_dev_addr {
- 	struct sockaddr_atmsvc addr;	/* ATM address */
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	struct atm_dev_addr *next;      /* next address */
-+#else
- 	struct list_head entry;		/* next address */
-+#endif
- };
- 
- enum atm_addr_type_t { ATM_ADDR_LOCAL, ATM_ADDR_LECS };
-@@ -346,8 +365,12 @@
- 	void		*dev_data;	/* per-device data */
- 	void		*phy_data;	/* private PHY date */
- 	unsigned long	flags;		/* device flags (ATM_DF_*) */
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	struct atm_dev_addr *local;     /* local ATM addresses */
-+#else
- 	struct list_head local;		/* local ATM addresses */
- 	struct list_head lecs;		/* LECS ATM addresses learned via ILMI */
-+#endif
- 	unsigned char	esi[ESI_LEN];	/* ESI ("MAC" addr) */
- 	struct atm_cirange ci_range;	/* VPI/VCI range */
- 	struct k_atm_dev_stats stats;	/* statistics */
-@@ -359,7 +382,9 @@
- 	struct proc_dir_entry *proc_entry; /* proc entry */
- 	char *proc_name;		/* proc entry name */
- #endif
-+#if !defined(CONFIG_MIPS_BCM963XX)
- 	struct class_device class_dev;	/* sysfs class device */
-+#endif
- 	struct list_head dev_list;	/* linkage */
- };
- 
-@@ -416,7 +441,13 @@
-     int number,unsigned long *flags); /* number == -1: pick first available */
- struct atm_dev *atm_dev_lookup(int number);
- void atm_dev_deregister(struct atm_dev *dev);
-+#if defined(CONFIG_MIPS_BCM963XX)
-+void shutdown_atm_dev(struct atm_dev *dev);
-+#endif
- void vcc_insert_socket(struct sock *sk);
-+#if defined(CONFIG_MIPS_BCM963XX)
-+void vcc_remove_socket(struct sock *sk);
-+#endif
- 
- 
- /*
-@@ -432,20 +463,33 @@
- 
- static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)
- {
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	atomic_add(truesize, &vcc->sk->sk_rmem_alloc);
-+#else
- 	atomic_add(truesize, &sk_atm(vcc)->sk_rmem_alloc);
-+#endif
- }
- 
- 
- static inline void atm_return(struct atm_vcc *vcc,int truesize)
- {
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	atomic_sub(truesize, &vcc->sk->sk_rmem_alloc);
-+#else
- 	atomic_sub(truesize, &sk_atm(vcc)->sk_rmem_alloc);
-+#endif
- }
- 
- 
- static inline int atm_may_send(struct atm_vcc *vcc,unsigned int size)
- {
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	return (size + atomic_read(&vcc->sk->sk_wmem_alloc)) <
-+		vcc->sk->sk_sndbuf;
-+#else
- 	return (size + atomic_read(&sk_atm(vcc)->sk_wmem_alloc)) <
- 	       sk_atm(vcc)->sk_sndbuf;
-+#endif
- }
- 
- 
-@@ -457,12 +501,20 @@
- 
- static inline void atm_dev_put(struct atm_dev *dev)
- {
-+#if defined(CONFIG_MIPS_BCM963XX)
-+	atomic_dec(&dev->refcnt);
-+	
-+	if ((atomic_read(&dev->refcnt) == 1) &&
-+	     test_bit(ATM_DF_CLOSE,&dev->flags))
-+		shutdown_atm_dev(dev);
-+#else
- 	if (atomic_dec_and_test(&dev->refcnt)) {
- 		BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags));
- 		if (dev->ops->dev_close)
- 			dev->ops->dev_close(dev);
- 		class_device_put(&dev->class_dev);
- 	}
-+#endif
- }
- 
- 
diff --git a/target/linux/brcm63xx/patches/150-sst_flash.patch b/target/linux/brcm63xx/patches/150-sst_flash.patch
deleted file mode 100644
index ba9fcb9c31..0000000000
--- a/target/linux/brcm63xx/patches/150-sst_flash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN linux-2.6.19.2/drivers/mtd/chips/jedec_probe.c linux-2.6.19.2.new/drivers/mtd/chips/jedec_probe.c
---- linux-2.6.19.2/drivers/mtd/chips/jedec_probe.c	2007-01-10 20:10:37.000000000 +0100
-+++ linux-2.6.19.2.new/drivers/mtd/chips/jedec_probe.c	2007-04-09 22:33:05.000000000 +0200
-@@ -158,6 +158,7 @@
- #define SST49LF030A	0x001C
- #define SST49LF040A	0x0051
- #define SST49LF080A	0x005B
-+#define SST39VF6402B   	0x236C
- 
- /* Toshiba */
- #define TC58FVT160	0x00C2
-@@ -1494,7 +1495,23 @@
-                        ERASEINFO(0x1000,256),
-                        ERASEINFO(0x1000,256)
-                }
--
-+	}, {
-+		.mfr_id         = MANUFACTURER_SST,
-+		.dev_id         = SST39VF6402B,
-+		.name           = "SST 39VF6402B",
-+		.uaddr          = {
-+			[0] = MTD_UADDR_0x5555_0x2AAA,  /* x8 */
-+			[1] = MTD_UADDR_0x5555_0x2AAA   /* x16 */
-+		},
-+		.DevSize        = SIZE_8MiB,
-+		.CmdSet         = P_ID_AMD_STD,
-+		.NumEraseRegions= 4,
-+		.regions        = {
-+			ERASEINFO(0x2000,256),
-+			ERASEINFO(0x2000,256),
-+			ERASEINFO(0x2000,256),
-+			ERASEINFO(0x2000,256)
-+		}
-        }, {
- 		.mfr_id		= MANUFACTURER_ST,	/* FIXME - CFI device? */
- 		.dev_id		= M29W800DT,