bcm63xx: update patches

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.9 / 304-boardid_fixup.patch

diff --git a/target/linux/brcm63xx/patches-3.9/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.9/304-boardid_fixup.patch
index f29ad6f1f3c73ce6a4079c3bd4e2b7cf8efbf452..6dfb540b7c4e99457349f57ddef51a4ec918c077 100644 (file)
--- a/target/linux/brcm63xx/patches-3.9/304-boardid_fixup.patch
+++ b/target/linux/brcm63xx/patches-3.9/304-boardid_fixup.patch
@@ -1,13 +1,14 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -33,11 +33,16 @@
- #include <bcm63xx_dev_usb_usbd.h>
+@@ -34,6 +34,7 @@
  #include <board_bcm963xx.h>
  
+ #include <uapi/linux/bcm933xx_hcs.h>
 +#include <uapi/linux/bcm963xx_tag.h>
-+
+ 
  #define PFX   "board_bcm963xx: "
  
+@@ -42,6 +43,9 @@
  #define BCM963XX_KEYS_POLL_INTERVAL   20
  #define BCM963XX_KEYS_DEBOUNCE_INTERVAL       (BCM963XX_KEYS_POLL_INTERVAL * 3)
  
@@ -17,7 +18,7 @@
  static struct board_info board;
  
  /*
-@@ -742,6 +747,30 @@ const char *board_get_name(void)
+@@ -781,6 +785,30 @@ const char *board_get_name(void)
        return board.name;
  }
  
@@ -48,15 +49,14 @@
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -775,6 +804,11 @@ void __init board_prom_init(void)
- 
-       bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);
- 
-+      if (strcmp(cfe_version, "unknown") != 0) {
-+              /* cfe present */
-+              boardid_fixup(boot_addr);
-+      }
-+
-       board_name = bcm63xx_nvram_get_name();
+@@ -819,6 +847,10 @@ void __init board_prom_init(void)
+               hcs = (struct bcm_hcs *)boot_addr;
+               board_name = hcs->filename;
+       } else {
++              if (strcmp(cfe_version, "unknown") != 0) {
++                      /* cfe present */
++                      boardid_fixup(boot_addr);
++              }
+               board_name = bcm63xx_nvram_get_name();
+       }
        /* find board by name */
-       for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {