From 6983aacd37e799b035732187aab6896f46f57a60 Mon Sep 17 00:00:00 2001 From: juhosg Date: Thu, 22 Apr 2010 07:12:09 +0000 Subject: kernel: refresh patches for 2.6.33.2, and drop md5sum for older 2.6.32 kernels git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21081 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.33/000-mips-bad-intctl.patch | 16 ++--- .../010-mips_clocksource_init_war.patch | 8 +-- .../ifxmips/patches-2.6.33/020-genirq_fix.patch | 8 +-- .../linux/ifxmips/patches-2.6.33/100-board.patch | 26 +++---- .../linux/ifxmips/patches-2.6.33/110-drivers.patch | 80 ++++++++-------------- .../ifxmips/patches-2.6.33/200-cfi-swap.patch | 16 ++--- .../ifxmips/patches-2.6.33/210-atm_hack.patch | 24 +++---- 7 files changed, 67 insertions(+), 111 deletions(-) (limited to 'target/linux/ifxmips/patches-2.6.33') diff --git a/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch b/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch index efecbf1f7..7c0f52db0 100644 --- a/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch +++ b/target/linux/ifxmips/patches-2.6.33/000-mips-bad-intctl.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.33.2/arch/mips/kernel/traps.c -=================================================================== ---- linux-2.6.33.2.orig/arch/mips/kernel/traps.c 2010-04-02 01:02:33.000000000 +0200 -+++ linux-2.6.33.2/arch/mips/kernel/traps.c 2010-04-02 23:36:16.000000000 +0200 -@@ -1496,7 +1496,18 @@ +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c +@@ -1496,7 +1496,18 @@ void __cpuinit per_cpu_trap_init(void) if (cpu_has_mips_r2) { cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7; @@ -21,11 +19,9 @@ Index: linux-2.6.33.2/arch/mips/kernel/traps.c if (cp0_perfcount_irq == cp0_compare_irq) cp0_perfcount_irq = -1; } else { -Index: linux-2.6.33.2/arch/mips/include/asm/irq.h -=================================================================== ---- linux-2.6.33.2.orig/arch/mips/include/asm/irq.h 2010-04-02 01:02:33.000000000 +0200 -+++ linux-2.6.33.2/arch/mips/include/asm/irq.h 2010-04-02 23:37:14.000000000 +0200 -@@ -133,9 +133,11 @@ +--- a/arch/mips/include/asm/irq.h ++++ b/arch/mips/include/asm/irq.h +@@ -133,9 +133,11 @@ extern void free_irqno(unsigned int irq) * IE7. Since R2 their number has to be read from the c0_intctl register. */ #define CP0_LEGACY_COMPARE_IRQ 7 diff --git a/target/linux/ifxmips/patches-2.6.33/010-mips_clocksource_init_war.patch b/target/linux/ifxmips/patches-2.6.33/010-mips_clocksource_init_war.patch index 15fd78f4e..81eabc6dc 100644 --- a/target/linux/ifxmips/patches-2.6.33/010-mips_clocksource_init_war.patch +++ b/target/linux/ifxmips/patches-2.6.33/010-mips_clocksource_init_war.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.32.10/arch/mips/kernel/cevt-r4k.c -=================================================================== ---- linux-2.6.32.10.orig/arch/mips/kernel/cevt-r4k.c 2010-04-02 21:11:39.000000000 +0200 -+++ linux-2.6.32.10/arch/mips/kernel/cevt-r4k.c 2010-04-02 21:11:52.000000000 +0200 +--- a/arch/mips/kernel/cevt-r4k.c ++++ b/arch/mips/kernel/cevt-r4k.c @@ -22,6 +22,22 @@ #ifndef CONFIG_MIPS_MT_SMTC @@ -25,7 +23,7 @@ Index: linux-2.6.32.10/arch/mips/kernel/cevt-r4k.c static int mips_next_event(unsigned long delta, struct clock_event_device *evt) { -@@ -31,6 +47,7 @@ +@@ -31,6 +47,7 @@ static int mips_next_event(unsigned long cnt = read_c0_count(); cnt += delta; write_c0_compare(cnt); diff --git a/target/linux/ifxmips/patches-2.6.33/020-genirq_fix.patch b/target/linux/ifxmips/patches-2.6.33/020-genirq_fix.patch index 852729f09..0503d0d2a 100644 --- a/target/linux/ifxmips/patches-2.6.33/020-genirq_fix.patch +++ b/target/linux/ifxmips/patches-2.6.33/020-genirq_fix.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.33.2/kernel/irq/chip.c -=================================================================== ---- linux-2.6.33.2.orig/kernel/irq/chip.c 2010-04-02 01:02:33.000000000 +0200 -+++ linux-2.6.33.2/kernel/irq/chip.c 2010-04-02 23:37:40.000000000 +0200 -@@ -650,6 +650,9 @@ +--- a/kernel/irq/chip.c ++++ b/kernel/irq/chip.c +@@ -650,6 +650,9 @@ handle_percpu_irq(unsigned int irq, stru kstat_incr_irqs_this_cpu(irq, desc); diff --git a/target/linux/ifxmips/patches-2.6.33/100-board.patch b/target/linux/ifxmips/patches-2.6.33/100-board.patch index 651371bfe..65db5b408 100644 --- a/target/linux/ifxmips/patches-2.6.33/100-board.patch +++ b/target/linux/ifxmips/patches-2.6.33/100-board.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.33.2/arch/mips/Kconfig -=================================================================== ---- linux-2.6.33.2.orig/arch/mips/Kconfig 2010-04-02 23:31:00.000000000 +0200 -+++ linux-2.6.33.2/arch/mips/Kconfig 2010-04-02 23:38:38.000000000 +0200 -@@ -139,6 +139,9 @@ +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -139,6 +139,9 @@ config MACH_DECSTATION otherwise choose R3000. @@ -12,7 +10,7 @@ Index: linux-2.6.33.2/arch/mips/Kconfig config MACH_JAZZ bool "Jazz family of machines" select ARC -@@ -693,6 +696,7 @@ +@@ -693,6 +696,7 @@ source "arch/mips/txx9/Kconfig" source "arch/mips/vr41xx/Kconfig" source "arch/mips/cavium-octeon/Kconfig" source "arch/mips/loongson/Kconfig" @@ -20,11 +18,9 @@ Index: linux-2.6.33.2/arch/mips/Kconfig endmenu -Index: linux-2.6.33.2/arch/mips/Makefile -=================================================================== ---- linux-2.6.33.2.orig/arch/mips/Makefile 2010-04-02 23:31:01.000000000 +0200 -+++ linux-2.6.33.2/arch/mips/Makefile 2010-04-02 23:38:38.000000000 +0200 -@@ -317,6 +317,18 @@ +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -317,6 +317,18 @@ cflags-$(CONFIG_MIPS_COBALT) += -I$(srct load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 # @@ -43,11 +39,9 @@ Index: linux-2.6.33.2/arch/mips/Makefile # DECstation family # core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/ -Index: linux-2.6.33.2/arch/mips/pci/Makefile -=================================================================== ---- linux-2.6.33.2.orig/arch/mips/pci/Makefile 2010-04-02 01:02:33.000000000 +0200 -+++ linux-2.6.33.2/arch/mips/pci/Makefile 2010-04-02 23:38:38.000000000 +0200 -@@ -55,7 +55,7 @@ +--- a/arch/mips/pci/Makefile ++++ b/arch/mips/pci/Makefile +@@ -55,7 +55,7 @@ obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capc obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o obj-$(CONFIG_MIKROTIK_RB532) += pci-rc32434.o ops-rc32434.o fixup-rc32434.o obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o diff --git a/target/linux/ifxmips/patches-2.6.33/110-drivers.patch b/target/linux/ifxmips/patches-2.6.33/110-drivers.patch index f1d6b4665..3d56ccb0e 100644 --- a/target/linux/ifxmips/patches-2.6.33/110-drivers.patch +++ b/target/linux/ifxmips/patches-2.6.33/110-drivers.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.33.2/drivers/serial/Kconfig -=================================================================== ---- linux-2.6.33.2.orig/drivers/serial/Kconfig 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/serial/Kconfig 2010-04-05 20:33:43.000000000 +0200 -@@ -1383,6 +1383,14 @@ +--- a/drivers/serial/Kconfig ++++ b/drivers/serial/Kconfig +@@ -1383,6 +1383,14 @@ config SERIAL_OF_PLATFORM_NWPSERIAL_CONS help Support for Console on the NWP serial ports. @@ -17,20 +15,16 @@ Index: linux-2.6.33.2/drivers/serial/Kconfig config SERIAL_QE tristate "Freescale QUICC Engine serial port support" depends on QUICC_ENGINE -Index: linux-2.6.33.2/drivers/serial/Makefile -=================================================================== ---- linux-2.6.33.2.orig/drivers/serial/Makefile 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/serial/Makefile 2010-04-05 20:34:00.000000000 +0200 -@@ -82,3 +82,4 @@ +--- a/drivers/serial/Makefile ++++ b/drivers/serial/Makefile +@@ -82,3 +82,4 @@ obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgd obj-$(CONFIG_SERIAL_QE) += ucc_uart.o obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips.o -Index: linux-2.6.33.2/drivers/net/Kconfig -=================================================================== ---- linux-2.6.33.2.orig/drivers/net/Kconfig 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/net/Kconfig 2010-04-05 20:33:43.000000000 +0200 -@@ -343,6 +343,12 @@ +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig +@@ -343,6 +343,12 @@ config MACB source "drivers/net/arm/Kconfig" @@ -43,11 +37,9 @@ Index: linux-2.6.33.2/drivers/net/Kconfig config AX88796 tristate "ASIX AX88796 NE2000 clone support" depends on ARM || MIPS || SUPERH -Index: linux-2.6.33.2/drivers/net/Makefile -=================================================================== ---- linux-2.6.33.2.orig/drivers/net/Makefile 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/net/Makefile 2010-04-05 20:33:43.000000000 +0200 -@@ -247,6 +247,7 @@ +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile +@@ -247,6 +247,7 @@ pasemi_mac_driver-objs := pasemi_mac.o p obj-$(CONFIG_MLX4_CORE) += mlx4/ obj-$(CONFIG_ENC28J60) += enc28j60.o obj-$(CONFIG_ETHOC) += ethoc.o @@ -55,11 +47,9 @@ Index: linux-2.6.33.2/drivers/net/Makefile obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o -Index: linux-2.6.33.2/drivers/mtd/maps/Kconfig -=================================================================== ---- linux-2.6.33.2.orig/drivers/mtd/maps/Kconfig 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/mtd/maps/Kconfig 2010-04-05 20:33:43.000000000 +0200 -@@ -257,6 +257,12 @@ +--- a/drivers/mtd/maps/Kconfig ++++ b/drivers/mtd/maps/Kconfig +@@ -257,6 +257,12 @@ config MTD_ALCHEMY help Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards @@ -72,20 +62,16 @@ Index: linux-2.6.33.2/drivers/mtd/maps/Kconfig config MTD_DILNETPC tristate "CFI Flash device mapped on DIL/Net PC" depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN -Index: linux-2.6.33.2/drivers/mtd/maps/Makefile -=================================================================== ---- linux-2.6.33.2.orig/drivers/mtd/maps/Makefile 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/mtd/maps/Makefile 2010-04-05 20:33:43.000000000 +0200 -@@ -61,3 +61,4 @@ +--- a/drivers/mtd/maps/Makefile ++++ b/drivers/mtd/maps/Makefile +@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-asy obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o obj-$(CONFIG_MTD_VMU) += vmu-flash.o obj-$(CONFIG_MTD_GPIO_ADDR) += gpio-addr-flash.o +obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o -Index: linux-2.6.33.2/drivers/watchdog/Kconfig -=================================================================== ---- linux-2.6.33.2.orig/drivers/watchdog/Kconfig 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/watchdog/Kconfig 2010-04-05 20:33:43.000000000 +0200 -@@ -840,6 +840,12 @@ +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig +@@ -840,6 +840,12 @@ config TXX9_WDT help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. @@ -98,11 +84,9 @@ Index: linux-2.6.33.2/drivers/watchdog/Kconfig # PARISC Architecture # POWERPC Architecture -Index: linux-2.6.33.2/drivers/watchdog/Makefile -=================================================================== ---- linux-2.6.33.2.orig/drivers/watchdog/Makefile 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/watchdog/Makefile 2010-04-05 20:33:43.000000000 +0200 -@@ -112,6 +112,7 @@ +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile +@@ -112,6 +112,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o obj-$(CONFIG_TXX9_WDT) += txx9wdt.o @@ -110,11 +94,9 @@ Index: linux-2.6.33.2/drivers/watchdog/Makefile # PARISC Architecture -Index: linux-2.6.33.2/drivers/leds/Kconfig -=================================================================== ---- linux-2.6.33.2.orig/drivers/leds/Kconfig 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/leds/Kconfig 2010-04-05 20:33:43.000000000 +0200 -@@ -269,6 +269,12 @@ +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig +@@ -269,6 +269,12 @@ config LEDS_ADP5520 To compile this driver as a module, choose M here: the module will be called leds-adp5520. @@ -127,11 +109,9 @@ Index: linux-2.6.33.2/drivers/leds/Kconfig comment "LED Triggers" config LEDS_TRIGGERS -Index: linux-2.6.33.2/drivers/leds/Makefile -=================================================================== ---- linux-2.6.33.2.orig/drivers/leds/Makefile 2010-04-05 20:33:41.000000000 +0200 -+++ linux-2.6.33.2/drivers/leds/Makefile 2010-04-05 20:33:43.000000000 +0200 -@@ -33,6 +33,7 @@ +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile +@@ -33,6 +33,7 @@ obj-$(CONFIG_LEDS_REGULATOR) += leds-re obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o diff --git a/target/linux/ifxmips/patches-2.6.33/200-cfi-swap.patch b/target/linux/ifxmips/patches-2.6.33/200-cfi-swap.patch index 2fedf3ff6..e43a1d204 100644 --- a/target/linux/ifxmips/patches-2.6.33/200-cfi-swap.patch +++ b/target/linux/ifxmips/patches-2.6.33/200-cfi-swap.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.33.2/drivers/mtd/chips/cfi_cmdset_0001.c -=================================================================== ---- linux-2.6.33.2.orig/drivers/mtd/chips/cfi_cmdset_0001.c 2010-04-02 01:02:33.000000000 +0200 -+++ linux-2.6.33.2/drivers/mtd/chips/cfi_cmdset_0001.c 2010-04-02 23:47:32.000000000 +0200 +--- a/drivers/mtd/chips/cfi_cmdset_0001.c ++++ b/drivers/mtd/chips/cfi_cmdset_0001.c @@ -41,7 +41,11 @@ /* #define CMDSET0001_DISABLE_WRITE_SUSPEND */ @@ -15,7 +13,7 @@ Index: linux-2.6.33.2/drivers/mtd/chips/cfi_cmdset_0001.c /* Intel chips */ #define I82802AB 0x00ad -@@ -1494,6 +1498,9 @@ +@@ -1494,6 +1498,9 @@ static int __xipram do_write_oneword(str int ret=0; adr += chip->start; @@ -25,11 +23,9 @@ Index: linux-2.6.33.2/drivers/mtd/chips/cfi_cmdset_0001.c switch (mode) { case FL_WRITING: -Index: linux-2.6.33.2/drivers/mtd/chips/cfi_cmdset_0002.c -=================================================================== ---- linux-2.6.33.2.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2010-04-02 23:31:00.000000000 +0200 -+++ linux-2.6.33.2/drivers/mtd/chips/cfi_cmdset_0002.c 2010-04-02 23:47:32.000000000 +0200 -@@ -1068,7 +1068,9 @@ +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c +@@ -1068,7 +1068,9 @@ static int __xipram do_write_oneword(str int retry_cnt = 0; adr += chip->start; diff --git a/target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch b/target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch index afe5b41cb..e66b7e0c1 100644 --- a/target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch +++ b/target/linux/ifxmips/patches-2.6.33/210-atm_hack.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.32.10/arch/mips/mm/cache.c -=================================================================== ---- linux-2.6.32.10.orig/arch/mips/mm/cache.c 2010-03-15 16:52:04.000000000 +0100 -+++ linux-2.6.32.10/arch/mips/mm/cache.c 2010-04-02 21:18:51.000000000 +0200 -@@ -52,6 +52,8 @@ +--- a/arch/mips/mm/cache.c ++++ b/arch/mips/mm/cache.c +@@ -52,6 +52,8 @@ void (*_dma_cache_wback)(unsigned long s void (*_dma_cache_inv)(unsigned long start, unsigned long size); EXPORT_SYMBOL(_dma_cache_wback_inv); @@ -11,11 +9,9 @@ Index: linux-2.6.32.10/arch/mips/mm/cache.c #endif /* CONFIG_DMA_NONCOHERENT */ -Index: linux-2.6.32.10/net/atm/proc.c -=================================================================== ---- linux-2.6.32.10.orig/net/atm/proc.c 2010-03-15 16:52:04.000000000 +0100 -+++ linux-2.6.32.10/net/atm/proc.c 2010-04-02 21:19:46.000000000 +0200 -@@ -152,7 +152,7 @@ +--- a/net/atm/proc.c ++++ b/net/atm/proc.c +@@ -152,7 +152,7 @@ static void *vcc_seq_next(struct seq_fil static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc) { static const char *const class_name[] = @@ -24,11 +20,9 @@ Index: linux-2.6.32.10/net/atm/proc.c static const char *const aal_name[] = { "---", "1", "2", "3/4", /* 0- 3 */ "???", "5", "???", "???", /* 4- 7 */ -Index: linux-2.6.32.10/net/atm/common.c -=================================================================== ---- linux-2.6.32.10.orig/net/atm/common.c 2010-03-15 16:52:04.000000000 +0100 -+++ linux-2.6.32.10/net/atm/common.c 2010-04-02 21:21:46.000000000 +0200 -@@ -56,12 +56,17 @@ +--- a/net/atm/common.c ++++ b/net/atm/common.c +@@ -56,12 +56,17 @@ static void vcc_remove_socket(struct soc write_unlock_irq(&vcc_sklist_lock); } -- cgit v1.2.3