aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-07-03 21:42:07 +0000
committerJonas Gorski <jogo@openwrt.org>2012-07-03 21:42:07 +0000
commit297078e82c005275159c5b9c768ad3d2b03a6073 (patch)
treed1dd3b8f4e5289e213cdfe3344f74d72aaf01212 /target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
parente6d44db12bccb96777c5b3acbe3bf7deedf31dbb (diff)
downloadupstream-297078e82c005275159c5b9c768ad3d2b03a6073.tar.gz
upstream-297078e82c005275159c5b9c768ad3d2b03a6073.tar.bz2
upstream-297078e82c005275159c5b9c768ad3d2b03a6073.zip
bcm63xx: update patches to latest upstream versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32591 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
index 376b57e2fa..6fca36f2a1 100644
--- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch
@@ -72,7 +72,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1908,6 +1966,23 @@ void __init board_prom_init(void)
+@@ -1909,6 +1967,23 @@ void __init board_prom_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
@@ -98,7 +98,7 @@
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
--- a/arch/mips/bcm63xx/dev-flash.c
+++ b/arch/mips/bcm63xx/dev-flash.c
-@@ -18,6 +18,7 @@
+@@ -19,6 +19,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
@@ -106,7 +106,7 @@
#include <bcm63xx_cpu.h>
#include <bcm63xx_dev_flash.h>
#include <bcm63xx_dev_hsspi.h>
-@@ -145,6 +146,13 @@ int __init bcm63xx_flash_register(int nu
+@@ -150,6 +151,13 @@ int __init bcm63xx_flash_register(int nu
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;