[cns3xxx]: select the right cpu

[openwrt.git] / target / linux / brcm63xx / patches-2.6.39 / 452-board_V2500V.patch

diff --git a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
index 9811959..8ee9984 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch
@@ -64,7 +64,7 @@
  #endif
  
  /*
  #endif
  
  /*

-@@ -1909,6 +1966,7 @@ static const struct board_info __initdat
+@@ -1911,6 +1968,7 @@ static const struct board_info __initdat

        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,


@@ -72,9 +72,9 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358

-@@ -2051,6 +2109,22 @@ void __init board_prom_init(void)
-       val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-       val &= MPI_CSBASE_BASE_MASK;
+@@ -2059,6 +2117,22 @@ void __init board_prom_init(void)
+               val &= MPI_CSBASE_BASE_MASK;
+       }

        boot_addr = (u8 *)KSEG1ADDR(val);
 +      printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
 +
        boot_addr = (u8 *)KSEG1ADDR(val);
 +      printk(KERN_INFO PFX "Boot address 0x%08x\n",(unsigned int)boot_addr);
 +


@@ -95,10 +95,11 @@
  
        /* dump cfe version */
        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
  
        /* dump cfe version */
        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;

-@@ -2255,6 +2329,13 @@ int __init board_register_devices(void)
-       val = bcm_mpi_readl(MPI_CSBASE_REG(0));
-       val &= MPI_CSBASE_BASE_MASK;
- 
+@@ -2262,6 +2336,14 @@ int __init board_register_devices(void)
+               val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+               val &= MPI_CSBASE_BASE_MASK;
+       }
++

 +      /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks
 +       * Loading from CFE always uses Bank 0 */
 +      if (!strcmp(board.name, "V2500V_BB")) {
 +      /* BT Voyager 2500V has 8 Meg flash in two 4 Meg banks
 +       * Loading from CFE always uses Bank 0 */
 +      if (!strcmp(board.name, "V2500V_BB")) {