diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-05-27 13:22:37 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-05-27 13:22:37 +0000 |
| commit | e19ed52fd1ddda94f06f52866570dbb8d84c3212 (patch) | |
| tree | 2addfd1a12fa7651de36a196a555119d4baa2428 /target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch | |
| parent | e34018cc9e825ba01de83117b7cac85b6f0f0a33 (diff) | |
| download | upstream-e19ed52fd1ddda94f06f52866570dbb8d84c3212.tar.gz upstream-e19ed52fd1ddda94f06f52866570dbb8d84c3212.tar.bz2 upstream-e19ed52fd1ddda94f06f52866570dbb8d84c3212.zip | |
bcm63xx: add a fixup for ath9k devices
SVN-Revision: 31880
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch index e299cc6dba..96342f79a8 100644 --- a/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-3.3/511-board_V2500V.patch @@ -72,7 +72,7 @@ #endif #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1944,6 +2002,22 @@ void __init board_prom_init(void) +@@ -1912,6 +1970,23 @@ void __init board_prom_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); @@ -83,11 +83,12 @@ + /* Loading firmware from the CFE Prompt always loads to Bank 0 */ + /* Do an early check of CFE and then select bank 0 */ + -+ if (boot_addr == (u8 *)0xbf800000) { ++ if (boot_addr == (u8 *)0xbf800000) { ++ unsigned char board_name[16]; + u8 *tmp_boot_addr; + tmp_boot_addr = (u8 *)0xbfc00000; // Address of Bank 0 -+ memcpy(&nvram, tmp_boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram)); -+ if (!strcmp(nvram.name, "V2500V_BB")) { ++ memcpy(board_name, tmp_boot_addr + BCM963XX_NVRAM_OFFSET + offsetof(struct bcm963xx_nvram, name), sizeof(board_name)); ++ if (!strcmp(board_name, "V2500V_BB")) { + printk(KERN_INFO PFX "V2500V: nvram bank 0\n"); + boot_addr = (u8 *)0xbfc00000; // Bank 0 + } @@ -105,7 +106,7 @@ #include <bcm63xx_cpu.h> #include <bcm63xx_dev_flash.h> #include <bcm63xx_dev_hsspi.h> -@@ -126,6 +127,13 @@ int __init bcm63xx_flash_register(void) +@@ -145,6 +146,13 @@ int __init bcm63xx_flash_register(int nu val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val &= MPI_CSBASE_BASE_MASK; |