brcm47xx: update board detection patches

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.10 / 116-MIPS-BCM47xx-Remove-CFE-console.patch

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 1db01f0cbbc2f0ad49396e1c48225bd68dcc8b13..ecccd82566f42a8edd643fa45957f99062ad9b42 100644 (file)
--- 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();