iwinfo: don't use the txpower value from debugfs for now, it does not match the value...

[librecmc/librecmc.git] / target / linux / brcm63xx / patches-3.3 / 528-board_nb6.patch

diff --git a/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch
index f178efdc0fcc0578a915687861b74cb86ed308ed..297759f109ed22c9001cba92367fabd6c631c917 100644 (file)
--- a/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-3.3/528-board_nb6.patch
@@ -8,7 +8,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -50,6 +51,8 @@
+@@ -51,6 +52,8 @@
  #define NB4_SPI_GPIO_MOSI     7
  #define NB4_SPI_GPIO_CLK      6
  #define NB4_74HC64_GPIO(X)    (NB4_74X164_GPIO_BASE + (X))
@@ -17,7 +17,7 @@
  
  #define CT6373_PID_OFFSET             0xff80
  #define CT6373_74X164_GPIO_BASE       64
-@@ -2489,6 +2492,103 @@ static struct board_info __initdata boar
+@@ -2582,6 +2585,103 @@ static struct board_info __initdata boar
  };
  #endif
  
@@ -121,7 +121,7 @@
  /*
   * known 6368 boards
   */
-@@ -2685,6 +2785,10 @@ static const struct board_info __initdat
+@@ -2778,6 +2878,10 @@ static const struct board_info __initdat
        &board_DVAG3810BN,
  #endif
  
@@ -132,9 +132,9 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
-@@ -2759,6 +2863,11 @@ static void __init boardid_fixup(u8 *boo
-       struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
-       char *board_name = (char *)bcm63xx_nvram_get_name();
+@@ -2845,6 +2949,11 @@ static void __init boardid_fixup(u8 *boo
+               }
+       }
  
 +      if (BCMCPU_IS_6362() && (!strncmp(board_name, "NB6-", sizeof("NB6-") - 1))) {
 +              board_name[sizeof("NB6") - 1] = '\0';
@@ -142,5 +142,5 @@
 +      }
 +
        /* check if bcm_tag is at 64k offset */
-       if (strncmp(board_name, tag->boardid, BOARDID_LEN) != 0) {
+       if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
                /* else try 128k */