From 5ed5df3c4563a687ecfa9e0ece7690b86d6f428b Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 8 May 2008 07:18:51 +0000 Subject: bump ifxmips to 2.6.25.1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11071 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ifxmips/patches/100-board.patch | 75 ++++++-------- target/linux/ifxmips/patches/110-drivers.patch | 128 +++++++++++------------- target/linux/ifxmips/patches/160-cfi-swap.patch | 17 ++-- 3 files changed, 101 insertions(+), 119 deletions(-) (limited to 'target/linux/ifxmips/patches') diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch index 89b706ca45..909474905b 100644 --- a/target/linux/ifxmips/patches/100-board.patch +++ b/target/linux/ifxmips/patches/100-board.patch @@ -1,66 +1,57 @@ -Index: linux-2.6.23/arch/mips/Kconfig +Index: linux-2.6.25/arch/mips/Kconfig =================================================================== ---- linux-2.6.23.orig/arch/mips/Kconfig 2007-10-16 22:12:19.000000000 +0200 -+++ linux-2.6.23/arch/mips/Kconfig 2007-10-16 22:12:21.000000000 +0200 -@@ -58,6 +58,17 @@ +--- linux-2.6.25.orig/arch/mips/Kconfig 2008-05-05 08:35:34.000000000 +0100 ++++ linux-2.6.25/arch/mips/Kconfig 2008-05-05 08:35:46.000000000 +0100 +@@ -78,6 +78,17 @@ select SYS_SUPPORTS_LITTLE_ENDIAN select GENERIC_HARDIRQS_NO__DO_IRQ +config IFXMIPS -+ bool "IFXMips support" -+ select DMA_NONCOHERENT -+ select IRQ_CPU -+ select SYS_HAS_CPU_MIPS32_R1 -+ select HAVE_STD_PC_SERIAL_PORT -+ select SYS_SUPPORTS_BIG_ENDIAN -+ select SYS_SUPPORTS_32BIT_KERNEL -+ select SYS_HAS_EARLY_PRINTK -+ select HW_HAS_PCI ++ bool "IFXMips support" ++ select DMA_NONCOHERENT ++ select IRQ_CPU ++ select SYS_HAS_CPU_MIPS32_R1 ++ select HAVE_STD_PC_SERIAL_PORT ++ select SYS_SUPPORTS_BIG_ENDIAN ++ select SYS_SUPPORTS_32BIT_KERNEL ++ select SYS_HAS_EARLY_PRINTK ++ select HW_HAS_PCI + config MACH_DECSTATION bool "DECstations" select BOOT_ELF32 -@@ -605,6 +615,7 @@ - source "arch/mips/tx4927/Kconfig" - source "arch/mips/tx4938/Kconfig" - source "arch/mips/vr41xx/Kconfig" -+source "arch/mips/ifxmips/Kconfig" - - endmenu - -Index: linux-2.6.23/arch/mips/Makefile +Index: linux-2.6.25/arch/mips/Makefile =================================================================== ---- linux-2.6.23.orig/arch/mips/Makefile 2007-10-16 22:12:21.000000000 +0200 -+++ linux-2.6.23/arch/mips/Makefile 2007-10-16 22:12:21.000000000 +0200 -@@ -276,6 +276,13 @@ +--- linux-2.6.25.orig/arch/mips/Makefile 2008-05-05 08:35:35.000000000 +0100 ++++ linux-2.6.25/arch/mips/Makefile 2008-05-05 08:35:46.000000000 +0100 +@@ -282,6 +282,13 @@ cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000 +# +# Infineon IFXMIPS +# -+core-$(CONFIG_IFXMIPS) += arch/mips/ifxmips/ -+cflags-$(CONFIG_IFXMIPS) += -Iinclude/asm-mips/mach-ifxmips -+load-$(CONFIG_IFXMIPS) += 0xffffffff80002000 -+ ++core-$(CONFIG_IFXMIPS) += arch/mips/ifxmips/ ++cflags-$(CONFIG_IFXMIPS) += -Iinclude/asm-mips/mach-ifxmips ++load-$(CONFIG_IFXMIPS) += 0xffffffff80002000 ++ # # DECstation family # -Index: linux-2.6.23/include/asm-mips/bootinfo.h +Index: linux-2.6.25/include/asm-mips/bootinfo.h =================================================================== ---- linux-2.6.23.orig/include/asm-mips/bootinfo.h 2007-10-16 22:12:19.000000000 +0200 -+++ linux-2.6.23/include/asm-mips/bootinfo.h 2007-10-16 22:12:21.000000000 +0200 -@@ -208,6 +208,13 @@ - #define MACH_GROUP_WINDRIVER 28 /* Windriver boards */ - #define MACH_WRPPMC 1 +--- linux-2.6.25.orig/include/asm-mips/bootinfo.h 2008-05-05 08:35:35.000000000 +0100 ++++ linux-2.6.25/include/asm-mips/bootinfo.h 2008-05-05 08:35:46.000000000 +0100 +@@ -94,6 +94,12 @@ + #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ + #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ -+/* -+ * Valid machtype for group ATHEROS -+ */ -+#define MACH_GROUP_IFXMIPS 29 -+#define MACH_INFINEON_IFXMIPS 0 -+ ++/* ++ * Valid machtype for group IFXMIPS ++ */ ++#define MACH_GROUP_IFXMIPS 29 ++#define MACH_INFINEON_IFXMIPS 0 + #define CL_SIZE COMMAND_LINE_SIZE - const char *get_system_type(void); + extern char *system_type; diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch index fdb305b7d1..9ce88f2325 100644 --- a/target/linux/ifxmips/patches/110-drivers.patch +++ b/target/linux/ifxmips/patches/110-drivers.patch @@ -1,41 +1,34 @@ -Index: linux-2.6.23/drivers/serial/Kconfig +Index: linux-2.6.25/drivers/char/Makefile =================================================================== ---- linux-2.6.23.orig/drivers/serial/Kconfig 2007-12-22 20:21:04.563793426 +0100 -+++ linux-2.6.23/drivers/serial/Kconfig 2007-12-22 20:21:08.848037572 +0100 -@@ -1259,4 +1259,10 @@ - Currently, only 8250 compatible ports are supported, but - others can easily be added. +--- linux-2.6.25.orig/drivers/char/Makefile 2008-05-07 18:58:25.000000000 +0100 ++++ linux-2.6.25/drivers/char/Makefile 2008-05-07 18:58:42.000000000 +0100 +@@ -112,6 +112,12 @@ + obj-$(CONFIG_JS_RTC) += js-rtc.o + js-rtc-y = rtc.o -+config SERIAL_IFXMIPS -+ bool "IFXMips serial driver" -+ depends on IFXMIPS -+ help -+ Driver for the ifxmipss built in ASC hardware ++obj-$(CONFIG_IFXMIPS_LED) += ifxmips_led.o ++obj-$(CONFIG_IFXMIPS_GPIO) += ifxmips_gpio.o ++obj-$(CONFIG_IFXMIPS_SSC) += ifxmips_ssc.o ++obj-$(CONFIG_IFXMIPS_EEPROM) += ifxmips_eeprom.o ++obj-$(CONFIG_IFXMIPS_MEI) += ifxmips_mei_core.o + - endmenu -Index: linux-2.6.23/drivers/serial/Makefile -=================================================================== ---- linux-2.6.23.orig/drivers/serial/Makefile 2007-12-22 20:21:04.571793884 +0100 -+++ linux-2.6.23/drivers/serial/Makefile 2007-12-22 20:21:08.852037801 +0100 -@@ -64,3 +64,4 @@ - 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 -Index: linux-2.6.23/drivers/mtd/maps/Makefile + # Files generated that shall be removed upon make clean + clean-files := consolemap_deftbl.c defkeymap.c + +Index: linux-2.6.25/drivers/mtd/maps/Makefile =================================================================== ---- linux-2.6.23.orig/drivers/mtd/maps/Makefile 2007-12-22 20:21:04.579794340 +0100 -+++ linux-2.6.23/drivers/mtd/maps/Makefile 2007-12-22 20:21:08.860038256 +0100 -@@ -71,3 +71,4 @@ +--- linux-2.6.25.orig/drivers/mtd/maps/Makefile 2008-05-07 18:58:25.000000000 +0100 ++++ linux-2.6.25/drivers/mtd/maps/Makefile 2008-05-07 18:58:42.000000000 +0100 +@@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o - obj-$(CONFIG_MTD_TQM834x) += tqm834x.o -+obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o -Index: linux-2.6.23/drivers/net/Kconfig + obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o ++obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o +Index: linux-2.6.25/drivers/net/Kconfig =================================================================== ---- linux-2.6.23.orig/drivers/net/Kconfig 2007-12-22 20:21:08.035991295 +0100 -+++ linux-2.6.23/drivers/net/Kconfig 2007-12-22 20:21:08.860038256 +0100 -@@ -339,6 +339,18 @@ +--- linux-2.6.25.orig/drivers/net/Kconfig 2008-05-07 18:58:41.000000000 +0100 ++++ linux-2.6.25/drivers/net/Kconfig 2008-05-07 18:58:42.000000000 +0100 +@@ -351,6 +351,12 @@ source "drivers/net/arm/Kconfig" @@ -44,51 +37,48 @@ Index: linux-2.6.23/drivers/net/Kconfig + depends on IFXMIPS + help + Support for the MII0 inside the IFXMips SOC -+ -+config IFXMIPS_MII1 -+ tristate "Infineon IFXMips eth1 driver" -+ depends on IFXMIPS -+ help -+ Support for the MII1 inside the IFXMips SOC + config AX88796 tristate "ASIX AX88796 NE2000 clone support" - depends on ARM || MIPS -Index: linux-2.6.23/drivers/net/Makefile + depends on ARM || MIPS || SUPERH +Index: linux-2.6.25/drivers/serial/Kconfig =================================================================== ---- linux-2.6.23.orig/drivers/net/Makefile 2007-12-22 20:21:08.039991524 +0100 -+++ linux-2.6.23/drivers/net/Makefile 2007-12-22 20:21:08.860038256 +0100 -@@ -208,6 +208,7 @@ - obj-$(CONFIG_FEC_8XX) += fec_8xx/ - obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o - obj-$(CONFIG_MLX4_CORE) += mlx4/ -+obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o - - obj-$(CONFIG_MACB) += macb.o +--- linux-2.6.25.orig/drivers/serial/Kconfig 2008-05-07 18:58:25.000000000 +0100 ++++ linux-2.6.25/drivers/serial/Kconfig 2008-05-08 07:53:18.000000000 +0100 +@@ -1327,6 +1327,14 @@ + Currently, only 8250 compatible ports are supported, but + others can easily be added. -Index: linux-2.6.23/drivers/char/watchdog/Makefile ++config SERIAL_IFXMIPS ++ bool "IFXMips serial driver" ++ depends on IFXMIPS ++ select SERIAL_CORE ++ select SERIAL_CORE_CONSOLE ++ help ++ Driver for the ifxmipss built in ASC hardware ++ + config SERIAL_QE + tristate "Freescale QUICC Engine serial port support" + depends on QUICC_ENGINE +Index: linux-2.6.25/drivers/serial/Makefile =================================================================== ---- linux-2.6.23.orig/drivers/char/watchdog/Makefile 2007-12-22 20:21:04.599795479 +0100 -+++ linux-2.6.23/drivers/char/watchdog/Makefile 2007-12-22 20:21:08.880039396 +0100 -@@ -90,6 +90,7 @@ - obj-$(CONFIG_INDYDOG) += indydog.o - obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o - obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o +--- linux-2.6.25.orig/drivers/serial/Makefile 2008-05-07 18:58:25.000000000 +0100 ++++ linux-2.6.25/drivers/serial/Makefile 2008-05-07 18:58:42.000000000 +0100 +@@ -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/drivers/watchdog/Makefile +=================================================================== +--- linux-2.6.25.orig/drivers/watchdog/Makefile 2008-05-07 18:58:25.000000000 +0100 ++++ linux-2.6.25/drivers/watchdog/Makefile 2008-05-07 18:58:42.000000000 +0100 +@@ -96,6 +96,7 @@ + obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o + obj-$(CONFIG_AR7_WDT) += ar7_wdt.o + obj-$(CONFIG_TXX9_WDT) += txx9wdt.o +obj-$(CONFIG_IFXMIPS_WDT) += ifxmips_wdt.o # PARISC Architecture -Index: linux-2.6.23/drivers/char/Makefile -=================================================================== ---- linux-2.6.23.orig/drivers/char/Makefile 2007-12-22 20:21:04.611796164 +0100 -+++ linux-2.6.23/drivers/char/Makefile 2007-12-24 15:04:56.849129757 +0100 -@@ -135,3 +135,9 @@ - rm $@.tmp - - endif -+ -+obj-$(CONFIG_IFXMIPS_LED) += ifxmips_led.o -+obj-$(CONFIG_IFXMIPS_GPIO) += ifxmips_gpio.o -+obj-$(CONFIG_IFXMIPS_SSC) += ifxmips_ssc.o -+obj-$(CONFIG_IFXMIPS_EEPROM) += ifxmips_eeprom.o -+obj-$(CONFIG_IFXMIPS_MEI) += ifxmips_mei_core.o diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch index 116503f65d..6ddfc7e233 100644 --- a/target/linux/ifxmips/patches/160-cfi-swap.patch +++ b/target/linux/ifxmips/patches/160-cfi-swap.patch @@ -1,15 +1,16 @@ -Index: linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c +Index: linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c =================================================================== ---- linux-2.6.23.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:02:29.000000000 +0100 -+++ linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c 2007-11-02 23:07:15.000000000 +0100 -@@ -1007,7 +1007,9 @@ - int ret = 0; - map_word oldd; +--- linux-2.6.25.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-07 18:58:41.000000000 +0100 ++++ linux-2.6.25/drivers/mtd/chips/cfi_cmdset_0002.c 2008-05-07 18:58:42.000000000 +0100 +@@ -1015,7 +1015,9 @@ int retry_cnt = 0; + + adr += chip->start; - +#ifdef CONFIG_IFXMIPS + adr ^= 2; +#endif - adr += chip->start; - spin_lock(chip->mutex); + ret = get_chip(map, chip, adr, FL_WRITING); + if (ret) { + -- cgit v1.2.3