diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-06-30 13:34:37 +0000 |
| commit | dc230d9b0f9ba046fb1e9e51de21ae35504a9aab (patch) | |
| tree | 8d43a35b2fbe9a47e9c75f708017d651d47d4fa1 /target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch | |
| parent | 44ef9f778994e1b9bd37c8525045b53d82b6a504 (diff) | |
| download | upstream-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.gz upstream-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.tar.bz2 upstream-dc230d9b0f9ba046fb1e9e51de21ae35504a9aab.zip | |
brcm63xx: 3.10: backport multi-board support
There have been no reported regressions, so backport it to 3.10.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41422
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch index 937b9d64f3..33744fdab6 100644 --- a/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch +++ b/target/linux/brcm63xx/patches-3.10/304-boardid_fixup.patch @@ -1,26 +1,26 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -35,6 +35,7 @@ - #include <board_bcm963xx.h> +@@ -23,6 +23,7 @@ + #include "board_common.h" #include <uapi/linux/bcm933xx_hcs.h> +#include <uapi/linux/bcm963xx_tag.h> #define PFX "board_bcm963xx: " -@@ -43,6 +44,9 @@ - #define BCM963XX_KEYS_POLL_INTERVAL 20 - #define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3) +@@ -339,6 +340,9 @@ static struct board_info __initdata boar + .force_duplex_full = 1, + }, +#define CFE_OFFSET_64K 0x10000 +#define CFE_OFFSET_128K 0x20000 + - static struct board_info board; - /* -@@ -782,6 +786,30 @@ const char *board_get_name(void) - return board.name; - } + .has_ohci0 = 1, + .has_pccard = 1, +@@ -722,6 +726,30 @@ static const struct board_info __initcon + #endif + }; +static void __init boardid_fixup(u8 *boot_addr) +{ @@ -49,7 +49,7 @@ /* * early init callback, read nvram data from flash and checksum it */ -@@ -820,6 +848,10 @@ void __init board_prom_init(void) +@@ -760,6 +788,10 @@ void __init board_prom_init(void) hcs = (struct bcm_hcs *)boot_addr; board_name = hcs->filename; } else { |