From 818729cfd2b4db32e76778820522812858b1d79f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 13 Sep 2008 08:30:47 +0000 Subject: remove old atheros kernels and patches SVN-Revision: 12590 --- .../linux/atheros/patches-2.6.24/100-board.patch | 72 ---------------------- .../atheros/patches-2.6.24/110-spiflash.patch | 24 -------- .../patches-2.6.24/130-ar2313_ethernet.patch | 29 --------- .../140-redboot_partition_scan.patch | 24 -------- .../atheros/patches-2.6.24/150-bridge-printk.patch | 28 --------- .../900-cevt_r4k_irq_disable_hazard.patch | 12 ---- .../901-get_c0_compare_irq_function.patch | 49 --------------- 7 files changed, 238 deletions(-) delete mode 100644 target/linux/atheros/patches-2.6.24/100-board.patch delete mode 100644 target/linux/atheros/patches-2.6.24/110-spiflash.patch delete mode 100644 target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch delete mode 100644 target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch delete mode 100644 target/linux/atheros/patches-2.6.24/150-bridge-printk.patch delete mode 100644 target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch delete mode 100644 target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch (limited to 'target/linux/atheros/patches-2.6.24') diff --git a/target/linux/atheros/patches-2.6.24/100-board.patch b/target/linux/atheros/patches-2.6.24/100-board.patch deleted file mode 100644 index ee0495708b..0000000000 --- a/target/linux/atheros/patches-2.6.24/100-board.patch +++ /dev/null @@ -1,72 +0,0 @@ -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)" -+ depends on EXPERIMENTAL -+ select DMA_NONCOHERENT -+ select CEVT_R4K -+ select CSRC_R4K -+ select IRQ_CPU -+ select SYS_HAS_CPU_MIPS32_R1 -+ select SYS_SUPPORTS_BIG_ENDIAN -+ select SYS_SUPPORTS_32BIT_KERNEL -+ select GENERIC_GPIO -+ - config MIPS_COBALT - bool "Cobalt Server" - select CEVT_R4K -@@ -689,6 +701,7 @@ config WR_PPMC - - endchoice - -+source "arch/mips/atheros/Kconfig" - source "arch/mips/au1000/Kconfig" - 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 - - # -+# Atheros AR5312/AR2312 WiSoC -+# -+core-$(CONFIG_ATHEROS) += arch/mips/atheros/ -+cflags-$(CONFIG_ATHEROS) += -Iinclude/asm-mips/mach-atheros -+load-$(CONFIG_ATHEROS) += 0xffffffff80041000 -+ -+# - # Cobalt Server - # - core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ -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 -+ */ -+#define MACH_GROUP_ATHEROS 26 -+#define MACH_ATHEROS_AR5312 0 -+#define MACH_ATHEROS_AR2312 1 -+#define MACH_ATHEROS_AR2313 2 -+#define MACH_ATHEROS_AR2315 3 -+#define MACH_ATHEROS_AR2316 4 -+#define MACH_ATHEROS_AR2317 5 -+#define MACH_ATHEROS_AR2318 6 -+ - #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 deleted file mode 100644 index 1e40a6b603..0000000000 --- a/target/linux/atheros/patches-2.6.24/110-spiflash.patch +++ /dev/null @@ -1,24 +0,0 @@ -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" -+ depends on ATHEROS_AR5315 -+ - config MTD_SLRAM - tristate "Uncached system RAM" - help -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_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 deleted file mode 100644 index f99dbbfcd9..0000000000 --- a/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: linux-2.6.24.7/drivers/net/Kconfig -=================================================================== ---- 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" -+ depends on NET_ETHERNET && ATHEROS -+ help -+ Support for the AR231x/531x ethernet controller -+ - config MACE - tristate "MACE (Power Mac ethernet) support" - depends on PPC_PMAC && PPC32 -Index: linux-2.6.24.7/drivers/net/Makefile -=================================================================== ---- 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/ - obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o - obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o - obj-$(CONFIG_DECLANCE) += declance.o 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 deleted file mode 100644 index 71a60cb20e..0000000000 --- a/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch +++ /dev/null @@ -1,24 +0,0 @@ -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; - -+restart: - if ( directory < 0 ) - offset = master->size + directory*master->erasesize; - else -@@ -140,6 +141,11 @@ static int parse_redboot_partitions(stru - } - if (i == numslots) { - /* Didn't find it */ -+ if (offset + master->erasesize < master->size) { -+ /* not at the end of the flash yet, maybe next block :) */ -+ directory++; -+ goto restart; -+ } - 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 deleted file mode 100644 index f9451bd9b4..0000000000 --- a/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch +++ /dev/null @@ -1,28 +0,0 @@ -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)) { -- printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", -- dev->name); -+ //printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", -+ // dev->name); - dev->features &= ~NETIF_F_SG; - } - -@@ -3680,9 +3680,9 @@ int register_netdevice(struct net_device - } - if (dev->features & NETIF_F_UFO) { - if (!(dev->features & NETIF_F_HW_CSUM)) { -- printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " -- "NETIF_F_HW_CSUM feature.\n", -- dev->name); -+ //printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " -+ // "NETIF_F_HW_CSUM feature.\n", -+ // dev->name); - dev->features &= ~NETIF_F_UFO; - } - if (!(dev->features & NETIF_F_SG)) { 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 deleted file mode 100644 index 135a8e682f..0000000000 --- a/target/linux/atheros/patches-2.6.24/900-cevt_r4k_irq_disable_hazard.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: linux-2.6.24.7/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 */ - -+ irq_disable_hazard(); - if (!c0_compare_int_pending()) - return 0; - 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 deleted file mode 100644 index e9b071f66f..0000000000 --- a/target/linux/atheros/patches-2.6.24/901-get_c0_compare_irq_function.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: linux-2.6.24.7/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 - #include - #include -+#include - - extern asmlinkage void handle_int(void); - extern asmlinkage void handle_tlbm(void); -@@ -1360,6 +1361,8 @@ void __init per_cpu_trap_init(void) - */ - if (cpu_has_mips_r2) { - cp0_compare_irq = (read_c0_intctl() >> 29) & 7; -+ if (get_c0_compare_irq) -+ cp0_compare_irq = get_c0_compare_irq(); - cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7; - if (cp0_perfcount_irq == cp0_compare_irq) - cp0_perfcount_irq = -1; -Index: linux-2.6.24.7/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); - extern unsigned int __weak get_c0_compare_int(void); -+extern unsigned int __weak get_c0_compare_irq(void); - #else - static inline int mips_clockevent_init(void) - { -Index: linux-2.6.24.7/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(); - } -+ -+unsigned int __init get_c0_compare_irq(void) -+{ -+ return CP0_LEGACY_COMPARE_IRQ; -+} - #endif - - void __init arch_init_irq(void) -- cgit v1.2.3