1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
3 @@ -882,6 +882,65 @@ static struct board_info __initdata boar
8 +static struct board_info __initdata board_V2500V_BB = {
10 + .expected_cpu_id = 0x6348,
19 + .use_internal_phy = 1,
24 + .force_speed_100 = 1,
25 + .force_duplex_full = 1,
30 + .name = "V2500V_BB:green:power",
33 + .default_trigger = "default-on",
36 + .name = "V2500V_BB:red:power",
41 + .name = "V2500V_BB:green:adsl",
45 + { .name = "V2500V_BB:green:ppp",
50 + .name = "V2500V_BB:green:wireless",
61 + .code = KEY_RESTART,
62 + .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
69 @@ -1942,6 +2001,7 @@ static const struct board_info __initdat
76 #ifdef CONFIG_BCM63XX_CPU_6358
77 @@ -2062,6 +2122,23 @@ void __init board_prom_init(void)
78 val &= MPI_CSBASE_BASE_MASK;
80 boot_addr = (u8 *)KSEG1ADDR(val);
81 + printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
83 + /* BT Voyager 2500V (RTA1046VW PCB) has 8 Meg flash used as two */
84 + /* banks of 4 Meg. The byte at 0xBF800000 identifies the back to use.*/
85 + /* Loading firmware from the CFE Prompt always loads to Bank 0 */
86 + /* Do an early check of CFE and then select bank 0 */
88 + if (boot_addr == (u8 *)0xbf800000) {
89 + unsigned char board_name[16];
91 + tmp_boot_addr = (u8 *)0xbfc00000; // Address of Bank 0
92 + memcpy(board_name, tmp_boot_addr + BCM963XX_NVRAM_OFFSET + offsetof(struct bcm963xx_nvram, name), sizeof(board_name));
93 + if (!strcmp(board_name, "V2500V_BB")) {
94 + printk(KERN_INFO PFX "V2500V: nvram bank 0\n");
95 + boot_addr = (u8 *)0xbfc00000; // Bank 0
99 /* dump cfe version */
100 cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
101 --- a/arch/mips/bcm63xx/dev-flash.c
102 +++ b/arch/mips/bcm63xx/dev-flash.c
104 #include <linux/spi/spi.h>
105 #include <linux/spi/flash.h>
107 +#include <bcm63xx_board.h>
108 #include <bcm63xx_cpu.h>
109 #include <bcm63xx_dev_flash.h>
110 #include <bcm63xx_dev_hsspi.h>
111 @@ -162,6 +163,13 @@ int __init bcm63xx_flash_register(int nu
112 val = bcm_mpi_readl(MPI_CSBASE_REG(0));
113 val &= MPI_CSBASE_BASE_MASK;
115 + /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
116 + /* Loading from CFE always uses Bank 0 */
117 + if (!strcmp(board_get_name(), "V2500V_BB")) {
118 + pr_info("V2500V: Start in Bank 0\n");
119 + val = val + 0x400000; // Select Bank 0 start address
122 mtd_resources[0].start = val;
123 mtd_resources[0].end = 0x1FFFFFFF;