--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -890,6 +890,65 @@ static struct board_info __initdata boar
+@@ -892,6 +892,65 @@ static struct board_info __initdata boar
},
},
};
#endif
/*
-@@ -1950,6 +2009,7 @@ static const struct board_info __initcon
+@@ -1952,6 +2011,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
-@@ -2070,6 +2130,22 @@ void __init board_prom_init(void)
+@@ -2073,6 +2133,22 @@ void __init board_prom_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);
#include <bcm63xx_cpu.h>
#include <bcm63xx_dev_flash.h>
#include <bcm63xx_dev_hsspi.h>
-@@ -157,6 +158,13 @@ int __init bcm63xx_flash_register(int nu
+@@ -158,6 +159,13 @@ int __init bcm63xx_flash_register(int nu
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;