imagebuilder: fix parallel building (closes #11117)

[openwrt.git] / target / linux / brcm47xx / patches-3.0 / 0012-bcma-move-parallel-flash-into-a-union.patch

diff --git a/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch b/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch
index 9a4e877..11855b4 100644 (file)
--- a/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch
+++ b/target/linux/brcm47xx/patches-3.0/0012-bcma-move-parallel-flash-into-a-union.patch
@@ -104,9 +104,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  #define BCMA_CC_BCAST_ADDR            0x0050
  #define BCMA_CC_BCAST_DATA            0x0054
  #define BCMA_CC_GPIOPULLUP            0x0058          /* Rev >= 20 only */
  #define BCMA_CC_BCAST_ADDR            0x0050
  #define BCMA_CC_BCAST_DATA            0x0054
  #define BCMA_CC_GPIOPULLUP            0x0058          /* Rev >= 20 only */

-@@ -283,6 +341,12 @@
- #define BCMA_CC_PPL_PCHI_OFF          5
- #define BCMA_CC_PPL_PCHI_MASK         0x0000003f
+@@ -300,6 +358,12 @@
+ #define BCMA_CHIPCTL_4331_BT_SHD0_ON_GPIO4    BIT(16) /* enable bt_shd0 at gpio4 */
+ #define BCMA_CHIPCTL_4331_BT_SHD1_ON_GPIO5    BIT(17) /* enable bt_shd1 at gpio5 */

  
 +#define       BCMA_FLASH2                     0x1c000000      /* Flash Region 2 (region 1 shadowed here) */
 +#define       BCMA_FLASH2_SZ                  0x02000000      /* Size of Flash Region 2 */
  
 +#define       BCMA_FLASH2                     0x1c000000      /* Flash Region 2 (region 1 shadowed here) */
 +#define       BCMA_FLASH2_SZ                  0x02000000      /* Size of Flash Region 2 */


@@ -117,7 +117,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  /* Data for the PMU, if available.
   * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
   */
  /* Data for the PMU, if available.
   * Check availability with ((struct bcma_chipcommon)->capabilities & BCMA_CC_CAP_PMU)
   */

-@@ -292,6 +356,10 @@ struct bcma_chipcommon_pmu {
+@@ -309,6 +373,10 @@ struct bcma_chipcommon_pmu {

  };
  
  #ifdef CONFIG_BCMA_DRIVER_MIPS
  };
  
  #ifdef CONFIG_BCMA_DRIVER_MIPS


@@ -128,7 +128,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  struct bcma_pflash {
        u8 buswidth;
        u32 window;
  struct bcma_pflash {
        u8 buswidth;
        u32 window;

-@@ -317,7 +385,10 @@ struct bcma_drv_cc {
+@@ -334,7 +402,10 @@ struct bcma_drv_cc {

        u16 fast_pwrup_delay;
        struct bcma_chipcommon_pmu pmu;
  #ifdef CONFIG_BCMA_DRIVER_MIPS
        u16 fast_pwrup_delay;
        struct bcma_chipcommon_pmu pmu;
  #ifdef CONFIG_BCMA_DRIVER_MIPS