X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fpatches-3.0%2F452-board_V2500V.patch;h=221959c48efc3e53398ea57ef0863e0a220e7e83;hb=2564046cdc2aed8924c0e2da3787212d7ac820e6;hp=12d03f3f70eb740e62544198d469770faacd379a;hpb=b18307a84fea45555033c38f8a4a73521e20f9c3;p=openwrt.git

diff --git a/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
index 12d03f3f70..221959c48e 100644
--- a/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -858,6 +858,63 @@ static struct board_info __initdata boar
+@@ -850,6 +850,63 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -64,7 +64,7 @@
  #endif
  
  /*
-@@ -1911,6 +1968,7 @@ static const struct board_info __initdat
+@@ -1897,6 +1954,7 @@ static const struct board_info __initdat
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
@@ -72,9 +72,9 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2070,6 +2128,22 @@ void __init board_prom_init(void)
- 		val &= MPI_CSBASE_BASE_MASK;
- 	}
+@@ -2050,6 +2108,22 @@ void __init board_prom_init(void)
+ 	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+ 	val &= MPI_CSBASE_BASE_MASK;
  	boot_addr = (u8 *)KSEG1ADDR(val);
 +	printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
 +
@@ -95,17 +95,16 @@
  
  	/* dump cfe version */
  	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
-@@ -2274,6 +2348,14 @@ int __init board_register_devices(void)
- 		val = bcm_mpi_readl(MPI_CSBASE_REG(0));
- 		val &= MPI_CSBASE_BASE_MASK;
- 	}
-+
+@@ -2248,6 +2322,13 @@ int __init board_register_devices(void)
+ 	val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+ 	val &= MPI_CSBASE_BASE_MASK;
+ 
 +	/* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
 +	/* Loading from CFE always uses Bank 0 */
 +	if (!strcmp(board.name, "V2500V_BB")) {
 +		printk(KERN_INFO PFX "V2500V: Start in Bank 0\n");
 +		val = val + 0x400000; // Select Bank 0 start address
-+		}
++	}
 +
  	mtd_resources[0].start = val;
  	mtd_resources[0].end = 0x1FFFFFFF;