[brcm63xx] a couple of more fixes to get 6345 booting up to the console handover

SVN-Revision: 16636

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 e27264dfdf13fc1243fd2d7c53116ad8b3f73e0e..18389983a7438548014365de660b6daf67dfc18f 100644 (file)
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -67,6 +67,16 @@ static struct board_info __initdata board_96338w = {
 };
 #endif
 
+/*
+ * known 6345 boards
+ */
+#ifdef CONFIG_BCM63XX_CPU_6345
+static struct board_info __initdata board_96345gw2 = {
+       .name                           = "96345GW2",
+       .expected_cpu_id                = 0x6345,
+};
+#endif
+
 /*
  * known 6348 boards
  */
@@ -300,6 +310,9 @@ static const struct board_info __initdata *bcm963xx_boards[] = {
        &board_96338gw,
        &board_96338w,
 #endif
+#ifdef CONFIG_BCM63XX_CPU_6345
+       &board_96345gw2,
+#endif
 #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
        &board_96348gw,

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c
index 2b1a9b46dab95795fa5ea7a856dfab0f54d823cc..c6f7fad21b674adb2479d55f38738921d21e922e 100644 (file)
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c
@@ -288,6 +288,9 @@ static unsigned int detect_memory_size(void)
        unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0;
        u32 val;
 
+       if (BCMCPU_IS_6345())
+               return (8 * 1024 * 1024);
+
        if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) {
                val = bcm_sdram_readl(SDRAM_CFG_REG);
                rows = (val & SDRAM_CFG_ROW_MASK) >> SDRAM_CFG_ROW_SHIFT;

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
index 964a1479c6b6bcf61122cd1c7d1a7ac87efde6c9..7e52822aa941f98cf00b5f49b8e4d09bea38c7cf 100644 (file)
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/prom.c
@@ -28,8 +28,6 @@ void __init prom_init(void)
        /* disable all hardware blocks clock for now */
        if (BCMCPU_IS_6338())
                mask = CKCTL_6338_ALL_SAFE_EN;
-       else if (BCMCPU_IS_6345())
-               mask = CKCTL_6345_UART_EN;
        else if (BCMCPU_IS_6348())
                mask = CKCTL_6348_ALL_SAFE_EN;
        else