1 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
2 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
3 @@ -318,6 +318,63 @@ static struct board_info __initdata boar
7 + static struct board_info __initdata board_V2500V_BB = {
9 + .expected_cpu_id = 0x6348,
18 + .use_internal_phy = 1,
21 + .force_speed_100 = 1,
22 + .force_duplex_full = 1,
27 + .name = "power:green",
30 + .default_trigger = "default-on",
33 + .name = "power:red",
58 + .code = KEY_RESTART,
59 + .debounce_interval = 60,
67 @@ -1784,6 +1841,7 @@ static const struct board_info __initdat
74 #ifdef CONFIG_BCM63XX_CPU_6358
75 @@ -1937,6 +1995,22 @@ void __init board_prom_init(void)
76 val = bcm_mpi_readl(MPI_CSBASE_REG(0));
77 val &= MPI_CSBASE_BASE_MASK;
78 boot_addr = (u8 *)KSEG1ADDR(val);
79 + printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
81 + /* BT Voyager 2500V (RTA1046VW PCB) has 8 Meg flash used as two */
82 + /* banks of 4 Meg. The byte at 0xBF800000 identifies the back to use.*/
83 + /* Loading firmware from the CFE Prompt always loads to Bank 0 */
84 + /* Do an early check of CFE and then select bank 0 */
86 + if (boot_addr == (u8 *)0xbf800000) {
88 + tmp_boot_addr = (u8 *)0xbfc00000; // Address of Bank 0
89 + memcpy(&nvram, tmp_boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
90 + if (!strcmp(nvram.name, "V2500V_BB")) {
91 + printk(KERN_INFO PFX "V2500V: nvram bank 0\n");
92 + boot_addr = (u8 *)0xbfc00000; // Bank 0
96 /* dump cfe version */
97 cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
98 @@ -2158,6 +2232,13 @@ int __init board_register_devices(void)
99 val = bcm_mpi_readl(MPI_CSBASE_REG(0));
100 val &= MPI_CSBASE_BASE_MASK;
102 + /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks */
103 + /* Loading from CFE always uses Bank 0 */
104 + if (!strcmp(board.name, "V2500V_BB")) {
105 + printk(KERN_INFO PFX "V2500V: Start in Bank 0\n");
106 + val = val + 0x400000; // Select Bank 0 start address
109 mtd_resources[0].start = val;
110 mtd_resources[0].end = 0x1FFFFFFF;