diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-07-08 12:27:55 +0000 |
commit | 8630d101b7db9c19b19c714bb3335042098ed2ee (patch) | |
tree | ad1832c7312bc629fa5edc5d6448ab17c746ab90 /target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch | |
parent | a6c4ef18b7de3d3840729abb2775e8dd5843be0d (diff) | |
download | master-31e0f0ae-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.gz master-31e0f0ae-8630d101b7db9c19b19c714bb3335042098ed2ee.tar.bz2 master-31e0f0ae-8630d101b7db9c19b19c714bb3335042098ed2ee.zip |
brcm63xx: fixup patches borked by allowing too much fuzz
Move defines and board_info structs back to their proper locations so
(de-)selecting SOC support won't break the build.
Reported-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41550
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch b/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch index 33744fdab6..a206abab92 100644 --- a/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch +++ b/target/linux/brcm63xx/patches-3.14/304-boardid_fixup.patch @@ -8,16 +8,16 @@ #define PFX "board_bcm963xx: " -@@ -339,6 +340,9 @@ static struct board_info __initdata boar - .force_duplex_full = 1, - }, +@@ -31,6 +32,9 @@ + #define BCM963XX_KEYS_POLL_INTERVAL 20 + #define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3) +#define CFE_OFFSET_64K 0x10000 +#define CFE_OFFSET_128K 0x20000 + - - .has_ohci0 = 1, - .has_pccard = 1, + /* + * known 3368 boards + */ @@ -722,6 +726,30 @@ static const struct board_info __initcon #endif }; |