brcm63xx: add and enable support for loading an appended dtb

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.14 / 528-board_nb6.patch

diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
index 7e4f6ebb1a064aea920d022fe45923b2af1c08f6..5f2305e67aa2d71636e990b0d4312f2a6fb3dce1 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch
@@ -17,9 +17,9 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2696,6 +2699,104 @@ static struct board_info __initdata boar
+@@ -2711,6 +2714,104 @@ static struct board_info __initdata boar
  };
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  
 +#ifdef CONFIG_BCM63XX_CPU_6362
 +static struct rtl8367_extif_config nb6_rtl8367_extif0_cfg = {
@@ -117,12 +117,12 @@
 +      .devs = nb6_devices,
 +      .num_devs = ARRAY_SIZE(nb6_devices),
 +};
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6362 */
 +
  /*
   * known 6368 boards
   */
-@@ -2902,6 +3003,10 @@ static const struct board_info __initcon
+@@ -2917,6 +3018,10 @@ static const struct board_info __initcon
        &board_DVAG3810BN,
  #endif
  
@@ -133,7 +133,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2923,6 +3028,11 @@ static void __init boardid_fixup(u8 *boo
+@@ -2938,6 +3043,11 @@ static void __init boardid_fixup(u8 *boo
                }
        }