aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-10-06 23:51:24 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-10-06 23:51:24 +0000
commitcd2b261f51e3181ccd63899e26cdb0a91002fc75 (patch)
treeea9b5c71904a9b212028679c821940aea9dcc212 /target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch
parent1e03d9f0eefdfac8274d67c1d32e781e89e2058a (diff)
downloadupstream-cd2b261f51e3181ccd63899e26cdb0a91002fc75.tar.gz
upstream-cd2b261f51e3181ccd63899e26cdb0a91002fc75.tar.bz2
upstream-cd2b261f51e3181ccd63899e26cdb0a91002fc75.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38308 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch b/target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch
index 1db01f0cbb..ecccd82566 100644
--- a/target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch
+++ b/target/linux/brcm47xx/patches-3.10/116-MIPS-BCM47xx-Remove-CFE-console.patch
@@ -26,15 +26,17 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
-@@ -33,96 +33,28 @@
- #include <asm/fw/cfe/cfe_api.h>
- #include <asm/fw/cfe/cfe_error.h>
+@@ -35,8 +35,6 @@
+ #include <bcm47xx.h>
+ #include <bcm47xx_board.h>
-static int cfe_cons_handle;
-
+ static char bcm47xx_system_type[20] = "Broadcom BCM47XX";
+
const char *get_system_type(void)
- {
- return "Broadcom BCM47XX";
+@@ -52,89 +50,23 @@ __init void bcm47xx_set_system_type(u16
+ chip_id);
}
-void prom_putchar(char c)
@@ -130,7 +132,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
}
static __init void prom_init_mem(void)
-@@ -173,8 +105,6 @@ static __init void prom_init_mem(void)
+@@ -185,8 +117,6 @@ static __init void prom_init_mem(void)
void __init prom_init(void)
{
prom_init_cfe();