brcm47xx: prepare brcm47xx patches for sending to mainline.

SVN-Revision: 22296

23 files changed, 1017 insertions, 762 deletions

diff --git a/target/linux/brcm47xx/patches-2.6.34/001-backport.patch b/target/linux/brcm47xx/patches-2.6.34/001-backport.patch
new file mode 100644
index 0000000000..f27f3d19d0
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.34/001-backport.patch
@@ -0,0 +1,254 @@
+commit 121915c4ee0812a14bc8d752bc210d0238d755c1
+Author: Waldemar Brodkorb <mips@waldemar-brodkorb.de>
+Date:   Tue Jun 8 19:06:01 2010 +0200
+
+    MIPS: BCM47xx: Add NVRAM support devices
+    
+    When trying to netboot a Linksys WRT54GS WLAN router, the bootup fails,
+    because of following error message:
+    
+    ...
+    [    0.424000] b44: b44.c:v2.0
+    [    0.424000] b44: Invalid MAC address found in EEPROM
+    [    0.432000] b44 ssb0:1: Problem fetching invariants of chip,aborting
+    [    0.436000] b44: probe of ssb0:1 failed with error -22
+    ...
+    
+    The router uses a CFE bootloader, but most of the needed environment
+    variables for network card initialization, are not available from CFE
+    via printenv and even though not via cfe_getenv().
+    The required environment variables are saved in a special partition
+    in flash memory. The attached patch implement nvram_getenv and enables
+    bootup via NFS root on my router.
+    
+    Most of the patch is extracted from the OpenWrt subversion repository and
+    stripped down and cleaned up to just fix this issue.
+    
+    [Ralf: sorted out header file inclusions.  Lots of unneded headers and such
+    that should have been included.]
+    
+    Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+    Reviewed-by: Phil Sutter <phil@nwl.cc>
+    To: linux-mips@linux-mips.org
+    Cc: Hauke Mehrtens <hauke@hauke-m.de>
+    Patchwork: http://patchwork.linux-mips.org/patch/1359/
+    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+
+--- a/arch/mips/bcm47xx/Makefile
++++ b/arch/mips/bcm47xx/Makefile
+@@ -3,4 +3,4 @@
+ # under Linux.
+ #
+ 
+-obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
++obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
+--- /dev/null
++++ b/arch/mips/bcm47xx/nvram.c
+@@ -0,0 +1,94 @@
++/*
++ * BCM947xx nvram variable access
++ *
++ * Copyright (C) 2005 Broadcom Corporation
++ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ *
++ * This program is free software; you can redistribute  it and/or modify it
++ * under  the terms of  the GNU General  Public License as published by the
++ * Free Software Foundation;  either version 2 of the  License, or (at your
++ * option) any later version.
++ */
++
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/module.h>
++#include <linux/ssb/ssb.h>
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <asm/addrspace.h>
++#include <asm/mach-bcm47xx/nvram.h>
++#include <asm/mach-bcm47xx/bcm47xx.h>
++
++static char nvram_buf[NVRAM_SPACE];
++
++/* Probe for NVRAM header */
++static void __init early_nvram_init(void)
++{
++	struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
++	struct nvram_header *header;
++	int i;
++	u32 base, lim, off;
++	u32 *src, *dst;
++
++	base = mcore->flash_window;
++	lim = mcore->flash_window_size;
++
++	off = FLASH_MIN;
++	while (off <= lim) {
++		/* Windowed flash access */
++		header = (struct nvram_header *)
++			KSEG1ADDR(base + off - NVRAM_SPACE);
++		if (header->magic == NVRAM_HEADER)
++			goto found;
++		off <<= 1;
++	}
++
++	/* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
++	header = (struct nvram_header *) KSEG1ADDR(base + 4096);
++	if (header->magic == NVRAM_HEADER)
++		goto found;
++
++	header = (struct nvram_header *) KSEG1ADDR(base + 1024);
++	if (header->magic == NVRAM_HEADER)
++		goto found;
++
++	return;
++
++found:
++	src = (u32 *) header;
++	dst = (u32 *) nvram_buf;
++	for (i = 0; i < sizeof(struct nvram_header); i += 4)
++		*dst++ = *src++;
++	for (; i < header->len && i < NVRAM_SPACE; i += 4)
++		*dst++ = le32_to_cpu(*src++);
++}
++
++int nvram_getenv(char *name, char *val, size_t val_len)
++{
++	char *var, *value, *end, *eq;
++
++	if (!name)
++		return 1;
++
++	if (!nvram_buf[0])
++		early_nvram_init();
++
++	/* Look for name=value and return value */
++	var = &nvram_buf[sizeof(struct nvram_header)];
++	end = nvram_buf + sizeof(nvram_buf) - 2;
++	end[0] = end[1] = '\0';
++	for (; *var; var = value + strlen(value) + 1) {
++		eq = strchr(var, '=');
++		if (!eq)
++			break;
++		value = eq + 1;
++		if ((eq - var) == strlen(name) &&
++			strncmp(var, name, (eq - var)) == 0) {
++			snprintf(val, val_len, "%s", value);
++			return 0;
++		}
++	}
++	return 1;
++}
++EXPORT_SYMBOL(nvram_getenv);
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -1,8 +1,8 @@
+ /*
+  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
+- *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
+  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+  *  Copyright (C) 2006 Michael Buesch <mb@bu3sch.de>
++ *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>
+  *
+  *  This program is free software; you can redistribute  it and/or modify it
+  *  under  the terms of  the GNU General  Public License as published by the
+@@ -33,6 +33,7 @@
+ #include <asm/time.h>
+ #include <bcm47xx.h>
+ #include <asm/fw/cfe/cfe_api.h>
++#include <asm/mach-bcm47xx/nvram.h>
+ 
+ struct ssb_bus ssb_bcm47xx;
+ EXPORT_SYMBOL(ssb_bcm47xx);
+@@ -81,28 +82,42 @@ static int bcm47xx_get_invariants(struct
+ 	/* Fill boardinfo structure */
+ 	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
+ 
+-	if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0)
++	if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0)
+ 		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+-	if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
++	if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
+ 		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+-	if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
++	if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
+ 		iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
+ 
+ 	/* Fill sprom structure */
+ 	memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));
+ 	iv->sprom.revision = 3;
+ 
+-	if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
++	if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
+ 		str2eaddr(buf, iv->sprom.et0mac);
+-	if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
++
++	if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
+ 		str2eaddr(buf, iv->sprom.et1mac);
+-	if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
+-		iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 10);
+-	if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
+-		iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 10);
+-	if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
++
++	if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
++		iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 0);
++
++	if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
++		iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 0);
++
++	if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
+ 		iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);
+-	if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
++
++	if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0 ||
++	    nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
+ 		iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
+ 
+ 	return 0;
+--- /dev/null
++++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
+@@ -0,0 +1,36 @@
++/*
++ *  Copyright (C) 2005, Broadcom Corporation
++ *  Copyright (C) 2006, Felix Fietkau <nbd@openwrt.org>
++ *
++ *  This program is free software; you can redistribute  it and/or modify it
++ *  under  the terms of  the GNU General  Public License as published by the
++ *  Free Software Foundation;  either version 2 of the  License, or (at your
++ *  option) any later version.
++ */
++
++#ifndef __NVRAM_H
++#define __NVRAM_H
++
++#include <linux/types.h>
++
++struct nvram_header {
++	u32 magic;
++	u32 len;
++	u32 crc_ver_init;	/* 0:7 crc, 8:15 ver, 16:31 sdram_init */
++	u32 config_refresh;	/* 0:15 sdram_config, 16:31 sdram_refresh */
++	u32 config_ncdl;	/* ncdl values for memc */
++};
++
++#define NVRAM_HEADER		0x48534C46	/* 'FLSH' */
++#define NVRAM_VERSION		1
++#define NVRAM_HEADER_SIZE	20
++#define NVRAM_SPACE		0x8000
++
++#define FLASH_MIN		0x00020000	/* Minimum flash size */
++
++#define NVRAM_MAX_VALUE_LEN 255
++#define NVRAM_MAX_PARAM_LEN 64
++
++extern int nvram_getenv(char *name, char *val, size_t val_len);
++
++#endif
diff --git a/target/linux/brcm47xx/patches-2.6.34/170-128MB_ram_bugfix.patch b/target/linux/brcm47xx/patches-2.6.34/011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch
index 9819ad7115..0030a7da4f 100644
--- a/target/linux/brcm47xx/patches-2.6.34/170-128MB_ram_bugfix.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/011-MIPS-BCM47xx-Really-fix-128MB-RAM-problem.patch
@@ -1,3 +1,24 @@
+From b6d850fe4035d6bee7199119358e06f802aa19ed Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 18 Jul 2010 12:49:41 +0200
+Subject: [PATCH 1/5] MIPS: BCM47xx: Really fix 128MB RAM problem
+
+The previews patch 84a6fcb368a080620d12fc4d79e07902dbee7335 was wrong,
+I got wrong success reports.
+
+The bcm47xx architecture maps the ram into a 128MB address space. It
+will be paced there as often as goes into the 128MB. The detection
+tries to find the position where the same memory is found. When reading
+over 128MB the processor will throw an exception. If 128MB ram is
+installed, it will not find the same memory because it tries to read
+over the 128MB boarder. Now it just assumes 128MB installed ram if it
+can not find that the ram is repeating.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/bcm47xx/prom.c |   22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
 --- a/arch/mips/bcm47xx/prom.c
 +++ b/arch/mips/bcm47xx/prom.c
 @@ -126,6 +126,7 @@ static __init void prom_init_cmdline(voi
diff --git a/target/linux/brcm47xx/patches-2.6.34/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch b/target/linux/brcm47xx/patches-2.6.34/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch
new file mode 100644
index 0000000000..e3df43b35c
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.34/012-MIPS-BCM47xx-Fill-more-values-into-ssb-sprom.patch
@@ -0,0 +1,158 @@
+From d6c049e08568aac29fff854ea0385e63c7150e09 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 18 Jul 2010 13:34:32 +0200
+Subject: [PATCH 2/5] MIPS: BCM47xx: Fill more values into ssb sprom
+
+Most of the values are stored in the nvram and not in the CFE. At first
+the nvram should be read and if there is no value it should look into
+the CFE. Now more values are read out because the b43 and b43legacy
+drivers needs them.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/bcm47xx/setup.c |  122 +++++++++++++++++++++++++++++++++------------
+ 1 files changed, 89 insertions(+), 33 deletions(-)
+
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -74,6 +74,86 @@ static void str2eaddr(char *str, char *d
+ 	}
+ }
+ 
++static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
++{
++	char buf[100];
++
++	memset(sprom, 0, sizeof(struct ssb_sprom));
++
++	sprom->revision = 3;
++	if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("il0macaddr", buf, sizeof(buf)) >= 0)
++		str2eaddr(buf, sprom->il0mac);
++	if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
++		str2eaddr(buf, sprom->et0mac);
++	if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
++		str2eaddr(buf, sprom->et1mac);
++	if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
++		sprom->et0phyaddr = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
++		sprom->et1phyaddr = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
++		sprom->et0mdcport = !!simple_strtoul(buf, NULL, 10);
++	if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
++		sprom->et1mdcport = !!simple_strtoul(buf, NULL, 10);
++	if (nvram_getenv("pa0b0", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa0b0", buf, sizeof(buf)) >= 0)
++		sprom->pa0b0 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa0b1", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa0b1", buf, sizeof(buf)) >= 0)
++		sprom->pa0b1 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa0b2", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa0b2", buf, sizeof(buf)) >= 0)
++		sprom->pa0b2 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa1b0", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa1b0", buf, sizeof(buf)) >= 0)
++		sprom->pa1b0 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa1b1", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa1b1", buf, sizeof(buf)) >= 0)
++		sprom->pa1b1 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa1b2", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa1b2", buf, sizeof(buf)) >= 0)
++		sprom->pa1b2 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("wl0gpio0", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("wl0gpio0", buf, sizeof(buf)) >= 0)
++		sprom->gpio0 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("wl0gpio1", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("wl0gpio1", buf, sizeof(buf)) >= 0)
++		sprom->gpio1 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("wl0gpio2", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("wl0gpio2", buf, sizeof(buf)) >= 0)
++		sprom->gpio2 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("wl0gpio3", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("wl0gpio3", buf, sizeof(buf)) >= 0)
++		sprom->gpio3 = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa0maxpwr", buf, sizeof(buf)) >= 0)
++		sprom->maxpwr_bg = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa1maxpwr", buf, sizeof(buf)) >= 0)
++		sprom->maxpwr_a = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa0itssit", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa0itssit", buf, sizeof(buf)) >= 0)
++		sprom->itssi_bg = simple_strtoul(buf, NULL, 0);
++	if (nvram_getenv("pa1itssit", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("pa1itssit", buf, sizeof(buf)) >= 0)
++		sprom->itssi_a = simple_strtoul(buf, NULL, 0);
++	sprom->boardflags_lo = 0;
++	if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("boardflags", buf, sizeof(buf)) >= 0)
++		sprom->boardflags_lo = simple_strtoul(buf, NULL, 0);
++	sprom->boardflags_hi = 0;
++	if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("boardflags", buf, sizeof(buf)) >= 0)
++		sprom->boardflags_hi = simple_strtoul(buf, NULL, 0);
++}
++
+ static int bcm47xx_get_invariants(struct ssb_bus *bus,
+ 				   struct ssb_init_invariants *iv)
+ {
+@@ -82,43 +162,19 @@ static int bcm47xx_get_invariants(struct
+ 	/* Fill boardinfo structure */
+ 	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
+ 
+-	if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0)
++	iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
++	if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
+ 		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+-	if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
+-		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+-	if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
++	if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
+ 		iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
+ 
+-	/* Fill sprom structure */
+-	memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));
+-	iv->sprom.revision = 3;
+-
+-	if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
+-		str2eaddr(buf, iv->sprom.et0mac);
+-
+-	if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
+-		str2eaddr(buf, iv->sprom.et1mac);
+-
+-	if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
+-		iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 0);
+-
+-	if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
+-		iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 0);
+-
+-	if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
+-		iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);
+-
+-	if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0 ||
+-	    nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
+-		iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
++	bcm47xx_fill_sprom(&iv->sprom);
++
++	if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0 ||
++	    cfe_getenv("cardbus", buf, sizeof(buf)) >= 0)
++		iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
+ 
+ 	return 0;
+ }
diff --git a/target/linux/brcm47xx/patches-2.6.34/013-MIPS-BCM47xx-Activate-SSB_B43_PCI_BRIDGE-by-default.patch b/target/linux/brcm47xx/patches-2.6.34/013-MIPS-BCM47xx-Activate-SSB_B43_PCI_BRIDGE-by-default.patch
new file mode 100644
index 0000000000..82b757580b
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.34/013-MIPS-BCM47xx-Activate-SSB_B43_PCI_BRIDGE-by-default.patch
@@ -0,0 +1,23 @@
+From b1a0abc936bf61689d1e8a56c423b232cff24da5 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 18 Jul 2010 13:58:09 +0200
+Subject: [PATCH 3/5] MIPS: BCM47xx: Activate SSB_B43_PCI_BRIDGE by default
+
+The b43_pci_bridge is needed to use the b43 driver with brcm47xx.
+Activate it by default if pci is available.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/Kconfig |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -62,6 +62,7 @@ config BCM47XX
+ 	select SSB_DRIVER_MIPS
+ 	select SSB_DRIVER_EXTIF
+ 	select SSB_EMBEDDED
++	select SSB_B43_PCI_BRIDGE if PCI
+ 	select SSB_PCICORE_HOSTMODE if PCI
+ 	select GENERIC_GPIO
+ 	select SYS_HAS_EARLY_PRINTK
diff --git a/target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch b/target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
new file mode 100644
index 0000000000..cd35d1c368
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.34/014-MIPS-BCM47xx-Setup-and-register-serial-early.patch
@@ -0,0 +1,81 @@
+From 4c6a515310f29c89f25a54a115cde905f97330f8 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 18 Jul 2010 14:59:24 +0200
+Subject: [PATCH 4/5] MIPS: BCM47xx: Setup and register serial early
+
+Swap the first and second serial if console=ttyS1 was set.
+Set it up and register it for early serial support.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/Kconfig         |    1 -
+ arch/mips/bcm47xx/setup.c |   36 +++++++++++++++++++++++++++++++++++-
+ 2 files changed, 35 insertions(+), 2 deletions(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -65,7 +65,6 @@ config BCM47XX
+ 	select SSB_B43_PCI_BRIDGE if PCI
+ 	select SSB_PCICORE_HOSTMODE if PCI
+ 	select GENERIC_GPIO
+-	select SYS_HAS_EARLY_PRINTK
+ 	select CFE
+ 	help
+ 	 Support for BCM47XX based boards
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -28,6 +28,8 @@
+ #include <linux/types.h>
+ #include <linux/ssb/ssb.h>
+ #include <linux/ssb/ssb_embedded.h>
++#include <linux/serial.h>
++#include <linux/serial_8250.h>
+ #include <asm/bootinfo.h>
+ #include <asm/reboot.h>
+ #include <asm/time.h>
+@@ -181,12 +183,44 @@ static int bcm47xx_get_invariants(struct
+ 
+ void __init plat_mem_setup(void)
+ {
+-	int err;
++	int i, err;
++	char buf[100];
++	struct ssb_mipscore *mcore;
+ 
+ 	err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
+ 				      bcm47xx_get_invariants);
+ 	if (err)
+ 		panic("Failed to initialize SSB bus (err %d)\n", err);
++	mcore = &ssb_bcm47xx.mipscore;
++
++	nvram_getenv("kernel_args", buf, sizeof(buf));
++	if (!strncmp(buf, "console=ttyS1", 13)) {
++		struct ssb_serial_port port;
++
++		printk("Swapping serial ports!\n");
++		/* swap serial ports */
++		memcpy(&port, &mcore->serial_ports[0], sizeof(port));
++		memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1], sizeof(port));
++		memcpy(&mcore->serial_ports[1], &port, sizeof(port));
++	}
++
++	for (i = 0; i < mcore->nr_serial_ports; i++) {
++		struct ssb_serial_port *port = &(mcore->serial_ports[i]);
++		struct uart_port s;
++
++		memset(&s, 0, sizeof(s));
++		s.line = i;
++		s.mapbase = (unsigned int) port->regs;
++		s.membase = port->regs;
++		s.irq = port->irq + 2;
++		s.uartclk = port->baud_base;
++		s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
++		s.iotype = SERIAL_IO_MEM;
++		s.regshift = port->reg_shift;
++
++		early_serial_setup(&s);
++	}
++	printk("Serial init done.\n");
+ 
+ 	_machine_restart = bcm47xx_machine_restart;
+ 	_machine_halt = bcm47xx_machine_halt;
diff --git a/target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-Remove-CFE-console.patch b/target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-Remove-CFE-console.patch
new file mode 100644
index 0000000000..f87810151c
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.34/015-MIPS-BCM47xx-Remove-CFE-console.patch
@@ -0,0 +1,130 @@
+From 6bd2c73ed31a2dfe7eab04d32c17318a5c62f9d4 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 18 Jul 2010 15:11:26 +0200
+Subject: [PATCH 5/5] MIPS: BCM47xx: Remove CFE console
+
+Do not use the CFE console. It causes hangs on some devices like the
+Buffalo WHR-HP-G54.
+This was reported in https://dev.openwrt.org/ticket/4061 and
+https://forum.openwrt.org/viewtopic.php?id=17063
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ arch/mips/bcm47xx/prom.c |   82 +++------------------------------------------
+ 1 files changed, 6 insertions(+), 76 deletions(-)
+
+--- a/arch/mips/bcm47xx/prom.c
++++ b/arch/mips/bcm47xx/prom.c
+@@ -31,96 +31,28 @@
+ #include <asm/fw/cfe/cfe_api.h>
+ #include <asm/fw/cfe/cfe_error.h>
+ 
+-static int cfe_cons_handle;
+-
+ const char *get_system_type(void)
+ {
+ 	return "Broadcom BCM47XX";
+ }
+ 
+-void prom_putchar(char c)
+-{
+-	while (cfe_write(cfe_cons_handle, &c, 1) == 0)
+-		;
+-}
+-
+-static __init void prom_init_cfe(void)
++static __init int prom_init_cfe(void)
+ {
+ 	uint32_t cfe_ept;
+ 	uint32_t cfe_handle;
+ 	uint32_t cfe_eptseal;
+-	int argc = fw_arg0;
+-	char **envp = (char **) fw_arg2;
+-	int *prom_vec = (int *) fw_arg3;
+-
+-	/*
+-	 * Check if a loader was used; if NOT, the 4 arguments are
+-	 * what CFE gives us (handle, 0, EPT and EPTSEAL)
+-	 */
+-	if (argc < 0) {
+-		cfe_handle = (uint32_t)argc;
+-		cfe_ept = (uint32_t)envp;
+-		cfe_eptseal = (uint32_t)prom_vec;
+-	} else {
+-		if ((int)prom_vec < 0) {
+-			/*
+-			 * Old loader; all it gives us is the handle,
+-			 * so use the "known" entrypoint and assume
+-			 * the seal.
+-			 */
+-			cfe_handle = (uint32_t)prom_vec;
+-			cfe_ept = 0xBFC00500;
+-			cfe_eptseal = CFE_EPTSEAL;
+-		} else {
+-			/*
+-			 * Newer loaders bundle the handle/ept/eptseal
+-			 * Note: prom_vec is in the loader's useg
+-			 * which is still alive in the TLB.
+-			 */
+-			cfe_handle = prom_vec[0];
+-			cfe_ept = prom_vec[2];
+-			cfe_eptseal = prom_vec[3];
+-		}
+-	}
++
++	cfe_eptseal = (uint32_t) fw_arg3;
++	cfe_handle = (uint32_t) fw_arg0;
++	cfe_ept = (uint32_t) fw_arg2;
+ 
+ 	if (cfe_eptseal != CFE_EPTSEAL) {
+-		/* too early for panic to do any good */
+ 		printk(KERN_ERR "CFE's entrypoint seal doesn't match.");
+-		while (1) ;
++		return -1;
+ 	}
+ 
+ 	cfe_init(cfe_handle, cfe_ept);
+-}
+-
+-static __init void prom_init_console(void)
+-{
+-	/* Initialize CFE console */
+-	cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
+-}
+-
+-static __init void prom_init_cmdline(void)
+-{
+-	static char buf[COMMAND_LINE_SIZE] __initdata;
+-
+-	/* Get the kernel command line from CFE */
+-	if (cfe_getenv("LINUX_CMDLINE", buf, COMMAND_LINE_SIZE) >= 0) {
+-		buf[COMMAND_LINE_SIZE - 1] = 0;
+-		strcpy(arcs_cmdline, buf);
+-	}
+-
+-	/* Force a console handover by adding a console= argument if needed,
+-	 * as CFE is not available anymore later in the boot process. */
+-	if ((strstr(arcs_cmdline, "console=")) == NULL) {
+-		/* Try to read the default serial port used by CFE */
+-		if ((cfe_getenv("BOOT_CONSOLE", buf, COMMAND_LINE_SIZE) < 0)
+-		    || (strncmp("uart", buf, 4)))
+-			/* Default to uart0 */
+-			strcpy(buf, "uart0");
+-
+-		/* Compute the new command line */
+-		snprintf(arcs_cmdline, COMMAND_LINE_SIZE, "%s console=ttyS%c,115200",
+-			 arcs_cmdline, buf[4]);
+-	}
++	return 0;
+ }
+ 
+ static __init void prom_init_mem(void)
+@@ -161,8 +93,6 @@ static __init void prom_init_mem(void)
+ void __init prom_init(void)
+ {
+ 	prom_init_cfe();
+-	prom_init_console();
+-	prom_init_cmdline();
+ 	prom_init_mem();
+ }
+ 
diff --git a/target/linux/brcm47xx/patches-2.6.34/021-USB-Add-USB-2.0-to-ssb-ohci-driver.patch b/target/linux/brcm47xx/patches-2.6.34/021-USB-Add-USB-2.0-to-ssb-ohci-driver.patch
new file mode 100644
index 0000000000..91eadaade4
--- /dev/null
+++ b/target/linux/brcm47xx/patches-2.6.34/021-USB-Add-USB-2.0-to-ssb-ohci-driver.patch
@@ -0,0 +1,95 @@
+From cb33ffbdd8491c58b35958ec74c39b3a5c7fabe8 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 18 Jul 2010 21:25:03 +0200
+Subject: [PATCH 1/2] USB: Add USB 2.0 to ssb ohci driver
+
+This adds USB 2.0 support to ssb ohci driver.
+This work was done based on Braodcom source code in the OpenWRT project.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ drivers/usb/host/ohci-ssb.c |   55 ++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 52 insertions(+), 3 deletions(-)
+
+--- a/drivers/usb/host/ohci-ssb.c
++++ b/drivers/usb/host/ohci-ssb.c
+@@ -92,9 +92,12 @@ static const struct hc_driver ssb_ohci_h
+ static void ssb_ohci_detach(struct ssb_device *dev)
+ {
+ 	struct usb_hcd *hcd = ssb_get_drvdata(dev);
++	if (hcd->driver->shutdown)
++		hcd->driver->shutdown(hcd);
+ 
+ 	usb_remove_hcd(hcd);
+ 	iounmap(hcd->regs);
++	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+ 	usb_put_hcd(hcd);
+ 	ssb_device_disable(dev, 0);
+ }
+@@ -106,10 +109,55 @@ static int ssb_ohci_attach(struct ssb_de
+ 	int err = -ENOMEM;
+ 	u32 tmp, flags = 0;
+ 
+-	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV)
+-		flags |= SSB_OHCI_TMSLOW_HOSTMODE;
++	if (dma_set_mask(dev->dma_dev, DMA_BIT_MASK(32)) ||
++	    dma_set_coherent_mask(dev->dma_dev, DMA_BIT_MASK(32)))
++		return -EOPNOTSUPP;
+ 
+-	ssb_device_enable(dev, flags);
++	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
++		/* Put the device into host-mode. */
++		flags |= SSB_OHCI_TMSLOW_HOSTMODE;
++		ssb_device_enable(dev, flags);
++	} else if (dev->id.coreid == SSB_DEV_USB20_HOST) {
++		/*
++		 * USB 2.0 special considerations:
++		 *
++		 * 1. Since the core supports both ehci and EHCI functions, it must
++		 *    only be reset once.
++		 *
++		 * 2. In addition to the standard SSB reset sequence, the Host Control
++		 *    Register must be programmed to bring the USB core and various
++		 *    phy components out of reset.
++		 */
++		ssb_device_enable(dev, 0);
++		ssb_write32(dev, 0x200, 0x7ff);
++
++		/* Change Flush control reg */
++		tmp = ssb_read32(dev, 0x400);
++		tmp &= ~8;
++		ssb_write32(dev, 0x400, tmp);
++		tmp = ssb_read32(dev, 0x400);
++
++		/* Change Shim control reg */
++		tmp = ssb_read32(dev, 0x304);
++		tmp &= ~0x100;
++		ssb_write32(dev, 0x304, tmp);
++		tmp = ssb_read32(dev, 0x304);
++
++		udelay(1);
++
++		/* Work around for 5354 failures */
++		if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
++			/* Change syn01 reg */
++			tmp = 0x00fe00fe;
++			ssb_write32(dev, 0x894, tmp);
++
++			/* Change syn03 reg */
++			tmp = ssb_read32(dev, 0x89c);
++			tmp |= 0x1;
++			ssb_write32(dev, 0x89c, tmp);
++		}
++	} else
++		ssb_device_enable(dev, 0);
+ 
+ 	hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
+ 			dev_name(dev->dev));
+@@ -200,6 +248,7 @@ static int ssb_ohci_resume(struct ssb_de
+ static const struct ssb_device_id ssb_ohci_table[] = {
+ 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
+ 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
++	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
+ 	SSB_DEVTABLE_END
+ };
+ MODULE_DEVICE_TABLE(ssb, ssb_ohci_table);
diff --git a/target/linux/brcm47xx/patches-2.6.34/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.34/022-USB-Add-ehci-ssb-driver.patch
index 700d58b0fa..10cefac639 100644
--- a/target/linux/brcm47xx/patches-2.6.34/270-ehci-ssb.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/022-USB-Add-ehci-ssb-driver.patch
@@ -1,9 +1,17 @@
+From cb269cf1f97c316a5184080814a751687c72b718 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 18 Jul 2010 21:29:40 +0200
+Subject: [PATCH 2/2] USB: Add ehci ssb driver
+
+Support for the Sonics Silicon Backplane (SSB) attached Broadcom USB EHCI core.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 ---
  drivers/usb/host/Kconfig    |   13 ++
- drivers/usb/host/ehci-hcd.c |   12 ++
- drivers/usb/host/ehci-ssb.c |  201 ++++++++++++++++++++++++++++++++++++++++++++
- drivers/usb/host/ohci-ssb.c |   23 +++++
- 4 files changed, 247 insertions(+), 2 deletions(-)
+ drivers/usb/host/ehci-hcd.c |   23 ++++-
+ drivers/usb/host/ehci-ssb.c |  258 +++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 292 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/usb/host/ehci-ssb.c
 
 --- a/drivers/usb/host/Kconfig
 +++ b/drivers/usb/host/Kconfig
@@ -13,7 +21,7 @@
  
 +config USB_EHCI_HCD_SSB
 +	bool "EHCI support for Broadcom SSB EHCI core"
-+	depends on USB_EHCI_HCD && SSB && EXPERIMENTAL
++	depends on USB_EHCI_HCD && (SSB = y || SSB = USB_EHCI_HCD) && EXPERIMENTAL
 +	default n
 +	---help---
 +	  Support for the Sonics Silicon Backplane (SSB) attached
@@ -29,33 +37,63 @@
  	depends on USB
 --- a/drivers/usb/host/ehci-hcd.c
 +++ b/drivers/usb/host/ehci-hcd.c
-@@ -1159,8 +1159,16 @@ MODULE_LICENSE ("GPL");
+@@ -1159,8 +1159,14 @@ MODULE_LICENSE ("GPL");
  #define	PLATFORM_DRIVER		ehci_atmel_driver
  #endif
  
--#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
--    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
 +#ifdef CONFIG_USB_EHCI_HCD_SSB
 +#include "ehci-ssb.c"
-+#define SSB_EHCI_DRIVER         ssb_ehci_driver
++#define SSB_EHCI_DRIVER		ssb_ehci_driver
 +#endif
 +
-+#if !defined(PCI_DRIVER) && \
-+    !defined(PLATFORM_DRIVER) && \
-+    !defined(PS3_SYSTEM_BUS_DRIVER) && \
-+    !defined(OF_PLATFORM_DRIVER) && \
+ #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
+-    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER)
++    !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
 +    !defined(SSB_EHCI_DRIVER)
  #error "missing bus glue for ehci-hcd"
  #endif
  
