From bf8af3c6f2cfc9ceeb63a7feba96e79c67d0b8a6 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sun, 27 May 2012 13:22:25 +0000
Subject: bcm63xx: add flash type detection

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31877 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/brcm63xx/patches-3.3/501-board-NB4.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'target/linux/brcm63xx/patches-3.3/501-board-NB4.patch')

diff --git a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
index 7e288ff61c..bd7c8b80db 100644
--- a/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
+++ b/target/linux/brcm63xx/patches-3.3/501-board-NB4.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -17,6 +17,9 @@
+@@ -14,6 +14,9 @@
  #include <linux/ssb/ssb.h>
  #include <linux/gpio_keys.h>
  #include <linux/input.h>
@@ -10,7 +10,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -41,6 +44,12 @@
+@@ -39,6 +42,12 @@
  #define CFE_OFFSET_64K		0x10000
  #define CFE_OFFSET_128K		0x20000
  
@@ -23,7 +23,7 @@
  static struct bcm963xx_nvram nvram;
  static unsigned int mac_addr_used;
  static struct board_info board;
-@@ -667,6 +676,496 @@ static struct board_info __initdata boar
+@@ -665,6 +674,496 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  };
@@ -520,7 +520,7 @@
  #endif
  
  /*
-@@ -697,9 +1196,30 @@ static const struct board_info __initdat
+@@ -695,9 +1194,30 @@ static const struct board_info __initdat
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
@@ -551,7 +551,7 @@
  /*
   * Register a sane SPROMv2 to make the on-board
   * bcm4318 WLAN work
-@@ -850,6 +1370,9 @@ void __init board_prom_init(void)
+@@ -848,6 +1368,9 @@ void __init board_prom_init(void)
  		boardid_fixup(boot_addr);
  	}
  
-- 
cgit v1.2.3