aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-06-27 18:23:58 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-06-27 18:23:58 +0000
commitbcc1dd7f996f4057374c3eb776c4624ab3659474 (patch)
tree85d99bfb9d3c480311b1bbcf4023273c19cae55d /target/linux/brcm63xx
parent8094a7062fcaeb096a4e673c434e245f8b079f0e (diff)
downloadupstream-bcc1dd7f996f4057374c3eb776c4624ab3659474.tar.gz
upstream-bcc1dd7f996f4057374c3eb776c4624ab3659474.tar.bz2
upstream-bcc1dd7f996f4057374c3eb776c4624ab3659474.zip
prevent bcm6338 and bcm6345 from crashing very early
SVN-Revision: 16585
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 3e767d8a63..92d46e7628 100644
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -323,9 +323,15 @@ void __init board_prom_init(void)
char cfe_version[32];
u32 val;
- /* read base address of boot chip select (0) */
- val = bcm_mpi_readl(MPI_CSBASE_REG(0));
- val &= MPI_CSBASE_BASE_MASK;
+ /* read base address of boot chip select (0)
+ * 6338 does not have MPI but boots from standard
+ * MIPS Flash address */
+ if (BCMCPU_IS_6338() || BCMCPU_IS_6345())
+ val = 0x1fc00000;
+ else {
+ val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+ val &= MPI_CSBASE_BASE_MASK;
+ }
boot_addr = (u8 *)KSEG1ADDR(val);
/* dump cfe version */