[brcm63xx] fix board patches so that new boards are withing appropriate ifdef

[openwrt.git] / target / linux / brcm63xx / patches-3.3 / 304-boardid_fixup.patch

diff --git a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
index 96b871dbfb484b4ffdb957ad04aa5f3805d8ac16..c8da9932d4433d5f320069dd78b5dd58ed943537 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch
@@ -1,20 +1,23 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,9 +28,13 @@
- #include <bcm63xx_dev_dsp.h>
+@@ -30,12 +30,16 @@
  #include <bcm63xx_dev_pcmcia.h>
+ #include <bcm63xx_dev_spi.h>
  #include <board_bcm963xx.h>
 +#include <bcm_tag.h>
  
  #define PFX   "board_bcm963xx: "
  
+ #define BCM963XX_KEYS_POLL_INTERVAL           20
+ #define BCM963XX_KEYS_DEBOUNCE_INTERVAL       (BCM963XX_KEYS_POLL_INTERVAL * 3)
+ 
 +#define CFE_OFFSET_64K                0x10000
 +#define CFE_OFFSET_128K               0x20000
 +
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -721,6 +725,29 @@ static int board_get_mac_address(u8 *mac
+@@ -726,6 +730,29 @@ static int board_get_mac_address(u8 *mac
        return 0;
  }
  
@@ -44,7 +47,7 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -762,6 +789,11 @@ void __init board_prom_init(void)
+@@ -767,6 +794,11 @@ void __init board_prom_init(void)
                return;
        }