diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-06-19 20:28:38 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-06-19 20:28:38 +0000 |
| commit | 4dd4cbeb43687199f514ce9ad11f337cdbfe0421 (patch) | |
| tree | 6a12b2550706a027bba880b8a3d26a0be56a1823 /target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch | |
| parent | 7819b530da5e6b23ee61a2dc2da02529b71b82ce (diff) | |
| download | upstream-4dd4cbeb43687199f514ce9ad11f337cdbfe0421.tar.gz upstream-4dd4cbeb43687199f514ce9ad11f337cdbfe0421.tar.bz2 upstream-4dd4cbeb43687199f514ce9ad11f337cdbfe0421.zip | |
fixup patches after r27234
SVN-Revision: 27235
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch | 15 |
1 files changed, 8 insertions, 7 deletions
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 981195983c..3028865273 100644 --- a/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch @@ -72,9 +72,9 @@ #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; +@@ -2057,6 +2115,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); + @@ -95,10 +95,11 @@ /* 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; - +@@ -2264,6 +2338,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")) { |