+@@ -1214,10 +1220,20 @@ static int __init ehci_hcd_init(void)
+ 	if (retval < 0)
+ 		goto clean3;
+ #endif
++
++#ifdef SSB_EHCI_DRIVER
++	retval = ssb_driver_register(&SSB_EHCI_DRIVER);
++	if (retval < 0)
++		goto clean4;
++#endif
+ 	return retval;
+ 
++#ifdef SSB_EHCI_DRIVER
++	/* ssb_driver_unregister(&SSB_EHCI_DRIVER); */
++clean4:
++#endif
+ #ifdef OF_PLATFORM_DRIVER
+-	/* of_unregister_platform_driver(&OF_PLATFORM_DRIVER); */
++	of_unregister_platform_driver(&OF_PLATFORM_DRIVER);
+ clean3:
+ #endif
+ #ifdef PS3_SYSTEM_BUS_DRIVER
+@@ -1256,6 +1272,9 @@ static void __exit ehci_hcd_cleanup(void
+ #ifdef PS3_SYSTEM_BUS_DRIVER
+ 	ps3_ehci_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
+ #endif
++#ifdef SSB_EHCI_DRIVER
++	ssb_driver_unregister(&SSB_EHCI_DRIVER);
++#endif
+ #ifdef DEBUG
+ 	debugfs_remove(ehci_debug_root);
+ #endif
 --- /dev/null
 +++ b/drivers/usb/host/ehci-ssb.c
-@@ -0,0 +1,158 @@
+@@ -0,0 +1,258 @@
 +/*
 + * Sonics Silicon Backplane
 + * Broadcom USB-core EHCI driver (SSB bus glue)
 + *
 + * Copyright 2007 Steven Brown <sbrown@cortland.com>
++ * Copyright 2010 Hauke Mehrtens <hauke@hauke-m.de>
 + *
 + * Derived from the OHCI-SSB driver
 + * Copyright 2007 Michael Buesch <mb@bu3sch.de>
@@ -76,12 +114,9 @@
 + */
 +#include <linux/ssb/ssb.h>
 +
-+#define SSB_OHCI_TMSLOW_HOSTMODE	(1 << 29)
 +
 +struct ssb_ehci_device {
 +	struct ehci_hcd ehci; /* _must_ be at the beginning. */
-+
-+	u32 enable_flags;
 +};
 +
 +static inline
@@ -141,34 +176,78 @@
 +
 +	.hub_status_data	= ehci_hub_status_data,
 +	.hub_control		= ehci_hub_control,
++#if defined(CONFIG_PM)
 +	.bus_suspend		= ehci_bus_suspend,
 +	.bus_resume		= ehci_bus_resume,
++#endif
 +	.relinquish_port	= ehci_relinquish_port,
 +	.port_handed_over	= ehci_port_handed_over,
 +
 +	.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
 +};
 +
