diff options
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.flash | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 4 | ||||
| -rw-r--r-- | target/linux/patches/2.6.37/brcm.patch | 16 |
3 files changed, 15 insertions, 7 deletions
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 1ca289b75..91cfc9140 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -44,7 +44,7 @@ config ADK_KERNEL_MTD_AR7_PARTS config ADK_KERNEL_MTD_CFI_INTELEXT boolean - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G + default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n config ADK_TARGET_NAND diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index bbd2990e9..082343a14 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -115,8 +115,7 @@ config ADK_KERNEL_B44 select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NET_PCI select ADK_KERNEL_MII - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54G - default y if ADK_TARGET_SYSTEM_LINKSYS_WRT54GS + default y if ADK_TARGET_SYSTEM_BROADCOM_BCM47XX default n help @@ -345,6 +344,7 @@ config ADK_KPACKAGE_KMOD_B43 prompt "kmod-b43..................... Broadcom B43xx wireless cards" tristate select ADK_KPACKAGE_KMOD_FW_LOADER + select ADK_KPACKAGE_KMOD_MAC80211 depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI default n help diff --git a/target/linux/patches/2.6.37/brcm.patch b/target/linux/patches/2.6.37/brcm.patch index 0dfcf4b06..c484dc838 100644 --- a/target/linux/patches/2.6.37/brcm.patch +++ b/target/linux/patches/2.6.37/brcm.patch @@ -9,8 +9,8 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/Makefile linux-2.6.37/arch/mips/bc +obj-y := gpio.o irq.o nvram.o prom.o serial.o setup.o time.o platform.o diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/bcm47xx/platform.c --- linux-2.6.37.orig/arch/mips/bcm47xx/platform.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.37/arch/mips/bcm47xx/platform.c 2011-04-26 20:26:19.917673199 +0200 -@@ -0,0 +1,139 @@ ++++ linux-2.6.37/arch/mips/bcm47xx/platform.c 2011-04-26 21:54:17.727672777 +0200 +@@ -0,0 +1,147 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -29,7 +29,7 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/ +#include <asm/mach-bcm47xx/nvram.h> + +#define NVRAM_FLASH_SIZE 0x10000 -+#define CFGFS_FLASH_SIZE (64 * 1024) ++#define CFGFS_FLASH_SIZE (128 * 1024) + +static struct mtd_partition bcm47xx_partitions[] = { +#define SLOT_CFE 0 @@ -111,8 +111,16 @@ diff -Nur linux-2.6.37.orig/arch/mips/bcm47xx/platform.c linux-2.6.37/arch/mips/ + trx_hdr = (void *)KSEG1ADDR(mcore->flash_window + 0x40000); + + /* devices might have 2, 4 or 8 MB flash size */ ++#ifdef BCM47XX_OVERRIDE_FLASHSIZE ++ flash_size = BCM47XX_OVERRIDE_FLASHSIZE; ++ mcore->flash_window_size = flash_size; ++#define BCM47XX_OVERRODE_FLASHSIZE " (overridden)" ++#else + flash_size = mcore->flash_window_size; -+ printk(KERN_INFO "FLASH SIZE: 0x%x\n", flash_size); ++#define BCM47XX_OVERRODE_FLASHSIZE "" ++#endif ++ printk(KERN_INFO "FLASH SIZE%s: %x\n", BCM47XX_OVERRODE_FLASHSIZE, ++ flash_size); + + left = flash_size - 0x40000; + posn = flash_size; |