From e2b679fd3f950e8a3cb720759f6a1d244b6a8852 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 17 Jun 2008 22:44:38 +0000 Subject: cleanup ifxmips pci code SVN-Revision: 11531 --- target/linux/ifxmips/patches/100-board.patch | 45 +++++++++++++++++++--------- 1 file changed, 31 insertions(+), 14 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 eea8c159d2..79d18cadc3 100644 --- a/target/linux/ifxmips/patches/100-board.patch +++ b/target/linux/ifxmips/patches/100-board.patch @@ -1,5 +1,7 @@ ---- a/arch/mips/Kconfig -+++ b/arch/mips/Kconfig +Index: linux-2.6.25.7/arch/mips/Kconfig +=================================================================== +--- linux-2.6.25.7.orig/arch/mips/Kconfig 2008-06-18 00:28:54.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/Kconfig 2008-06-18 00:35:50.000000000 +0200 @@ -78,6 +78,21 @@ select SYS_SUPPORTS_LITTLE_ENDIAN select GENERIC_HARDIRQS_NO__DO_IRQ @@ -16,7 +18,7 @@ + select SYS_SUPPORTS_32BIT_KERNEL + select SYS_HAS_EARLY_PRINTK + select HW_HAS_PCI -+ select GENERIC_GPIO ++ select GENERIC_GPIO + select SWAP_IO_SPACE + config MACH_DECSTATION @@ -30,24 +32,28 @@ endmenu ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -282,6 +282,13 @@ - cflags-$(CONFIG_MIPS_COBALT) += -Iinclude/asm-mips/mach-cobalt +Index: linux-2.6.25.7/arch/mips/Makefile +=================================================================== +--- linux-2.6.25.7.orig/arch/mips/Makefile 2008-06-18 00:29:07.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/Makefile 2008-06-18 00:35:42.000000000 +0200 +@@ -283,6 +283,13 @@ 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 + - # ++# # DECstation family # ---- a/include/asm-mips/bootinfo.h -+++ b/include/asm-mips/bootinfo.h + 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-18 00:28:54.000000000 +0200 ++++ linux-2.6.25.7/include/asm-mips/bootinfo.h 2008-06-18 00:29:08.000000000 +0200 @@ -94,6 +94,12 @@ #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ @@ -61,8 +67,10 @@ #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; ---- a/arch/mips/kernel/traps.c -+++ b/arch/mips/kernel/traps.c +Index: linux-2.6.25.7/arch/mips/kernel/traps.c +=================================================================== +--- linux-2.6.25.7.orig/arch/mips/kernel/traps.c 2008-06-18 00:28:54.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/kernel/traps.c 2008-06-18 00:29:08.000000000 +0200 @@ -1379,6 +1379,7 @@ */ if (cpu_has_mips_r2) { @@ -71,3 +79,12 @@ 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-18 00:34:49.000000000 +0200 ++++ linux-2.6.25.7/arch/mips/pci/Makefile 2008-06-18 00:35:03.000000000 +0200 +@@ -48,3 +48,4 @@ + obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o + obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o + obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o ++obj-$(CONFIG_IFXMIPS) += pci-ifxmips.o ops-ifxmips.o -- cgit v1.2.3