-+static void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd)
++static void ssb_ehci_detach(struct ssb_device *dev)
 +{
++	struct usb_hcd *hcd = ssb_get_drvdata(dev);
 +	if (hcd->driver->shutdown)
 +		hcd->driver->shutdown(hcd);
 +
 +	usb_remove_hcd(hcd);
-+
 +	iounmap(hcd->regs);
 +	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
-+
 +	usb_put_hcd(hcd);
++	ssb_device_disable(dev, 0);
 +}
-+EXPORT_SYMBOL_GPL(ssb_ehci_detach);
 +
-+static int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **ehci_hcd)
++static int ssb_ehci_attach(struct ssb_device *dev)
 +{
 +	struct ssb_ehci_device *ehcidev;
 +	struct usb_hcd *hcd;
 +	int err = -ENOMEM;
-+	u32 tmp, flags = 0;
++	u32 tmp;
++
++	if (dma_set_mask(dev->dma_dev, DMA_BIT_MASK(32)) ||
++	    dma_set_coherent_mask(dev->dma_dev, DMA_BIT_MASK(32)))
++		return -EOPNOTSUPP;
++
++	/*
++	 * USB 2.0 special considerations:
++	 *
++	 * 1. Since the core supports both ehci and EHCI functions, it must
++	 *    only be reset once.
++	 *
++	 * 2. In addition to the standard SSB reset sequence, the Host Control
++	 *    Register must be programmed to bring the USB core and various
++	 *    phy components out of reset.
++	 */
++	ssb_device_enable(dev, 0);
++	ssb_write32(dev, 0x200, 0x7ff);
++
++	/* Change Flush control reg */
++	tmp = ssb_read32(dev, 0x400);
++	tmp &= ~8;
++	ssb_write32(dev, 0x400, tmp);
++	tmp = ssb_read32(dev, 0x400);
++
++	/* Change Shim control reg */
++	tmp = ssb_read32(dev, 0x304);
++	tmp &= ~0x100;
++	ssb_write32(dev, 0x304, tmp);
++	tmp = ssb_read32(dev, 0x304);
++
++	udelay(1);
++
++	/* Work around for 5354 failures */
++	if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
++		/* Change syn01 reg */
++		tmp = 0x00fe00fe;
++		ssb_write32(dev, 0x894, tmp);
++
++		/* Change syn03 reg */
++		tmp = ssb_read32(dev, 0x89c);
++		tmp |= 0x1;
++		ssb_write32(dev, 0x89c, tmp);
++	}
 +
 +	hcd = usb_create_hcd(&ssb_ehci_hc_driver, dev->dev,
 +			     dev_name(dev->dev));
