aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ifxmips
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-06-17 12:57:04 +0000
commit4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb (patch)
tree40cb3a459399cd0fc128e0f0cfcb82cab6409ed0 /target/linux/ifxmips
parent3415b8c04439a74b9311b2d5a4beb14a13341525 (diff)
downloadupstream-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.tar.gz
upstream-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.tar.bz2
upstream-4af6ac74fb0dd4b8f75c82543f3b3a17fbd75fcb.zip
upgrade to 2.6.25.7, and refresh patches
SVN-Revision: 11523
Diffstat (limited to 'target/linux/ifxmips')
-rw-r--r--target/linux/ifxmips/Makefile2
-rw-r--r--target/linux/ifxmips/patches/100-board.patch32
-rw-r--r--target/linux/ifxmips/patches/110-drivers.patch42
-rw-r--r--target/linux/ifxmips/patches/160-cfi-swap.patch8
4 files changed, 30 insertions, 54 deletions
diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile
index 46ee6fc8b6..4767dce71e 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.6
+LINUX_VERSION:=2.6.25.7
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch
index 60d2fe7372..eea8c159d2 100644
--- a/target/linux/ifxmips/patches/100-board.patch
+++ b/target/linux/ifxmips/patches/100-board.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Kconfig
-+++ linux-2.6.25.4/arch/mips/Kconfig
-@@ -78,6 +78,21 @@ config MIPS_COBALT
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -78,6 +78,21 @@
select SYS_SUPPORTS_LITTLE_ENDIAN
select GENERIC_HARDIRQS_NO__DO_IRQ
@@ -24,7 +22,7 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
config MACH_DECSTATION
bool "DECstations"
select BOOT_ELF32
-@@ -693,6 +706,7 @@ source "arch/mips/sibyte/Kconfig"
+@@ -693,6 +708,7 @@
source "arch/mips/tx4927/Kconfig"
source "arch/mips/tx4938/Kconfig"
source "arch/mips/vr41xx/Kconfig"
@@ -32,11 +30,9 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
endmenu
-Index: linux-2.6.25.4/arch/mips/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Makefile
-+++ linux-2.6.25.4/arch/mips/Makefile
-@@ -282,6 +282,13 @@ core-$(CONFIG_MIPS_COBALT) += arch/mips/
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -282,6 +282,13 @@
cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt
load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000
@@ -50,10 +46,8 @@ Index: linux-2.6.25.4/arch/mips/Makefile
#
# DECstation family
#
-Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.25.4/include/asm-mips/bootinfo.h
+--- 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,11 +61,9 @@ Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
#define CL_SIZE COMMAND_LINE_SIZE
extern char *system_type;
-Index: linux-2.6.25.4/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/kernel/traps.c
-+++ linux-2.6.25.4/arch/mips/kernel/traps.c
-@@ -1379,6 +1379,7 @@ void __cpuinit per_cpu_trap_init(void)
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1379,6 +1379,7 @@
*/
if (cpu_has_mips_r2) {
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
diff --git a/target/linux/ifxmips/patches/110-drivers.patch b/target/linux/ifxmips/patches/110-drivers.patch
index c3091be13a..a2fba85032 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.4/drivers/char/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/char/Makefile 2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/char/Makefile 2008-06-07 10:59:42.000000000 +0100
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
@@ -113,6 +113,12 @@
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
@@ -15,19 +13,15 @@ Index: linux-2.6.25.4/drivers/char/Makefile
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c
-Index: linux-2.6.25.4/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile 2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/mtd/maps/Makefile 2008-06-07 10:59:42.000000000 +0100
+--- 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.4/drivers/net/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/Kconfig 2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/net/Kconfig 2008-06-07 10:59:42.000000000 +0100
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
@@ -351,6 +351,12 @@
source "drivers/net/arm/Kconfig"
@@ -41,10 +35,8 @@ Index: linux-2.6.25.4/drivers/net/Kconfig
config AX88796
tristate "ASIX AX88796 NE2000 clone support"
depends on ARM || MIPS || SUPERH
-Index: linux-2.6.25.4/drivers/serial/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/Kconfig 2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/serial/Kconfig 2008-06-07 10:59:42.000000000 +0100
+--- 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.
@@ -60,20 +52,16 @@ Index: linux-2.6.25.4/drivers/serial/Kconfig
config SERIAL_QE
tristate "Freescale QUICC Engine serial port support"
depends on QUICC_ENGINE
-Index: linux-2.6.25.4/drivers/serial/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/Makefile 2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/serial/Makefile 2008-06-07 10:59:42.000000000 +0100
+--- 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.4/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/watchdog/Makefile 2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/watchdog/Makefile 2008-06-07 10:59:42.000000000 +0100
+--- 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
@@ -82,10 +70,8 @@ Index: linux-2.6.25.4/drivers/watchdog/Makefile
# PARISC Architecture
-Index: linux-2.6.25.4/drivers/net/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/Makefile 2008-06-07 11:00:16.000000000 +0100
-+++ linux-2.6.25.4/drivers/net/Makefile 2008-06-07 11:01:08.000000000 +0100
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
@@ -254,3 +254,4 @@
obj-$(CONFIG_NETXEN_NIC) += netxen/
obj-$(CONFIG_NIU) += niu.o
diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch
index cf749be10d..51b82023ad 100644
--- a/target/linux/ifxmips/patches/160-cfi-swap.patch
+++ b/target/linux/ifxmips/patches/160-cfi-swap.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1015,7 +1015,9 @@ static int __xipram do_write_oneword(str
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1015,7 +1015,9 @@
int retry_cnt = 0;
adr += chip->start;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:35:36 +0000