diff options
Diffstat (limited to 'target/linux/atheros/patches-2.6.24')
7 files changed, 71 insertions, 65 deletions
diff --git a/target/linux/atheros/patches-2.6.24/100-board.patch b/target/linux/atheros/patches-2.6.24/100-board.patch index f1a0d0641a..ee0495708b 100644 --- a/target/linux/atheros/patches-2.6.24/100-board.patch +++ b/target/linux/atheros/patches-2.6.24/100-board.patch @@ -1,9 +1,10 @@ -diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig ---- linux.old/arch/mips/Kconfig 2007-02-02 23:55:52.912446784 +0100 -+++ linux.dev/arch/mips/Kconfig 2007-02-03 21:50:25.262027104 +0100 -@@ -45,6 +45,18 @@ - note that a kernel built with this option selected will not be - able to run on normal units. +Index: linux-2.6.24.7/arch/mips/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/arch/mips/Kconfig ++++ linux-2.6.24.7/arch/mips/Kconfig +@@ -67,6 +67,18 @@ config BCM47XX + help + Support for BCM47XX based boards +config ATHEROS + bool "Atheros SoC support (EXPERIMENTAL)" @@ -19,19 +20,20 @@ diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig + config MIPS_COBALT bool "Cobalt Server" - select DMA_NONCOHERENT -@@ -658,6 +668,7 @@ + select CEVT_R4K +@@ -689,6 +701,7 @@ config WR_PPMC endchoice +source "arch/mips/atheros/Kconfig" source "arch/mips/au1000/Kconfig" - source "arch/mips/ddb5xxx/Kconfig" - source "arch/mips/gt64120/ev64120/Kconfig" -diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile ---- linux.old/arch/mips/Makefile 2007-02-02 23:55:52.913446632 +0100 -+++ linux.dev/arch/mips/Makefile 2007-02-03 17:40:29.193776000 +0100 -@@ -267,6 +267,13 @@ + source "arch/mips/jazz/Kconfig" + source "arch/mips/lasat/Kconfig" +Index: linux-2.6.24.7/arch/mips/Makefile +=================================================================== +--- linux-2.6.24.7.orig/arch/mips/Makefile ++++ linux-2.6.24.7/arch/mips/Makefile +@@ -268,6 +268,13 @@ libs-$(CONFIG_MIPS_XXS1500) += arch/mips load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 # @@ -45,12 +47,13 @@ diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile # Cobalt Server # core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ -diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h ---- linux.old/include/asm-mips/bootinfo.h 2007-02-02 23:55:52.913446632 +0100 -+++ linux.dev/include/asm-mips/bootinfo.h 2007-02-03 17:51:02.531494032 +0100 -@@ -213,6 +213,18 @@ - #define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */ - #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */ +Index: linux-2.6.24.7/include/asm-mips/bootinfo.h +=================================================================== +--- linux-2.6.24.7.orig/include/asm-mips/bootinfo.h ++++ linux-2.6.24.7/include/asm-mips/bootinfo.h +@@ -198,6 +198,18 @@ + #define MACH_GROUP_BRCM 23 /* Broadcom */ + #define MACH_BCM47XX 1 /* Broadcom BCM47XX */ +/* + * Valid machtype for group ATHEROS @@ -67,4 +70,3 @@ diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/booti #define CL_SIZE COMMAND_LINE_SIZE const char *get_system_type(void); - diff --git a/target/linux/atheros/patches-2.6.24/110-spiflash.patch b/target/linux/atheros/patches-2.6.24/110-spiflash.patch index fc4ef4c0f2..1e40a6b603 100644 --- a/target/linux/atheros/patches-2.6.24/110-spiflash.patch +++ b/target/linux/atheros/patches-2.6.24/110-spiflash.patch @@ -1,9 +1,10 @@ -diff -urN linux.old/drivers/mtd/devices/Kconfig linux.dev/drivers/mtd/devices/Kconfig ---- linux.old/drivers/mtd/devices/Kconfig 2007-02-04 04:30:26.145338240 +0100 -+++ linux.dev/drivers/mtd/devices/Kconfig 2007-02-02 23:48:28.748969000 +0100 -@@ -76,6 +76,10 @@ - used for program and data storage. Set up your spi devices - with the right board-specific platform data. +Index: linux-2.6.24.7/drivers/mtd/devices/Kconfig +=================================================================== +--- linux-2.6.24.7.orig/drivers/mtd/devices/Kconfig ++++ linux-2.6.24.7/drivers/mtd/devices/Kconfig +@@ -77,6 +77,10 @@ config MTD_M25P80 + if you want to specify device partitioning or to use a device which + doesn't support the JEDEC ID instruction. +config MTD_SPIFLASH + tristate "Atheros AR2315/6/7 SPI Flash support" @@ -12,11 +13,12 @@ diff -urN linux.old/drivers/mtd/devices/Kconfig linux.dev/drivers/mtd/devices/Kc config MTD_SLRAM tristate "Uncached system RAM" help -diff -urN linux.old/drivers/mtd/devices/Makefile linux.dev/drivers/mtd/devices/Makefile ---- linux.old/drivers/mtd/devices/Makefile 2007-02-04 04:30:26.146338088 +0100 -+++ linux.dev/drivers/mtd/devices/Makefile 2007-02-02 23:48:28.749969000 +0100 -@@ -18,3 +18,4 @@ +Index: linux-2.6.24.7/drivers/mtd/devices/Makefile +=================================================================== +--- linux-2.6.24.7.orig/drivers/mtd/devices/Makefile ++++ linux-2.6.24.7/drivers/mtd/devices/Makefile +@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART) += lart.o + obj-$(CONFIG_MTD_BLOCK2MTD) += block2mtd.o obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o - obj-$(CONFIG_MTD_DATAFLASH26) += at91_dataflash26.o obj-$(CONFIG_MTD_M25P80) += m25p80.o +obj-$(CONFIG_MTD_SPIFLASH) += spiflash.o diff --git a/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch index 721eba663f..f99dbbfcd9 100644 --- a/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch @@ -1,10 +1,10 @@ -Index: linux-2.6.23/drivers/net/Kconfig +Index: linux-2.6.24.7/drivers/net/Kconfig =================================================================== ---- linux-2.6.23.orig/drivers/net/Kconfig 2007-10-14 00:55:22.000000000 +0200 -+++ linux-2.6.23/drivers/net/Kconfig 2007-10-14 00:56:32.000000000 +0200 -@@ -348,6 +348,12 @@ - AX88796 driver, using platform bus to provide - chip detection and resources +--- linux-2.6.24.7.orig/drivers/net/Kconfig ++++ linux-2.6.24.7/drivers/net/Kconfig +@@ -362,6 +362,12 @@ config AX88796_93CX6 + help + Select this if your platform comes with an external 93CX6 eeprom. +config AR2313 + tristate "AR2313 Ethernet support" @@ -15,12 +15,12 @@ Index: linux-2.6.23/drivers/net/Kconfig config MACE tristate "MACE (Power Mac ethernet) support" depends on PPC_PMAC && PPC32 -Index: linux-2.6.23/drivers/net/Makefile +Index: linux-2.6.24.7/drivers/net/Makefile =================================================================== ---- linux-2.6.23.orig/drivers/net/Makefile 2007-10-14 00:55:22.000000000 +0200 -+++ linux-2.6.23/drivers/net/Makefile 2007-10-14 00:56:55.000000000 +0200 -@@ -182,6 +182,7 @@ - obj-$(CONFIG_LGUEST_NET) += lguest_net.o +--- linux-2.6.24.7.orig/drivers/net/Makefile ++++ linux-2.6.24.7/drivers/net/Makefile +@@ -190,6 +190,7 @@ obj-$(CONFIG_MVME147_NET) += mvme147.o 7 + obj-$(CONFIG_EQUALIZER) += eql.o obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o +obj-$(CONFIG_AR2313) += ar2313/ diff --git a/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch index de4ebeb553..71a60cb20e 100644 --- a/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch +++ b/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch @@ -1,7 +1,8 @@ -diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c ---- linux.old/drivers/mtd/redboot.c 2006-12-14 23:53:29.000000000 +0100 -+++ linux.dev/drivers/mtd/redboot.c 2006-12-16 04:23:42.000000000 +0100 -@@ -64,6 +64,7 @@ +Index: linux-2.6.24.7/drivers/mtd/redboot.c +=================================================================== +--- linux-2.6.24.7.orig/drivers/mtd/redboot.c ++++ linux-2.6.24.7/drivers/mtd/redboot.c +@@ -64,6 +64,7 @@ static int parse_redboot_partitions(stru if (!buf) return -ENOMEM; @@ -9,7 +10,7 @@ diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c if ( directory < 0 ) offset = master->size + directory*master->erasesize; else -@@ -140,6 +141,11 @@ +@@ -140,6 +141,11 @@ static int parse_redboot_partitions(stru } if (i == numslots) { /* Didn't find it */ @@ -21,4 +22,3 @@ diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", master->name); ret = 0; - diff --git a/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch index 0a35d89beb..f9451bd9b4 100644 --- a/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch +++ b/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch @@ -1,6 +1,8 @@ ---- linux-2.6.23.orig/net/core/dev.c 2007-10-12 23:42:06.000000000 +0200 -+++ linux-2.6.23/net/core/dev.c 2007-10-12 23:44:22.000000000 +0200 -@@ -3425,8 +3425,8 @@ +Index: linux-2.6.24.7/net/core/dev.c +=================================================================== +--- linux-2.6.24.7.orig/net/core/dev.c ++++ linux-2.6.24.7/net/core/dev.c +@@ -3666,8 +3666,8 @@ int register_netdevice(struct net_device /* Fix illegal SG+CSUM combinations. */ if ((dev->features & NETIF_F_SG) && !(dev->features & NETIF_F_ALL_CSUM)) { @@ -11,7 +13,7 @@ dev->features &= ~NETIF_F_SG; } -@@ -3439,9 +3439,9 @@ +@@ -3680,9 +3680,9 @@ int register_netdevice(struct net_device } if (dev->features & NETIF_F_UFO) { if (!(dev->features & NETIF_F_HW_CSUM)) { diff --git a/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch b/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch index d5e60624b9..135a8e682f 100644 --- a/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch +++ b/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/arch/mips/kernel/cevt-r4k.c +Index: linux-2.6.24.7/arch/mips/kernel/cevt-r4k.c =================================================================== ---- linux-2.6.24.2.orig/arch/mips/kernel/cevt-r4k.c -+++ linux-2.6.24.2/arch/mips/kernel/cevt-r4k.c +--- linux-2.6.24.7.orig/arch/mips/kernel/cevt-r4k.c ++++ linux-2.6.24.7/arch/mips/kernel/cevt-r4k.c @@ -205,6 +205,7 @@ static int c0_compare_int_usable(void) while ((int)(read_c0_count() - cnt) <= 0) ; /* Wait for expiry */ diff --git a/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch b/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch index fe05812064..e9b071f66f 100644 --- a/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch +++ b/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.24.2/arch/mips/kernel/traps.c +Index: linux-2.6.24.7/arch/mips/kernel/traps.c =================================================================== ---- linux-2.6.24.2.orig/arch/mips/kernel/traps.c -+++ linux-2.6.24.2/arch/mips/kernel/traps.c +--- linux-2.6.24.7.orig/arch/mips/kernel/traps.c ++++ linux-2.6.24.7/arch/mips/kernel/traps.c @@ -42,6 +42,7 @@ #include <asm/mmu_context.h> #include <asm/types.h> @@ -19,10 +19,10 @@ Index: linux-2.6.24.2/arch/mips/kernel/traps.c cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7; if (cp0_perfcount_irq == cp0_compare_irq) cp0_perfcount_irq = -1; -Index: linux-2.6.24.2/include/asm-mips/time.h +Index: linux-2.6.24.7/include/asm-mips/time.h =================================================================== ---- linux-2.6.24.2.orig/include/asm-mips/time.h -+++ linux-2.6.24.2/include/asm-mips/time.h +--- linux-2.6.24.7.orig/include/asm-mips/time.h ++++ linux-2.6.24.7/include/asm-mips/time.h @@ -60,6 +60,7 @@ extern int (*perf_irq)(void); #ifdef CONFIG_CEVT_R4K extern int mips_clockevent_init(void); @@ -31,10 +31,10 @@ Index: linux-2.6.24.2/include/asm-mips/time.h #else static inline int mips_clockevent_init(void) { -Index: linux-2.6.24.2/arch/mips/atheros/board.c +Index: linux-2.6.24.7/arch/mips/atheros/board.c =================================================================== ---- linux-2.6.24.2.orig/arch/mips/atheros/board.c -+++ linux-2.6.24.2/arch/mips/atheros/board.c +--- linux-2.6.24.7.orig/arch/mips/atheros/board.c ++++ linux-2.6.24.7/arch/mips/atheros/board.c @@ -205,6 +205,11 @@ void (*board_time_init)(void); void __init plat_time_init(void) { board_time_init(); |