@@ -176,7 +255,6 @@
 +		goto err_dev_disable;
 +
 +	ehcidev = hcd_to_ssb_ehci(hcd);
-+	ehcidev->enable_flags = flags;
 +	tmp = ssb_read32(dev, SSB_ADMATCH0);
 +	hcd->rsrc_start = ssb_admatch_base(tmp) + 0x800; /* ehci core offset */
 +	hcd->rsrc_len = 0x100; /* ehci reg block size */
@@ -186,11 +264,11 @@
 +	hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
 +	if (!hcd->regs)
 +		goto err_put_hcd;
-+	err = usb_add_hcd(hcd, dev->irq, IRQF_SHARED | IRQF_DISABLED);
++	err = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);
 +	if (err)
 +		goto err_iounmap;
 +
-+	*ehci_hcd = hcd;
++	ssb_set_drvdata(dev, hcd);
 +
 +	return err;
 +
@@ -199,73 +277,72 @@
 +err_put_hcd:
 +	usb_put_hcd(hcd);
 +err_dev_disable:
-+	ssb_device_disable(dev, flags);
++	ssb_device_disable(dev, 0);
 +	return err;
 +}
-+EXPORT_SYMBOL_GPL(ssb_ehci_attach);
++
++static int ssb_ehci_probe(struct ssb_device *dev,
++		const struct ssb_device_id *id)
++{
++	int err;
++	u16 chipid_top;
++
++	/* USBcores are only connected on embedded devices. */
++	chipid_top = (dev->bus->chip_id & 0xFF00);
++	if (chipid_top != 0x4700 && chipid_top != 0x5300)
++		return -ENODEV;
++
++	/* TODO: Probably need checks here; is the core connected? */
++
++	if (usb_disabled())
++		return -ENODEV;
++
++	err = ssb_ehci_attach(dev);
++
++	return err;
++}
++
++static void ssb_ehci_remove(struct ssb_device *dev)
++{
++	ssb_ehci_detach(dev);
++}
++
++#ifdef CONFIG_PM
++
++static int ssb_ehci_suspend(struct ssb_device *dev, pm_message_t state)
++{
++	ssb_device_disable(dev, 0);
++
++	return 0;
++}
++
++static int ssb_ehci_resume(struct ssb_device *dev)
++{
++	struct usb_hcd *hcd = ssb_get_drvdata(dev);
++	struct ssb_ehci_device *ehcidev = hcd_to_ssb_ehci(hcd);
++
++	ssb_device_enable(dev, 0);
++
++	ehci_finish_controller_resume(hcd);
++	return 0;
++}
++
++#else /* !CONFIG_PM */
++#define ssb_ehci_suspend	NULL
++#define ssb_ehci_resume	NULL
++#endif /* CONFIG_PM */
 +
 +static const struct ssb_device_id ssb_ehci_table[] = {
 +	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
 +	SSB_DEVTABLE_END
 +};
 +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -17,6 +17,8 @@
