From: hauke Date: Wed, 22 Dec 2010 19:42:37 +0000 (+0000) Subject: brcm47xx: refresh patches with kernel 2.6.37-rc7 X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/9e9c3a17987f85c12728c638bebbdb5c2871962b?ds=sidebyside brcm47xx: refresh patches with kernel 2.6.37-rc7 The deleted patches went upstream in 2.6.37-rc7 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24803 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch b/target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch deleted file mode 100644 index b2bdf744c..000000000 --- a/target/linux/brcm47xx/patches-2.6.37/010-MIPS-BCM47xx-Do-not-read-config-from-CFE.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 12b15e5d5914d174e3411d0f0b3fd55dc1b5e55a Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 27 Nov 2010 00:34:02 +0100 -Subject: [PATCH 1/6] MIPS: BCM47xx: Do not read config from CFE - -The config options read out here are not stored in CFE, but only in -NVRAM on the devices. Remove reading from CFE and only access the NVRAM. -Reading out CFE does not harm, but is useless here. - -Signed-off-by: Hauke Mehrtens ---- - arch/mips/bcm47xx/setup.c | 28 +++++++++------------------- - 1 files changed, 9 insertions(+), 19 deletions(-) - ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - #include - - struct ssb_bus ssb_bcm47xx; -@@ -82,42 +81,33 @@ 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) -+ if (nvram_getenv("boardvendor", 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) -+ if (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) - 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) -+ if (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) -+ if (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) -+ if (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) -+ if (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) -+ if (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) -+ if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0) - iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10); - - return 0; diff --git a/target/linux/brcm47xx/patches-2.6.37/011-MIPS-BCM47xx-Fill-values-for-b43-into-ssb-sprom.patch b/target/linux/brcm47xx/patches-2.6.37/011-MIPS-BCM47xx-Fill-values-for-b43-into-ssb-sprom.patch deleted file mode 100644 index 74b0da1ca..000000000 --- a/target/linux/brcm47xx/patches-2.6.37/011-MIPS-BCM47xx-Fill-values-for-b43-into-ssb-sprom.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 4f95d9875b74bbf804a3a83f2c3c5e2068c3f857 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 27 Nov 2010 00:44:58 +0100 -Subject: [PATCH 2/6] MIPS: BCM47xx: Fill values for b43 into ssb sprom - -Fill the sprom with all available values from the nvram. Most of these -new values are needed for the b43 or b43legacy driver. - -Some parts of this patch have been in OpenWRT for a long time and were -made by Michael Buesch. - -Signed-off-by: Hauke Mehrtens ---- - arch/mips/bcm47xx/setup.c | 114 ++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 92 insertions(+), 22 deletions(-) - ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -73,42 +73,112 @@ static void str2eaddr(char *str, char *d - } - } - -+#define READ_FROM_NVRAM(_outvar, name, buf) \ -+ if (nvram_getenv(name, buf, sizeof(buf)) >= 0)\ -+ sprom->_outvar = simple_strtoul(buf, NULL, 0); -+ -+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom) -+{ -+ char buf[100]; -+ u32 boardflags; -+ -+ memset(sprom, 0, sizeof(struct ssb_sprom)); -+ -+ sprom->revision = 1; /* Fallback: Old hardware does not define this. */ -+ READ_FROM_NVRAM(revision, "sromrev", buf); -+ if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0) -+ str2eaddr(buf, sprom->il0mac); -+ if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0) -+ str2eaddr(buf, sprom->et0mac); -+ if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0) -+ str2eaddr(buf, sprom->et1mac); -+ READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf); -+ READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf); -+ READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf); -+ READ_FROM_NVRAM(et1mdcport, "et1mdcport", buf); -+ READ_FROM_NVRAM(board_rev, "boardrev", buf); -+ READ_FROM_NVRAM(country_code, "ccode", buf); -+ READ_FROM_NVRAM(ant_available_a, "aa5g", buf); -+ READ_FROM_NVRAM(ant_available_bg, "aa2g", buf); -+ READ_FROM_NVRAM(pa0b0, "pa0b0", buf); -+ READ_FROM_NVRAM(pa0b1, "pa0b1", buf); -+ READ_FROM_NVRAM(pa0b2, "pa0b2", buf); -+ READ_FROM_NVRAM(pa1b0, "pa1b0", buf); -+ READ_FROM_NVRAM(pa1b1, "pa1b1", buf); -+ READ_FROM_NVRAM(pa1b2, "pa1b2", buf); -+ READ_FROM_NVRAM(pa1lob0, "pa1lob0", buf); -+ READ_FROM_NVRAM(pa1lob2, "pa1lob1", buf); -+ READ_FROM_NVRAM(pa1lob1, "pa1lob2", buf); -+ READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf); -+ READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf); -+ READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf); -+ READ_FROM_NVRAM(gpio0, "wl0gpio0", buf); -+ READ_FROM_NVRAM(gpio1, "wl0gpio1", buf); -+ READ_FROM_NVRAM(gpio2, "wl0gpio2", buf); -+ READ_FROM_NVRAM(gpio3, "wl0gpio3", buf); -+ READ_FROM_NVRAM(maxpwr_bg, "pa0maxpwr", buf); -+ READ_FROM_NVRAM(maxpwr_al, "pa1lomaxpwr", buf); -+ READ_FROM_NVRAM(maxpwr_a, "pa1maxpwr", buf); -+ READ_FROM_NVRAM(maxpwr_ah, "pa1himaxpwr", buf); -+ READ_FROM_NVRAM(itssi_a, "pa1itssit", buf); -+ READ_FROM_NVRAM(itssi_bg, "pa0itssit", buf); -+ READ_FROM_NVRAM(tri2g, "tri2g", buf); -+ READ_FROM_NVRAM(tri5gl, "tri5gl", buf); -+ READ_FROM_NVRAM(tri5g, "tri5g", buf); -+ READ_FROM_NVRAM(tri5gh, "tri5gh", buf); -+ READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf); -+ READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf); -+ READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf); -+ READ_FROM_NVRAM(rssismc2g, "rssismc2g", buf); -+ READ_FROM_NVRAM(rssismf2g, "rssismf2g", buf); -+ READ_FROM_NVRAM(bxa2g, "bxa2g", buf); -+ READ_FROM_NVRAM(rssisav5g, "rssisav5g", buf); -+ READ_FROM_NVRAM(rssismc5g, "rssismc5g", buf); -+ READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf); -+ READ_FROM_NVRAM(bxa5g, "bxa5g", buf); -+ READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf); -+ READ_FROM_NVRAM(ofdm2gpo, "ofdm2gpo", buf); -+ READ_FROM_NVRAM(ofdm5glpo, "ofdm5glpo", buf); -+ READ_FROM_NVRAM(ofdm5gpo, "ofdm5gpo", buf); -+ READ_FROM_NVRAM(ofdm5ghpo, "ofdm5ghpo", buf); -+ -+ if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) { -+ boardflags = simple_strtoul(buf, NULL, 0); -+ if (boardflags) { -+ sprom->boardflags_lo = (boardflags & 0x0000FFFFU); -+ sprom->boardflags_hi = (boardflags & 0xFFFF0000U) >> 16; -+ } -+ } -+ if (nvram_getenv("boardflags2", buf, sizeof(buf)) >= 0) { -+ boardflags = simple_strtoul(buf, NULL, 0); -+ if (boardflags) { -+ sprom->boardflags2_lo = (boardflags & 0x0000FFFFU); -+ sprom->boardflags2_hi = (boardflags & 0xFFFF0000U) >> 16; -+ } -+ } -+} -+ - static int bcm47xx_get_invariants(struct ssb_bus *bus, - struct ssb_init_invariants *iv) - { -- char buf[100]; -+ char buf[20]; - - /* Fill boardinfo structure */ - memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo)); - - if (nvram_getenv("boardvendor", buf, sizeof(buf)) >= 0) -- iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 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); - if (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 (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, iv->sprom.et0mac); -- -- if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, iv->sprom.et1mac); -- -- if (nvram_getenv("et0phyaddr", buf, sizeof(buf)) >= 0) -- iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 0); -- -- if (nvram_getenv("et1phyaddr", buf, sizeof(buf)) >= 0) -- iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 0); -- -- if (nvram_getenv("et0mdcport", buf, sizeof(buf)) >= 0) -- iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10); -+ bcm47xx_fill_sprom(&iv->sprom); - -- if (nvram_getenv("et1mdcport", buf, sizeof(buf)) >= 0) -- iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10); -+ if (nvram_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.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch b/target/linux/brcm47xx/patches-2.6.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch deleted file mode 100644 index d4321c3a8..000000000 --- a/target/linux/brcm47xx/patches-2.6.37/012-MIPS-BCM47xx-Use-sscanf-for-parsing-mac-address.patch +++ /dev/null @@ -1,76 +0,0 @@ -From f52926174040418e26112cd0ba36afd8bb066928 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 27 Nov 2010 14:02:49 +0100 -Subject: [PATCH 3/6] MIPS: BCM47xx: Use sscanf for parsing mac address - -Instead of writing out own function for parsing the mac address we now -use sscanf. - -Signed-off-by: Hauke Mehrtens ---- - arch/mips/bcm47xx/setup.c | 23 +++-------------------- - arch/mips/include/asm/mach-bcm47xx/nvram.h | 7 +++++++ - 2 files changed, 10 insertions(+), 20 deletions(-) - ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -56,23 +56,6 @@ static void bcm47xx_machine_halt(void) - cpu_relax(); - } - --static void str2eaddr(char *str, char *dest) --{ -- int i = 0; -- -- if (str == NULL) { -- memset(dest, 0, 6); -- return; -- } -- -- for (;;) { -- dest[i++] = (char) simple_strtoul(str, NULL, 16); -- str += 2; -- if (!*str++ || i == 6) -- break; -- } --} -- - #define READ_FROM_NVRAM(_outvar, name, buf) \ - if (nvram_getenv(name, buf, sizeof(buf)) >= 0)\ - sprom->_outvar = simple_strtoul(buf, NULL, 0); -@@ -87,11 +70,11 @@ static void bcm47xx_fill_sprom(struct ss - sprom->revision = 1; /* Fallback: Old hardware does not define this. */ - READ_FROM_NVRAM(revision, "sromrev", buf); - if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, sprom->il0mac); -+ nvram_parse_macaddr(buf, sprom->il0mac); - if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, sprom->et0mac); -+ nvram_parse_macaddr(buf, sprom->et0mac); - if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0) -- str2eaddr(buf, sprom->et1mac); -+ nvram_parse_macaddr(buf, sprom->et1mac); - READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf); - READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf); - READ_FROM_NVRAM(et0mdcport, "et0mdcport", buf); ---- a/arch/mips/include/asm/mach-bcm47xx/nvram.h -+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h -@@ -12,6 +12,7 @@ - #define __NVRAM_H - - #include -+#include - - struct nvram_header { - u32 magic; -@@ -36,4 +37,10 @@ struct nvram_header { - - extern int nvram_getenv(char *name, char *val, size_t val_len); - -+static inline void nvram_parse_macaddr(char *buf, u8 *macaddr) -+{ -+ sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1], -+ &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]); -+} -+ - #endif diff --git a/target/linux/brcm47xx/patches-2.6.37/013-MIPS-BCM47xx-Swap-serial-console-if-ttyS1-was-specif.patch b/target/linux/brcm47xx/patches-2.6.37/013-MIPS-BCM47xx-Swap-serial-console-if-ttyS1-was-specif.patch deleted file mode 100644 index e6a0d526b..000000000 --- a/target/linux/brcm47xx/patches-2.6.37/013-MIPS-BCM47xx-Swap-serial-console-if-ttyS1-was-specif.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 25abc0cde3f4865910b380d68ffda0916b5870e7 Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 27 Nov 2010 12:25:21 +0100 -Subject: [PATCH 4/6] MIPS: BCM47xx: Swap serial console if ttyS1 was specified. - -Some devices like the Netgear WGT634U are using ttyS1 for default -console output. We should switch to that console if it was given in -the kernel_args parameters. - -Signed-off-by: Hauke Mehrtens ---- - arch/mips/bcm47xx/setup.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - ---- a/arch/mips/bcm47xx/setup.c -+++ b/arch/mips/bcm47xx/setup.c -@@ -169,12 +169,28 @@ static int bcm47xx_get_invariants(struct - void __init plat_mem_setup(void) - { - int 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; -+ if (nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { -+ if (strstr(buf, "console=ttyS1")) { -+ struct ssb_serial_port port; -+ -+ printk(KERN_DEBUG "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)); -+ } -+ } -+ - _machine_restart = bcm47xx_machine_restart; - _machine_halt = bcm47xx_machine_halt; - pm_power_off = bcm47xx_machine_halt; diff --git a/target/linux/brcm47xx/patches-2.6.37/016-MIPS-BCM47xx-Remove-CFE-console.patch b/target/linux/brcm47xx/patches-2.6.37/016-MIPS-BCM47xx-Remove-CFE-console.patch index 6dcaa2ce3..ec3d046f9 100644 --- a/target/linux/brcm47xx/patches-2.6.37/016-MIPS-BCM47xx-Remove-CFE-console.patch +++ b/target/linux/brcm47xx/patches-2.6.37/016-MIPS-BCM47xx-Remove-CFE-console.patch @@ -16,7 +16,7 @@ Signed-off-by: Hauke Mehrtens --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -80,7 +80,6 @@ config BCM47XX +@@ -82,7 +82,6 @@ config BCM47XX select SSB_B43_PCI_BRIDGE if PCI select SSB_PCICORE_HOSTMODE if PCI select GENERIC_GPIO diff --git a/target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch b/target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch deleted file mode 100644 index 049de9dca..000000000 --- a/target/linux/brcm47xx/patches-2.6.37/017-MIPS-BCM47xx-bmips4kc_fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1ff5904f725e9816b5ff2b5ade1d6326558d8e01 Mon Sep 17 00:00:00 2001 -From: Kevin Cernekee -To: Ralf Baechle -Cc: , -Date: Mon, 22 Nov 2010 21:41:28 -0800 -Subject: [PATCH 7/7] MIPS: Fix regression on BCM4710 processor detection - -BCM4710 uses the BMIPS32 core (like BCM6345), not the MIPS 4Kc core as -was previously believed. - -Signed-off-by: Kevin Cernekee ---- - arch/mips/include/asm/cpu.h | 4 ++-- - arch/mips/kernel/cpu-probe.c | 7 ++----- - 2 files changed, 4 insertions(+), 7 deletions(-) - ---- a/arch/mips/include/asm/cpu.h -+++ b/arch/mips/include/asm/cpu.h -@@ -111,8 +111,8 @@ - * These are the PRID's for when 23:16 == PRID_COMP_BROADCOM - */ - --#define PRID_IMP_BMIPS4KC 0x4000 --#define PRID_IMP_BMIPS32 0x8000 -+#define PRID_IMP_BMIPS32_REV4 0x4000 -+#define PRID_IMP_BMIPS32_REV8 0x8000 - #define PRID_IMP_BMIPS3300 0x9000 - #define PRID_IMP_BMIPS3300_ALT 0x9100 - #define PRID_IMP_BMIPS3300_BUG 0x0000 ---- a/arch/mips/kernel/cpu-probe.c -+++ b/arch/mips/kernel/cpu-probe.c -@@ -905,7 +905,8 @@ static inline void cpu_probe_broadcom(st - { - decode_configs(c); - switch (c->processor_id & 0xff00) { -- case PRID_IMP_BMIPS32: -+ case PRID_IMP_BMIPS32_REV4: -+ case PRID_IMP_BMIPS32_REV8: - c->cputype = CPU_BMIPS32; - __cpu_name[cpu] = "Broadcom BMIPS32"; - break; -@@ -933,10 +934,6 @@ static inline void cpu_probe_broadcom(st - __cpu_name[cpu] = "Broadcom BMIPS5000"; - c->options |= MIPS_CPU_ULRI; - break; -- case PRID_IMP_BMIPS4KC: -- c->cputype = CPU_4KC; -- __cpu_name[cpu] = "MIPS 4Kc"; -- break; - } - } - diff --git a/target/linux/brcm47xx/patches-2.6.37/031-sb-fix-nvram_get-on-bcm47xx-platform.patch b/target/linux/brcm47xx/patches-2.6.37/031-sb-fix-nvram_get-on-bcm47xx-platform.patch deleted file mode 100644 index a6f98ee4c..000000000 --- a/target/linux/brcm47xx/patches-2.6.37/031-sb-fix-nvram_get-on-bcm47xx-platform.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 99dfec6e793651963ede3c2721b9ff3c81e3aeac Mon Sep 17 00:00:00 2001 -From: Hauke Mehrtens -Date: Sat, 27 Nov 2010 14:04:36 +0100 -Subject: [PATCH 6/6] sb: fix nvram_get on bcm47xx platform - -The nvram_get function was never in the mainline kernel, it only -existed in an external OpenWrt patch. Use nvram_getenv function, which -is in mainline and use an include instead of an extra function -declaration. -et0macaddr contains the mac address in text from like -00:11:22:33:44:55. We have to parse it before adding it into macaddr. - -nvram_parse_macaddr will be merged into asm/mach-bcm47xx/nvram.h though -the MIPS git tree and will be available soon. It will not build now -without nvram_parse_macaddr, but it haven't done before. - -Signed-off-by: Hauke Mehrtens ---- - include/linux/ssb/ssb_driver_gige.h | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) - ---- a/include/linux/ssb/ssb_driver_gige.h -+++ b/include/linux/ssb/ssb_driver_gige.h -@@ -96,16 +96,21 @@ static inline bool ssb_gige_must_flush_p - return 0; - } - --extern char * nvram_get(const char *name); -+#ifdef CONFIG_BCM47XX -+#include - /* Get the device MAC address */ - static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) - { --#ifdef CONFIG_BCM47XX -- char *res = nvram_get("et0macaddr"); -- if (res) -- memcpy(macaddr, res, 6); --#endif -+ char buf[20]; -+ if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0) -+ return; -+ nvram_parse_macaddr(buf, macaddr); - } -+#else -+static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr) -+{ -+} -+#endif - - extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev, - struct pci_dev *pdev);