brcm63xx: 3.10: backport multi-board support

[openwrt.git] / target / linux / brcm63xx / patches-3.10 / 557-board_bcm963269bhr.patch

diff --git a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
index 251d138..c340429 100644 (file)
--- a/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.10/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c

-@@ -4427,6 +4427,75 @@ static struct board_info __initdata boar
+@@ -4424,6 +4424,75 @@ static struct board_info __initdata boar

  #endif
  
  /*
  #endif
  
  /*


@@ -76,7 +76,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {

-@@ -4511,6 +4580,9 @@ static const struct board_info __initcon
+@@ -4508,6 +4577,9 @@ static const struct board_info __initcon

        &board_96368mvwg,
        &board_96368mvngr,
  #endif
        &board_96368mvwg,
        &board_96368mvngr,
  #endif


@@ -85,4 +85,4 @@
 +#endif
  };
  
 +#endif
  };
  

- /*
+ static void __init boardid_fixup(u8 *boot_addr)