-  */
- #include <linux/ssb/ssb.h>
- 
-+extern int ssb_ehci_attach(struct ssb_device *dev, struct usb_hcd **hcd);
-+extern void ssb_ehci_detach(struct ssb_device *dev, struct usb_hcd *hcd);
- 
- #define SSB_OHCI_TMSLOW_HOSTMODE	(1 << 29)
- 
-@@ -24,6 +26,7 @@ struct ssb_ohci_device {
- 	struct ohci_hcd ohci; /* _must_ be at the beginning. */
- 
- 	u32 enable_flags;
-+	struct usb_hcd *ehci_hcd;
- };
- 
- static inline
-@@ -92,13 +95,25 @@ static const struct hc_driver ssb_ohci_h
- static void ssb_ohci_detach(struct ssb_device *dev)
- {
- 	struct usb_hcd *hcd = ssb_get_drvdata(dev);
-+#ifdef CONFIG_USB_EHCI_HCD_SSB
-+	struct ssb_ohci_device *ohcidev = hcd_to_ssb_ohci(hcd);
-+#endif
- 
- 	usb_remove_hcd(hcd);
- 	iounmap(hcd->regs);
- 	usb_put_hcd(hcd);
 +
-+#ifdef CONFIG_USB_EHCI_HCD_SSB
-+	/*
-+	 * Also detach ehci function
-+	 */
-+	if (dev->id.coreid == SSB_DEV_USB20_HOST)
-+		ssb_ehci_detach(dev, ohcidev->ehci_hcd);
-+#endif
- 	ssb_device_disable(dev, 0);
- }
- 
-+
- static int ssb_ohci_attach(struct ssb_device *dev)
- {
- 	struct ssb_ohci_device *ohcidev;
-@@ -165,6 +180,14 @@ static int ssb_ohci_attach(struct ssb_de
- 
- 	ssb_set_drvdata(dev, hcd);
- 
-+#ifdef CONFIG_USB_EHCI_HCD_SSB
-+	/*
-+	 * attach ehci function in this core
-+	 */
-+	if (dev->id.coreid == SSB_DEV_USB20_HOST)
-+		err = ssb_ehci_attach(dev, &(ohcidev->ehci_hcd));
-+#endif
-+
- 	return err;
- 
- err_iounmap:
++static struct ssb_driver ssb_ehci_driver = {
++	.name		= KBUILD_MODNAME,
++	.id_table	= ssb_ehci_table,
++	.probe		= ssb_ehci_probe,
++	.remove		= ssb_ehci_remove,
++	.suspend	= ssb_ehci_suspend,
++	.resume		= ssb_ehci_resume,
++};
diff --git a/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch
deleted file mode 100644
index 0bdb13d3f4..0000000000
--- a/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -205,7 +205,6 @@ config MIPS_MALTA
- 	select I8259
- 	select MIPS_BOARDS_GEN
- 	select MIPS_BONITO64
--	select MIPS_CPU_SCACHE
- 	select PCI_GT64XXX_PCI0
- 	select MIPS_MSC
- 	select SWAP_IO_SPACE
-@@ -1589,13 +1588,6 @@ config IP22_CPU_SCACHE
- 	bool
- 	select BOARD_SCACHE
- 
--#
--# Support for a MIPS32 / MIPS64 style S-caches
--#
--config MIPS_CPU_SCACHE
--	bool
--	select BOARD_SCACHE
--
- config R5000_CPU_SCACHE
- 	bool
- 	select BOARD_SCACHE
---- a/arch/mips/kernel/cpu-probe.c
-+++ b/arch/mips/kernel/cpu-probe.c
-@@ -772,6 +772,8 @@ static inline void cpu_probe_mips(struct
- 	case PRID_IMP_25KF:
- 		c->cputype = CPU_25KF;
- 		__cpu_name[cpu] = "MIPS 25Kc";
-+		/* Probe for L2 cache */
-+		c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
- 		break;
- 	case PRID_IMP_34K:
- 		c->cputype = CPU_34K;
---- a/arch/mips/mm/Makefile
-+++ b/arch/mips/mm/Makefile
-@@ -33,6 +33,5 @@ obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= c-oct
- obj-$(CONFIG_IP22_CPU_SCACHE)	+= sc-ip22.o
- obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
- obj-$(CONFIG_RM7000_CPU_SCACHE)	+= sc-rm7k.o
--obj-$(CONFIG_MIPS_CPU_SCACHE)	+= sc-mips.o
- 
- EXTRA_CFLAGS += -Werror
---- a/arch/mips/mm/c-r4k.c
-+++ b/arch/mips/mm/c-r4k.c
-@@ -1148,7 +1148,6 @@ static void __init loongson2_sc_init(voi
- 
- extern int r5k_sc_init(void);
- extern int rm7k_sc_init(void);
--extern int mips_sc_init(void);
- 
- static void __cpuinit setup_scache(void)
- {
-@@ -1202,29 +1201,17 @@ static void __cpuinit setup_scache(void)
- #endif
- 
- 	default:
--		if (c->isa_level == MIPS_CPU_ISA_M32R1 ||
--		    c->isa_level == MIPS_CPU_ISA_M32R2 ||
--		    c->isa_level == MIPS_CPU_ISA_M64R1 ||
--		    c->isa_level == MIPS_CPU_ISA_M64R2) {
--#ifdef CONFIG_MIPS_CPU_SCACHE
--			if (mips_sc_init ()) {
--				scache_size = c->scache.ways * c->scache.sets * c->scache.linesz;
--				printk("MIPS secondary cache %ldkB, %s, linesize %d bytes.\n",
--				       scache_size >> 10,
--				       way_string[c->scache.ways], c->scache.linesz);
--			}
--#else
--			if (!(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
--				panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
--#endif
--			return;
--		}
- 		sc_present = 0;
- 	}
- 
- 	if (!sc_present)
- 		return;
- 
-+	if ((c->isa_level == MIPS_CPU_ISA_M32R1 ||
-+	     c->isa_level == MIPS_CPU_ISA_M64R1) &&
-+	    !(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
-+		panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
-+
- 	/* compute a couple of other cache variables */
- 	c->scache.waysize = scache_size / c->scache.ways;
- 
diff --git a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
index de79ca8898..b4d235c0da 100644
--- a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
@@ -295,7 +295,7 @@
  	if (dc_lsize)
  		protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
  	if (!cpu_icache_snoops_remote_store && scache_size)
-@@ -1298,6 +1312,17 @@ static void __cpuinit coherency_setup(vo
+@@ -1311,6 +1325,17 @@ static void __cpuinit coherency_setup(vo
  	 * silly idea of putting something else there ...
  	 */
  	switch (current_cpu_type()) {
@@ -313,7 +313,7 @@
  	case CPU_R4000PC:
  	case CPU_R4000SC:
  	case CPU_R4000MC:
-@@ -1354,6 +1379,15 @@ void __cpuinit r4k_cache_init(void)
+@@ -1367,6 +1392,15 @@ void __cpuinit r4k_cache_init(void)
  		break;
  	}
  
@@ -329,7 +329,7 @@
  	probe_pcache();
  	setup_scache();
  
-@@ -1412,5 +1446,13 @@ void __cpuinit r4k_cache_init(void)
+@@ -1425,5 +1459,13 @@ void __cpuinit r4k_cache_init(void)
  #if !defined(CONFIG_MIPS_CMP)
  	local_r4k___flush_cache_all(NULL);
  #endif
diff --git a/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch
index 1f8de8d9be..f07968a240 100644
--- a/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/210-b44_phy_fix.patch
@@ -1,36 +1,58 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
-@@ -384,7 +384,7 @@ static void b44_set_flow_ctrl(struct b44
+@@ -381,11 +381,12 @@ static void b44_set_flow_ctrl(struct b44
  	__b44_set_flow_ctrl(bp, pause_enab);
  }
  
 -#ifdef SSB_DRIVER_MIPS
-+#ifdef CONFIG_SSB_DRIVER_MIPS
- extern char *nvram_get(char *name);
+-extern char *nvram_get(char *name);
++#ifdef CONFIG_BCM47XX
++
++#include <asm/mach-bcm47xx/nvram.h>
  static void b44_wap54g10_workaround(struct b44 *bp)
  {
-@@ -421,12 +421,45 @@ static inline void b44_wap54g10_workarou
- }
- #endif
+-	const char *str;
++	char buf[20];
+ 	u32 val;
+ 	int err;
  
-+#ifdef CONFIG_SSB_DRIVER_MIPS
+@@ -394,10 +395,9 @@ static void b44_wap54g10_workaround(stru
+ 	 * see https://dev.openwrt.org/ticket/146
+ 	 * check and reset bit "isolate"
+ 	 */
+-	str = nvram_get("boardnum");
+-	if (!str)
++	if (nvram_getenv("boardnum", buf, sizeof(buf)) > 0)
+ 		return;
+-	if (simple_strtoul(str, NULL, 0) == 2) {
++	if (simple_strtoul(buf, NULL, 0) == 2) {
+ 		err = __b44_readphy(bp, 0, MII_BMCR, &val);
+ 		if (err)
+ 			goto error;
+@@ -412,10 +412,43 @@ static void b44_wap54g10_workaround(stru
+ error:
+ 	pr_warning("PHY: cannot reset MII transceiver isolate bit\n");
+ }
++
 +static inline int startswith (const char *source, const char *cmp) 
 +{ 
 +       return !strncmp(source,cmp,strlen(cmp)); 
 +}
 +
-+#define getvar(str) (nvram_get(str) ? : "")
-+
 +static inline void b44_bcm47xx_workarounds(struct b44 *bp)
 +{
++	char buf[20];
 +	/* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
-+	if (simple_strtoul(getvar("boardnum"), NULL, 0) == 100) {
++	if (nvram_getenv("boardnum", buf, sizeof(buf)) > 0)
++		return;
++	if (simple_strtoul(buf, NULL, 0) == 100) {
 +		bp->phy_addr = B44_PHY_ADDR_NO_PHY;
 +	} else {
 +		/* WL-HDD */
 +		struct ssb_device *sdev = bp->sdev;
-+		if (startswith(getvar("hardware_version"), "WL300-")) 
-+		{
++		if (nvram_getenv("hardware_version", buf, sizeof(buf)) > 0)
++			return;
++		if (startswith(buf, "WL300-")) {
 +			if (sdev->bus->sprom.et0phyaddr == 0 &&
 +			    sdev->bus->sprom.et1phyaddr == 1)
 +				bp->phy_addr = B44_PHY_ADDR_NO_PHY;
@@ -39,15 +61,19 @@
 +	return;
 +}
 +
-+#else
+ #else
++
+ static inline void b44_wap54g10_workaround(struct b44 *bp)
+ {
+ }
++
 +static inline void b44_bcm47xx_workarounds(struct b44 *bp) 
 +{ 
 +}
-+#endif
-+
+ #endif
+ 
  static int b44_setup_phy(struct b44 *bp)
- {
- 	u32 val;
+@@ -424,6 +457,7 @@ static int b44_setup_phy(struct b44 *bp)
  	int err;
  
  	b44_wap54g10_workaround(bp);
@@ -55,7 +81,7 @@
  
  	if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
  		return 0;
-@@ -2089,6 +2122,8 @@ static int __devinit b44_get_invariants(
+@@ -2080,6 +2114,8 @@ static int __devinit b44_get_invariants(
  	 * valid PHY address. */
  	bp->phy_addr &= 0x1F;
  
diff --git a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
index 8e1615f770..4dedb82180 100644
--- a/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/211-b44_timeout_spam.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/b44.c
 +++ b/drivers/net/b44.c
-@@ -191,10 +190,11 @@ static int b44_wait_bit(struct b44 *bp, 
+@@ -188,10 +188,11 @@ static int b44_wait_bit(struct b44 *bp, 
  		udelay(10);
  	}
  	if (i == timeout) {
diff --git a/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch
index 1d75e171d3..0bc9e7ea4c 100644
--- a/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/220-bcm5354.patch
@@ -1,6 +1,6 @@
 --- a/drivers/ssb/driver_chipcommon.c
 +++ b/drivers/ssb/driver_chipcommon.c
-@@ -260,6 +260,8 @@ void ssb_chipco_resume(struct ssb_chipco
+@@ -285,6 +285,8 @@ void ssb_chipco_resume(struct ssb_chipco
  void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
                               u32 *plltype, u32 *n, u32 *m)
  {
@@ -9,7 +9,7 @@
  	*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
  	*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
  	switch (*plltype) {
-@@ -283,6 +285,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
+@@ -308,6 +310,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
  void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
  				 u32 *plltype, u32 *n, u32 *m)
  {
@@ -31,7 +31,7 @@
  	}
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -1073,6 +1073,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+@@ -1075,6 +1075,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
  
  	if (bus->chip_id == 0x5365) {
  		rate = 100000000;
diff --git a/target/linux/brcm47xx/patches-2.6.34/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.34/250-ohci-ssb-usb2.patch
deleted file mode 100644
index 25b27e47e8..0000000000
--- a/target/linux/brcm47xx/patches-2.6.34/250-ohci-ssb-usb2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
----
- drivers/usb/host/ohci-ssb.c |   39 ++++++++++++++++++++++++++++++++++++---
- 1 file changed, 36 insertions(+), 3 deletions(-)
-
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -106,10 +106,42 @@ static int ssb_ohci_attach(struct ssb_de
- 	int err = -ENOMEM;
- 	u32 tmp, flags = 0;
- 
--	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV)
-+	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
-+		/* Put the device into host-mode. */
- 		flags |= SSB_OHCI_TMSLOW_HOSTMODE;
--
--	ssb_device_enable(dev, flags);
-+		ssb_device_enable(dev, flags);
-+	} else if (dev->id.coreid == SSB_DEV_USB20_HOST) {
-+		/*
-+		 * USB 2.0 special considerations:
-+		 *
-+		 * 1. Since the core supports both OHCI and EHCI functions, it must
-+		 *    only be reset once.
-+		 *
-+		 * 2. In addition to the standard SSB reset sequence, the Host Control
-+		 *    Register must be programmed to bring the USB core and various
-+		 *    phy components out of reset.
-+		 */
-+		ssb_device_enable(dev, 0);
-+		ssb_write32(dev, 0x200, 0x7ff);
-+		udelay(1);
-+		if (dev->id.revision == 1) { // bug in rev 1
-+
-+			/* Change Flush control reg */
-+			tmp = ssb_read32(dev, 0x400);
-+			tmp &= ~8;
-+			ssb_write32(dev, 0x400, tmp);
-+			tmp = ssb_read32(dev, 0x400);
-+			printk("USB20H fcr: 0x%0x\n", tmp);
-+
-+			/* Change Shim control reg */
-+			tmp = ssb_read32(dev, 0x304);
-+			tmp &= ~0x100;
-+			ssb_write32(dev, 0x304, tmp);
-+			tmp = ssb_read32(dev, 0x304);
-+			printk("USB20H shim: 0x%0x\n", tmp);
-+		}
-+	} else
-+		ssb_device_enable(dev, 0);
- 
- 	hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
- 			dev_name(dev->dev));
-@@ -200,6 +232,7 @@ static int ssb_ohci_resume(struct ssb_de
- static const struct ssb_device_id ssb_ohci_table[] = {
- 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
- 	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
-+	SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB20_HOST, SSB_ANY_REV),
- 	SSB_DEVTABLE_END
- };
- MODULE_DEVICE_TABLE(ssb, ssb_ohci_table);
diff --git a/target/linux/brcm47xx/patches-2.6.34/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.34/260-ohci-set-dma-mask.patch
deleted file mode 100644
index 9627798472..0000000000
--- a/target/linux/brcm47xx/patches-2.6.34/260-ohci-set-dma-mask.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- drivers/usb/host/ohci-ssb.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -106,6 +106,9 @@ static int ssb_ohci_attach(struct ssb_de
- 	int err = -ENOMEM;
- 	u32 tmp, flags = 0;
- 
-+	if (ssb_dma_set_mask(dev, DMA_BIT_MASK(32)))
-+		return -EOPNOTSUPP;
-+
- 	if (dev->id.coreid == SSB_DEV_USB11_HOSTDEV) {
- 		/* Put the device into host-mode. */
- 		flags |= SSB_OHCI_TMSLOW_HOSTMODE;
diff --git a/target/linux/brcm47xx/patches-2.6.34/275-usb2-bcm5354-init.patch b/target/linux/brcm47xx/patches-2.6.34/275-usb2-bcm5354-init.patch
deleted file mode 100644
index 3d8327ebfd..0000000000
--- a/target/linux/brcm47xx/patches-2.6.34/275-usb2-bcm5354-init.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-This patch significantly improves the reliability of high speed 
-usb writes on the bcm5354. It implements a work around for version 2
-of the usb20 core that was cribbed from the GPL sources for the 
-Asus wl500gpv2 and verified against the wl520gu sources.
-
-Reference:
-GPL/WL-520gu-NewUI/src/linux/linux/arch/mips/brcm-boards/bcm947xx/pcibios.c
-GPL/WL-500gPV2-NewUI/src/linux/linux/arch/mips/brcm-boards/bcm947xx/pcibios.c
-
-Signed-off-by: Steve Brown <sbrown@cortland.com>
-
----
- drivers/usb/host/ohci-ssb.c |   37 +++++++++++++++++++++++--------------
- 1 file changed, 23 insertions(+), 14 deletions(-)
-
---- a/drivers/usb/host/ohci-ssb.c
-+++ b/drivers/usb/host/ohci-ssb.c
-@@ -141,22 +141,31 @@ static int ssb_ohci_attach(struct ssb_de
- 		 */
- 		ssb_device_enable(dev, 0);
- 		ssb_write32(dev, 0x200, 0x7ff);
-+
-+		/* Change Flush control reg */
-+		tmp = ssb_read32(dev, 0x400);
-+		tmp &= ~8;
-+		ssb_write32(dev, 0x400, tmp);
-+		tmp = ssb_read32(dev, 0x400);
-+
-+		/* Change Shim control reg */
-+		tmp = ssb_read32(dev, 0x304);
-+		tmp &= ~0x100;
-+		ssb_write32(dev, 0x304, tmp);
-+		tmp = ssb_read32(dev, 0x304);
-+
- 		udelay(1);
--		if (dev->id.revision == 1) { // bug in rev 1
- 
--			/* Change Flush control reg */
--			tmp = ssb_read32(dev, 0x400);
--			tmp &= ~8;
--			ssb_write32(dev, 0x400, tmp);
--			tmp = ssb_read32(dev, 0x400);
--			printk("USB20H fcr: 0x%0x\n", tmp);
--
--			/* Change Shim control reg */
--			tmp = ssb_read32(dev, 0x304);
--			tmp &= ~0x100;
--			ssb_write32(dev, 0x304, tmp);
--			tmp = ssb_read32(dev, 0x304);
--			printk("USB20H shim: 0x%0x\n", tmp);
-+		/* Work around for 5354 failures */
-+		if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
-+			/* Change syn01 reg */
-+			tmp = 0x00fe00fe;
-+			ssb_write32(dev, 0x894, tmp);
-+
-+			/* Change syn03 reg */
-+			tmp = ssb_read32(dev, 0x89c);
-+			tmp |= 0x1;
-+			ssb_write32(dev, 0x89c, tmp);
- 		}
- 	} else
- 		ssb_device_enable(dev, 0);
diff --git a/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch b/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch
index e960dbaccf..10bf131238 100644
--- a/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/301-kmod-fuse-dcache-bug-r4k.patch
@@ -18,7 +18,7 @@
  	unsigned long addr, unsigned long pfn)
  {
  	struct flush_cache_page_args args;
-@@ -1456,3 +1456,10 @@ void __cpuinit r4k_cache_init(void)
+@@ -1469,3 +1469,10 @@ void __cpuinit r4k_cache_init(void)
  	coherency_setup();
  #endif
  }
diff --git a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch
index 16388bea17..2b812a3c83 100644
--- a/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/400-arch-bcm47xx.patch
@@ -1,280 +1,39 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -62,6 +62,7 @@ config BCM47XX
- 	select SSB_DRIVER_MIPS
- 	select SSB_DRIVER_EXTIF
- 	select SSB_EMBEDDED
-+	select SSB_B43_PCI_BRIDGE if PCI
- 	select SSB_PCICORE_HOSTMODE if PCI
- 	select GENERIC_GPIO
- 	select SYS_HAS_EARLY_PRINTK
---- a/arch/mips/bcm47xx/Makefile
-+++ b/arch/mips/bcm47xx/Makefile
-@@ -3,4 +3,4 @@
- # under Linux.
- #
- 
--obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
-+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
---- a/arch/mips/bcm47xx/irq.c
-+++ b/arch/mips/bcm47xx/irq.c
-@@ -1,5 +1,6 @@
- /*
-  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
-+ *  Copyright (C) 2008 Michael Buesch <mb@bu3sch.de>
-  *
-  *  This program is free software; you can redistribute  it and/or modify it
-  *  under  the terms of  the GNU General  Public License as published by the
-@@ -23,10 +24,19 @@
-  */
- 
- #include <linux/types.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
- #include <linux/interrupt.h>
- #include <linux/irq.h>
-+#include <linux/pci.h>
-+#include <linux/ssb/ssb.h>
-+
- #include <asm/irq_cpu.h>
- 
-+
-+extern struct ssb_bus ssb_bcm47xx;
-+
-+
- void plat_irq_dispatch(void)
- {
- 	u32 cause;
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
-@@ -24,10 +24,10 @@
- #include <asm/io.h>
- #include <asm/uaccess.h>
- 
--#include <nvram.h>
-+#include "include/nvram.h"
- 
- #define MB * 1048576
--extern struct ssb_bus ssb;
-+extern struct ssb_bus ssb_bcm47xx;
- 
- static char nvram_buf[NVRAM_SPACE];
- static int cfe_env;
-@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c
- /* Probe for NVRAM header */
- static void __init early_nvram_init(void)
- {
--	struct ssb_mipscore *mcore = &ssb.mipscore;
-+	struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
- 	struct nvram_header *header;
- 	int i;
- 	u32 base, lim, off;
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -2,7 +2,7 @@
-  *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
-  *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
-  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
-- *  Copyright (C) 2006 Michael Buesch <mb@bu3sch.de>
-+ *  Copyright (C) 2006-2008 Michael Buesch <mb@bu3sch.de>
-  *
-  *  This program is free software; you can redistribute  it and/or modify it
-  *  under  the terms of  the GNU General  Public License as published by the
-@@ -25,18 +25,28 @@
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include <linux/init.h>
- #include <linux/types.h>
- #include <linux/ssb/ssb.h>
- #include <linux/ssb/ssb_embedded.h>
-+#include <linux/tty.h>
-+#include <linux/serial.h>
-+#include <linux/serial_core.h>
-+#include <linux/serial_reg.h>
-+#include <linux/serial_8250.h>
- #include <asm/bootinfo.h>
- #include <asm/reboot.h>
- #include <asm/time.h>
--#include <bcm47xx.h>
- #include <asm/fw/cfe/cfe_api.h>
-+#include <linux/pm.h>
-+
-+#include "include/nvram.h"
- 
- struct ssb_bus ssb_bcm47xx;
- EXPORT_SYMBOL(ssb_bcm47xx);
- 
-+extern void bcm47xx_pci_init(void);
-+
- static void bcm47xx_machine_restart(char *command)
- {
- 	printk(KERN_ALERT "Please stand by while rebooting the system...\n");
-@@ -56,7 +66,7 @@ static void bcm47xx_machine_halt(void)
- 		cpu_relax();
- }
- 
--static void str2eaddr(char *str, char *dest)
-+static void e_aton(char *str, char *dest)
- {
- 	int i = 0;
- 
-@@ -73,51 +83,142 @@ static void str2eaddr(char *str, char *d
- 	}
+@@ -92,3 +92,30 @@ int nvram_getenv(char *name, char *val, 
+ 	return 1;
  }
- 
--static int bcm47xx_get_invariants(struct ssb_bus *bus,
--				   struct ssb_init_invariants *iv)
-+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
-+{
-+	char *s;
-+
-+	memset(sprom, 0xFF, sizeof(struct ssb_sprom));
-+
-+	sprom->revision = 1;
-+	if ((s = nvram_get("il0macaddr")))
-+		e_aton(s, sprom->il0mac);
-+	if ((s = nvram_get("et0macaddr")))
-+		e_aton(s, sprom->et0mac);
-+	if ((s = nvram_get("et1macaddr")))
-+		e_aton(s, sprom->et1mac);
-+	if ((s = nvram_get("et0phyaddr")))
-+		sprom->et0phyaddr = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("et1phyaddr")))
-+		sprom->et1phyaddr = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("et0mdcport")))
-+		sprom->et0mdcport = !!simple_strtoul(s, NULL, 10);
-+	if ((s = nvram_get("et1mdcport")))
-+		sprom->et1mdcport = !!simple_strtoul(s, NULL, 10);
-+	if ((s = nvram_get("pa0b0")))
-+		sprom->pa0b0 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0b1")))
-+		sprom->pa0b1 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0b2")))
-+		sprom->pa0b2 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1b0")))
-+		sprom->pa1b0 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1b1")))
-+		sprom->pa1b1 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1b2")))
-+		sprom->pa1b2 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio0")))
-+		sprom->gpio0 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio1")))
-+		sprom->gpio1 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio2")))
-+		sprom->gpio2 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("wl0gpio3")))
-+		sprom->gpio3 = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0maxpwr")))
-+		sprom->maxpwr_bg = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1maxpwr")))
-+		sprom->maxpwr_a = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa0itssit")))
-+		sprom->itssi_bg = simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("pa1itssit")))
-+		sprom->itssi_a = simple_strtoul(s, NULL, 0);
-+	sprom->boardflags_lo = 0;
-+	if ((s = nvram_get("boardflags")))
-+		sprom->boardflags_lo = simple_strtoul(s, NULL, 0);
-+	sprom->boardflags_hi = 0;
-+	if ((s = nvram_get("boardflags2")))
-+		sprom->boardflags_hi = simple_strtoul(s, NULL, 0);
-+}
+ EXPORT_SYMBOL(nvram_getenv);
 +
-+static int bcm47xx_get_invariants(struct ssb_bus *bus, struct ssb_init_invariants *iv)
- {
--	char buf[100];
-+	char *s;
-+
-+	iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
-+	if ((s = nvram_get("boardtype")))
-+		iv->boardinfo.type = (u16)simple_strtoul(s, NULL, 0);
-+	if ((s = nvram_get("boardrev")))
-+		iv->boardinfo.rev = (u16)simple_strtoul(s, NULL, 0);
- 
--	/* Fill boardinfo structure */
--	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
-+	bcm47xx_fill_sprom(&iv->sprom);
- 
--	if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
--	if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
--	if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
--
--	/* Fill sprom structure */
--	memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));
--	iv->sprom.revision = 3;
--
--	if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
--		str2eaddr(buf, iv->sprom.et0mac);
--	if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
--		str2eaddr(buf, iv->sprom.et1mac);
--	if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
--		iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 10);
--	if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
--		iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 10);
--	if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
--		iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);
--	if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
--		iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
-+	if ((s = nvram_get("cardbus")))
-+		iv->has_cardbus_slot = !!simple_strtoul(s, NULL, 10);
- 
- 	return 0;
- }
- 
- void __init plat_mem_setup(void)
- {
--	int err;
-+	int i, err;
-+	char *s;
-+	struct ssb_mipscore *mcore;
-+
-+	err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE, bcm47xx_get_invariants);
-+	if (err) {
-+		const char *msg = "Failed to initialize SSB bus (err %d)\n";
-+		printk(msg, err); /* Make sure the message gets out of the box. */
-+		panic(msg, err);
-+	}
-+	mcore = &ssb_bcm47xx.mipscore;
- 
--	err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
--				      bcm47xx_get_invariants);
--	if (err)
--		panic("Failed to initialize SSB bus (err %d)\n", err);
-+	s = nvram_get("kernel_args");
-+	if (s && !strncmp(s, "console=ttyS1", 13)) {
-+		struct ssb_serial_port port;
-+
-+		printk("Swapping serial ports!\n");
-+		/* swap serial ports */
-+		memcpy(&port, &mcore->serial_ports[0], sizeof(port));
-+		memcpy(&mcore->serial_ports[0], &mcore->serial_ports[1], sizeof(port));
-+		memcpy(&mcore->serial_ports[1], &port, sizeof(port));
++char *nvram_get(const char *name)
++{
++	char *var, *value, *end, *eq;
++
++	if (!name)
++		return NULL;
++
++	if (!nvram_buf[0])
++		early_nvram_init();
++
++	/* Look for name=value and return value */
++	var = &nvram_buf[sizeof(struct nvram_header)];
++	end = nvram_buf + sizeof(nvram_buf) - 2;
++	end[0] = end[1] = '\0';
++	for (; *var; var = value + strlen(value) + 1) {
++		if (!(eq = strchr(var, '=')))
++			break;
++		value = eq + 1;
++		if ((eq - var) == strlen(name) && strncmp(var, name, (eq - var)) == 0)
++			return value;
 +	}
 +
-+	for (i = 0; i < mcore->nr_serial_ports; i++) {
-+		struct ssb_serial_port *port = &(mcore->serial_ports[i]);
-+		struct uart_port s;
-+
-+		memset(&s, 0, sizeof(s));
-+		s.line = i;
-+		s.mapbase = (unsigned int) port->regs;
-+		s.membase = port->regs;
-+		s.irq = port->irq + 2;
-+		s.uartclk = port->baud_base;
-+		s.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
-+		s.iotype = SERIAL_IO_MEM;
-+		s.regshift = port->reg_shift;
++	return NULL;
++}
 +
-+		early_serial_setup(&s);
-+	}
-+	printk("Serial init done.\n");
- 
- 	_machine_restart = bcm47xx_machine_restart;
++EXPORT_SYMBOL(nvram_get);
+--- a/arch/mips/bcm47xx/setup.c
++++ b/arch/mips/bcm47xx/setup.c
+@@ -226,3 +226,20 @@ void __init plat_mem_setup(void)
  	_machine_halt = bcm47xx_machine_halt;
  	pm_power_off = bcm47xx_machine_halt;
  }
@@ -295,25 +54,3 @@
 +	return 0;
 +}
 +device_initcall(bcm47xx_register_gpiodev);
---- a/arch/mips/bcm47xx/time.c
-+++ b/arch/mips/bcm47xx/time.c
-@@ -22,11 +22,17 @@
-  *  675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--
- #include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/serial_reg.h>
-+#include <linux/interrupt.h>
- #include <linux/ssb/ssb.h>
-+#include <asm/addrspace.h>
-+#include <asm/io.h>
- #include <asm/time.h>
--#include <bcm47xx.h>
-+
-+extern struct ssb_bus ssb_bcm47xx;
- 
- void __init plat_time_init(void)
- {
diff --git a/target/linux/brcm47xx/patches-2.6.34/800-fix_cfe_detection.patch b/target/linux/brcm47xx/patches-2.6.34/800-fix_cfe_detection.patch
deleted file mode 100644
index a298055708..0000000000
--- a/target/linux/brcm47xx/patches-2.6.34/800-fix_cfe_detection.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- a/arch/mips/bcm47xx/prom.c
-+++ b/arch/mips/bcm47xx/prom.c
-@@ -32,6 +32,7 @@
- #include <asm/fw/cfe/cfe_error.h>
- 
- static int cfe_cons_handle;
-+static void (* __prom_putchar)(char c);
- 
- const char *get_system_type(void)
- {
-@@ -40,65 +41,40 @@ const char *get_system_type(void)
- 
- void prom_putchar(char c)
- {
-+	if (__prom_putchar)
-+		__prom_putchar(c);
-+}
-+
-+void prom_putchar_cfe(char c)
-+{
- 	while (cfe_write(cfe_cons_handle, &c, 1) == 0)
- 		;
- }
- 
--static __init void prom_init_cfe(void)
-+static __init int prom_init_cfe(void)
- {
- 	uint32_t cfe_ept;
- 	uint32_t cfe_handle;
- 	uint32_t cfe_eptseal;
--	int argc = fw_arg0;
--	char **envp = (char **) fw_arg2;
--	int *prom_vec = (int *) fw_arg3;
--
--	/*
--	 * Check if a loader was used; if NOT, the 4 arguments are
--	 * what CFE gives us (handle, 0, EPT and EPTSEAL)
--	 */
--	if (argc < 0) {
--		cfe_handle = (uint32_t)argc;
--		cfe_ept = (uint32_t)envp;
--		cfe_eptseal = (uint32_t)prom_vec;
--	} else {
--		if ((int)prom_vec < 0) {
--			/*
--			 * Old loader; all it gives us is the handle,
--			 * so use the "known" entrypoint and assume
--			 * the seal.
--			 */
--			cfe_handle = (uint32_t)prom_vec;
--			cfe_ept = 0xBFC00500;
--			cfe_eptseal = CFE_EPTSEAL;
--		} else {
--			/*
--			 * Newer loaders bundle the handle/ept/eptseal
--			 * Note: prom_vec is in the loader's useg
--			 * which is still alive in the TLB.
--			 */
--			cfe_handle = prom_vec[0];
--			cfe_ept = prom_vec[2];
--			cfe_eptseal = prom_vec[3];
--		}
--	}
- 
--	if (cfe_eptseal != CFE_EPTSEAL) {
--		/* too early for panic to do any good */
--		printk(KERN_ERR "CFE's entrypoint seal doesn't match.");
--		while (1) ;
--	}
-+	cfe_eptseal = (uint32_t) fw_arg3;
-+	cfe_handle = (uint32_t) fw_arg0;
-+	cfe_ept = (uint32_t) fw_arg2;
-+
-+	if (cfe_eptseal != CFE_EPTSEAL)
-+		return -1;
- 
- 	cfe_init(cfe_handle, cfe_ept);
-+	return 0;
- }
- 
--static __init void prom_init_console(void)
-+static __init void prom_init_console_cfe(void)
- {
- 	/* Initialize CFE console */
- 	cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
- }
- 
--static __init void prom_init_cmdline(void)
-+static __init void prom_init_cmdline_cfe(void)
- {
- 	static char buf[COMMAND_LINE_SIZE] __initdata;
- 
-@@ -160,9 +136,12 @@ static __init void prom_init_mem(void)
- 
- void __init prom_init(void)
- {
--	prom_init_cfe();
--	prom_init_console();
--	prom_init_cmdline();
-+	if (prom_init_cfe() == 0) {
-+		//prom_init_console_cfe();
-+		//prom_init_cmdline_cfe();
-+		__prom_putchar = prom_putchar_cfe;
-+	}
-+
- 	prom_init_mem();
- }
- 
diff --git a/target/linux/brcm47xx/patches-2.6.34/812-disable_wgt634u_crap.patch b/target/linux/brcm47xx/patches-2.6.34/812-disable_wgt634u_crap.patch
index 846c770182..a0331399d3 100644
--- a/target/linux/brcm47xx/patches-2.6.34/812-disable_wgt634u_crap.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/812-disable_wgt634u_crap.patch
@@ -4,8 +4,8 @@
  # under Linux.
  #
  
--obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
-+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o
+-obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
++obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o
 --- a/arch/mips/bcm47xx/wgt634u.c
 +++ /dev/null
 @@ -1,166 +0,0 @@
diff --git a/target/linux/brcm47xx/patches-2.6.34/900-disable_early_printk.patch b/target/linux/brcm47xx/patches-2.6.34/900-disable_early_printk.patch
deleted file mode 100644
index c5fb54bc80..0000000000
--- a/target/linux/brcm47xx/patches-2.6.34/900-disable_early_printk.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -65,7 +65,6 @@ config BCM47XX
- 	select SSB_B43_PCI_BRIDGE if PCI
- 	select SSB_PCICORE_HOSTMODE if PCI
- 	select GENERIC_GPIO
--	select SYS_HAS_EARLY_PRINTK
- 	select CFE
- 	help
- 	 Support for BCM47XX based boards
diff --git a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
index be266e206f..fc64b5c926 100644
--- a/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/940-bcm47xx-yenta.patch
@@ -17,7 +17,7 @@
  
  	mask = probe_irq_mask(val) & 0xffff;
  
-@@ -1022,6 +1025,10 @@ static void yenta_get_socket_capabilitie
+@@ -1023,6 +1026,10 @@ static void yenta_get_socket_capabilitie
  	else
  		socket->socket.irq_mask = 0;
  
@@ -28,7 +28,7 @@
  	dev_printk(KERN_INFO, &socket->dev->dev,
  		   "ISA IRQ mask 0x%04x, PCI irq %d\n",
  		   socket->socket.irq_mask, socket->cb_irq);
-@@ -1260,6 +1267,15 @@ static int __devinit yenta_probe(struct 
+@@ -1261,6 +1268,15 @@ static int __devinit yenta_probe(struct 
  	dev_printk(KERN_INFO, &dev->dev,
  		   "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
  
diff --git a/target/linux/brcm47xx/patches-2.6.34/999-wl_exports.patch b/target/linux/brcm47xx/patches-2.6.34/999-wl_exports.patch
index e1d6e85050..ecc796aaff 100644
--- a/target/linux/brcm47xx/patches-2.6.34/999-wl_exports.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/999-wl_exports.patch
@@ -1,16 +1,15 @@
 --- a/arch/mips/bcm47xx/nvram.c
 +++ b/arch/mips/bcm47xx/nvram.c
-@@ -29,7 +29,9 @@
- #define MB * 1048576
- extern struct ssb_bus ssb_bcm47xx;
+@@ -20,7 +20,8 @@
+ #include <asm/mach-bcm47xx/nvram.h>
+ #include <asm/mach-bcm47xx/bcm47xx.h>
  
 -static char nvram_buf[NVRAM_SPACE];
 +char nvram_buf[NVRAM_SPACE];
 +EXPORT_SYMBOL(nvram_buf);
-+
- static int cfe_env;
- extern char *cfe_env_get(char *nv_buf, const char *name);
- 		
+ 
+ /* Probe for NVRAM header */
+ static void __init early_nvram_init(void)
 --- a/arch/mips/mm/cache.c
 +++ b/arch/mips/mm/cache.c
 @@ -52,6 +52,7 @@ void (*_dma_cache_wback)(unsigned long s