diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2013-06-12 14:48:45 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-06-12 14:48:45 +0000 |
commit | 639a356c069b37f3309fdb6622bc2ce1f7059001 (patch) | |
tree | fa2bbc1953db33ea6b97ff260251a4ffb117c776 /target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch | |
parent | 7a79a9e8f6544681f2352a27d15929340f3a2bd8 (diff) | |
download | upstream-639a356c069b37f3309fdb6622bc2ce1f7059001.tar.gz upstream-639a356c069b37f3309fdb6622bc2ce1f7059001.tar.bz2 upstream-639a356c069b37f3309fdb6622bc2ce1f7059001.zip |
brcm47xx: remove support for kernel 3.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36927 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch b/target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch deleted file mode 100644 index abfa4004f2..0000000000 --- a/target/linux/brcm47xx/patches-3.6/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/arch/mips/bcm47xx/prom.c -+++ b/arch/mips/bcm47xx/prom.c -@@ -32,10 +32,35 @@ - #include <asm/bootinfo.h> - #include <asm/fw/cfe/cfe_api.h> - #include <asm/fw/cfe/cfe_error.h> -+#include <bcm47xx.h> -+#include <bcm47xx_board.h> -+ -+static u16 get_chip_id(void) -+{ -+ switch (bcm47xx_bus_type) { -+#ifdef CONFIG_BCM47XX_SSB -+ case BCM47XX_BUS_TYPE_SSB: -+ return bcm47xx_bus.ssb.chip_id; -+#endif -+#ifdef CONFIG_BCM47XX_BCMA -+ case BCM47XX_BUS_TYPE_BCMA: -+ return bcm47xx_bus.bcma.bus.chipinfo.id; -+#endif -+ } -+ return 0; -+} - - const char *get_system_type(void) - { -- return "Broadcom BCM47XX"; -+ static char buf[128]; -+ u16 chip_id = get_chip_id(); -+ -+ snprintf(buf, sizeof(buf), -+ (chip_id > 0x9999) ? "Broadcom BCM%d (%s)" : -+ "Broadcom BCM%04X (%s)", -+ chip_id, bcm47xx_board_get_name()); -+ -+ return buf; - } - - static __init int prom_init_cfe(void) |