diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-06 23:51:24 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-06 23:51:24 +0000 |
| commit | ebf07787210deee29e3ad4f2308433866a853c20 (patch) | |
| tree | 95dbee09e015f09478f9a01a319cb1aed75af16f /target/linux/brcm47xx/patches-3.10/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch | |
| parent | 53a2c19c69d03bbdb81f1c27f9bc0b81b8da5ee4 (diff) | |
| download | upstream-ebf07787210deee29e3ad4f2308433866a853c20.tar.gz upstream-ebf07787210deee29e3ad4f2308433866a853c20.tar.bz2 upstream-ebf07787210deee29e3ad4f2308433866a853c20.zip | |
brcm47xx: update board detection patches
Add patches like they are currently in the mainline mips tree and add
some more pending patches for board detection.
* Now the board name is shown under machine in /proc/cpuinfo.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38308
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/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.10/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch b/target/linux/brcm47xx/patches-3.10/261-MIPS-BCM47XX-print-board-name-in-proc-cpuinfo.patch deleted file mode 100644 index 63874552d6..0000000000 --- a/target/linux/brcm47xx/patches-3.10/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[50]; -+ 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) |