brcm63xx: add and enable support for loading an appended dtb

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

diff --git a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
index 96d771610c6da7a21bdd58b9ffbabcb11cd25e85..f5d4554d437c2058cc266be999b39f8e70ea5ff3 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -4441,6 +4441,75 @@ static struct board_info __initdata boar
- #endif
+@@ -4532,6 +4532,75 @@ static struct board_info __initdata boar
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
 + * known 63268/63269 boards
@@ -70,13 +70,13 @@
 +              },
 +      },
 +};
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_63268 */
 +
 +/*
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -4525,6 +4594,9 @@ static const struct board_info __initcon
+@@ -4616,6 +4685,9 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
  #endif
@@ -85,4 +85,4 @@
 +#endif
  };
  
- /*
+ static void __init boardid_fixup(u8 *boot_addr)