From 6d2ba97481de5894a796a384a85126053bfcf25f Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 26 Jul 2008 10:53:23 +0000 Subject: [kernel] update to 2.6.25.12 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ifxmips/Makefile | 2 +- target/linux/ifxmips/patches/100-board.patch | 30 +++------ target/linux/ifxmips/patches/110-drivers.patch | 84 +++++++++---------------- target/linux/ifxmips/patches/170-dma_hack.patch | 6 +- 4 files changed, 41 insertions(+), 81 deletions(-) (limited to 'target/linux/ifxmips') diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile index 6df19009cf..04c620cc88 100644 --- a/target/linux/ifxmips/Makefile +++ b/target/linux/ifxmips/Makefile @@ -10,7 +10,7 @@ ARCH:=mips BOARD:=ifxmips BOARDNAME:=Infineon Mips FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.25.10 +LINUX_VERSION:=2.6.25.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES:=uboot-ifxmips diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch index 38c8fd6b01..0e82af76b2 100644 --- a/target/linux/ifxmips/patches/100-board.patch +++ b/target/linux/ifxmips/patches/100-board.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.7/arch/mips/Kconfig -=================================================================== ---- linux-2.6.25.7.orig/arch/mips/Kconfig 2008-06-26 10:42:44.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/Kconfig 2008-06-26 22:05:19.000000000 +0200 +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig @@ -78,6 +78,21 @@ select SYS_SUPPORTS_LITTLE_ENDIAN select GENERIC_HARDIRQS_NO__DO_IRQ @@ -32,10 +30,8 @@ Index: linux-2.6.25.7/arch/mips/Kconfig endmenu -Index: linux-2.6.25.7/arch/mips/Makefile -=================================================================== ---- linux-2.6.25.7.orig/arch/mips/Makefile 2008-06-26 10:42:55.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/Makefile 2008-06-26 10:42:56.000000000 +0200 +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile @@ -283,6 +283,13 @@ load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 @@ -50,10 +46,8 @@ Index: linux-2.6.25.7/arch/mips/Makefile # DECstation family # core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/ -Index: linux-2.6.25.7/include/asm-mips/bootinfo.h -=================================================================== ---- linux-2.6.25.7.orig/include/asm-mips/bootinfo.h 2008-06-26 10:42:44.000000000 +0200 -+++ linux-2.6.25.7/include/asm-mips/bootinfo.h 2008-06-26 10:42:56.000000000 +0200 +--- a/include/asm-mips/bootinfo.h ++++ b/include/asm-mips/bootinfo.h @@ -94,6 +94,12 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ @@ -67,10 +61,8 @@ Index: linux-2.6.25.7/include/asm-mips/bootinfo.h #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; -Index: linux-2.6.25.7/arch/mips/kernel/traps.c -=================================================================== ---- linux-2.6.25.7.orig/arch/mips/kernel/traps.c 2008-06-26 10:42:44.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/kernel/traps.c 2008-06-26 10:42:56.000000000 +0200 +--- a/arch/mips/kernel/traps.c ++++ b/arch/mips/kernel/traps.c @@ -1379,6 +1379,7 @@ */ if (cpu_has_mips_r2) { @@ -79,10 +71,8 @@ Index: linux-2.6.25.7/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.25.7/arch/mips/pci/Makefile -=================================================================== ---- linux-2.6.25.7.orig/arch/mips/pci/Makefile 2008-06-26 10:42:44.000000000 +0200 -+++ linux-2.6.25.7/arch/mips/pci/Makefile 2008-06-26 10:42:56.000000000 +0200 +--- a/arch/mips/pci/Makefile ++++ b/arch/mips/pci/Makefile @@ -48,3 +48,4 @@ obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch index c4627972ca..38d7f0021a 100644 --- a/target/linux/ifxmips/patches/110-drivers.patch +++ b/target/linux/ifxmips/patches/110-drivers.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.7/drivers/char/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/char/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/char/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/char/Makefile ++++ b/drivers/char/Makefile @@ -113,6 +113,10 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o @@ -13,19 +11,15 @@ Index: linux-2.6.25.7/drivers/char/Makefile # Files generated that shall be removed upon make clean clean-files := consolemap_deftbl.c defkeymap.c -Index: linux-2.6.25.7/drivers/mtd/maps/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/mtd/maps/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/mtd/maps/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/mtd/maps/Makefile ++++ b/drivers/mtd/maps/Makefile @@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o +obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o -Index: linux-2.6.25.7/drivers/net/Kconfig -=================================================================== ---- linux-2.6.25.7.orig/drivers/net/Kconfig 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/net/Kconfig 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/net/Kconfig ++++ b/drivers/net/Kconfig @@ -351,6 +351,12 @@ source "drivers/net/arm/Kconfig" @@ -39,10 +33,8 @@ Index: linux-2.6.25.7/drivers/net/Kconfig config AX88796 tristate "ASIX AX88796 NE2000 clone support" depends on ARM || MIPS || SUPERH -Index: linux-2.6.25.7/drivers/serial/Kconfig -=================================================================== ---- linux-2.6.25.7.orig/drivers/serial/Kconfig 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/serial/Kconfig 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/serial/Kconfig ++++ b/drivers/serial/Kconfig @@ -1327,6 +1327,14 @@ Currently, only 8250 compatible ports are supported, but others can easily be added. @@ -58,20 +50,16 @@ Index: linux-2.6.25.7/drivers/serial/Kconfig config SERIAL_QE tristate "Freescale QUICC Engine serial port support" depends on QUICC_ENGINE -Index: linux-2.6.25.7/drivers/serial/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/serial/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/serial/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/serial/Makefile ++++ b/drivers/serial/Makefile @@ -66,4 +66,5 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o -Index: linux-2.6.25.7/drivers/watchdog/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/watchdog/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/watchdog/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/watchdog/Makefile ++++ b/drivers/watchdog/Makefile @@ -96,6 +96,7 @@ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o obj-$(CONFIG_AR7_WDT) += ar7_wdt.o @@ -80,19 +68,15 @@ Index: linux-2.6.25.7/drivers/watchdog/Makefile # PARISC Architecture -Index: linux-2.6.25.7/drivers/net/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/net/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/net/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/net/Makefile ++++ b/drivers/net/Makefile @@ -254,3 +254,4 @@ obj-$(CONFIG_NETXEN_NIC) += netxen/ obj-$(CONFIG_NIU) += niu.o obj-$(CONFIG_VIRTIO_NET) += virtio_net.o +obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o -Index: linux-2.6.25.7/drivers/crypto/Kconfig -=================================================================== ---- linux-2.6.25.7.orig/drivers/crypto/Kconfig 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/crypto/Kconfig 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/crypto/Kconfig ++++ b/drivers/crypto/Kconfig @@ -9,6 +9,9 @@ If you say N, all options in this submenu will be skipped and disabled. @@ -103,19 +87,15 @@ Index: linux-2.6.25.7/drivers/crypto/Kconfig config CRYPTO_DEV_PADLOCK tristate "Support for VIA PadLock ACE" -Index: linux-2.6.25.7/drivers/crypto/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/crypto/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/crypto/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/crypto/Makefile ++++ b/drivers/crypto/Makefile @@ -2,3 +2,4 @@ obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o +obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o -Index: linux-2.6.25.7/drivers/usb/host/Kconfig -=================================================================== ---- linux-2.6.25.7.orig/drivers/usb/host/Kconfig 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/usb/host/Kconfig 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/usb/host/Kconfig ++++ b/drivers/usb/host/Kconfig @@ -260,3 +260,9 @@ To compile this driver as a module, choose M here: the module will be called r8a66597-hcd. @@ -126,10 +106,8 @@ Index: linux-2.6.25.7/drivers/usb/host/Kconfig + default y + help + Danube USB Host Controller -Index: linux-2.6.25.7/drivers/usb/host/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/usb/host/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/usb/host/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/usb/host/Makefile ++++ b/drivers/usb/host/Makefile @@ -16,4 +16,6 @@ obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o @@ -138,10 +116,8 @@ Index: linux-2.6.25.7/drivers/usb/host/Makefile +obj-$(CONFIG_USB_DWC_HCD) += dwc_otg_hcd.o dwc_otg_hcd_intr.o dwc_otg_hcd_queue.o \ + dwc_otg_attr.o dwc_otg_driver.o dwc_otg_cil.o \ + dwc_otg_cil_intr.o dwc_otg_proc.o dwc_otg_ifx.o -Index: linux-2.6.25.7/drivers/leds/Kconfig -=================================================================== ---- linux-2.6.25.7.orig/drivers/leds/Kconfig 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/leds/Kconfig 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/leds/Kconfig ++++ b/drivers/leds/Kconfig @@ -151,6 +151,12 @@ To compile this driver as a module, choose M here: the module will be called leds-clevo-mail. @@ -155,10 +131,8 @@ Index: linux-2.6.25.7/drivers/leds/Kconfig comment "LED Triggers" config LEDS_TRIGGERS -Index: linux-2.6.25.7/drivers/leds/Makefile -=================================================================== ---- linux-2.6.25.7.orig/drivers/leds/Makefile 2008-06-26 09:53:43.000000000 +0200 -+++ linux-2.6.25.7/drivers/leds/Makefile 2008-06-26 09:53:53.000000000 +0200 +--- a/drivers/leds/Makefile ++++ b/drivers/leds/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o @@ -167,10 +141,8 @@ Index: linux-2.6.25.7/drivers/leds/Makefile # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -Index: linux-2.6.25.7/drivers/watchdog/Kconfig -=================================================================== ---- linux-2.6.25.7.orig/drivers/watchdog/Kconfig 2008-06-26 10:21:00.000000000 +0200 -+++ linux-2.6.25.7/drivers/watchdog/Kconfig 2008-06-26 10:22:13.000000000 +0200 +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig @@ -670,6 +670,12 @@ help Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. diff --git a/target/linux/ifxmips/patches/170-dma_hack.patch b/target/linux/ifxmips/patches/170-dma_hack.patch index 1a0f98c86a..38c58bb5cc 100644 --- a/target/linux/ifxmips/patches/170-dma_hack.patch +++ b/target/linux/ifxmips/patches/170-dma_hack.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.25.9/arch/mips/mm/cache.c -=================================================================== ---- linux-2.6.25.9.orig/arch/mips/mm/cache.c 2008-07-06 05:04:46.000000000 +0200 -+++ linux-2.6.25.9/arch/mips/mm/cache.c 2008-07-06 05:05:07.000000000 +0200 +--- a/arch/mips/mm/cache.c ++++ b/arch/mips/mm/cache.c @@ -50,6 +50,8 @@ void (*_dma_cache_inv)(unsigned long start, unsigned long size); -- cgit v1.2.3