brcm47xx: reorder patches so that the patches already in mainline linux will be applied at first.

SVN-Revision: 32845

1 files changed, 0 insertions, 46 deletions

diff --git a/target/linux/brcm47xx/patches-3.3/251-MIPS-bcm47xx-refactor-fetching-board-data.patch b/target/linux/brcm47xx/patches-3.3/251-MIPS-bcm47xx-refactor-fetching-board-data.patch
deleted file mode 100644
index a50cd8c..0000000
--- a/target/linux/brcm47xx/patches-3.3/251-MIPS-bcm47xx-refactor-fetching-board-data.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/arch/mips/bcm47xx/setup.c
-+++ b/arch/mips/bcm47xx/setup.c
-@@ -157,12 +157,7 @@ static int bcm47xx_get_invariants(struct
- 	/* Fill boardinfo structure */
- 	memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
- 
--	if (nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.vendor = (u16)simple_strtoul(buf, NULL, 0);
--	else
--		iv->boardinfo.vendor = SSB_BOARDVENDOR_BCM;
--	if (nvram_getenv("boardtype", buf, sizeof(buf)) >= 0)
--		iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
-+	bcm47xx_fill_ssb_boardinfo(&iv->boardinfo, NULL);
- 
- 	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
- 	bcm47xx_fill_sprom(&iv->sprom, NULL);
---- a/arch/mips/bcm47xx/sprom.c
-+++ b/arch/mips/bcm47xx/sprom.c
-@@ -616,3 +616,15 @@ void bcm47xx_fill_sprom(struct ssb_sprom
- 		bcm47xx_fill_sprom_r1(sprom, prefix);
- 	}
- }
-+
-+#ifdef CONFIG_BCM47XX_SSB
-+void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
-+				const char *prefix)
-+{
-+	nvram_read_u16(prefix, NULL, "boardvendor", &boardinfo->vendor, 0);
-+	if (!boardinfo->vendor)
-+		boardinfo->vendor = SSB_BOARDVENDOR_BCM;
-+
-+	nvram_read_u16(prefix, NULL, "boardtype", &boardinfo->type, 0);
-+}
-+#endif
---- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-@@ -47,4 +47,9 @@ extern enum bcm47xx_bus_type bcm47xx_bus
- void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix);
- void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, const char *prefix);
- 
-+#ifdef CONFIG_BCM47XX_SSB
-+void bcm47xx_fill_ssb_boardinfo(struct ssb_boardinfo *boardinfo,
-+				const char *prefix);
-+#endif
-+
- #endif /* __ASM_BCM47XX_H */