2008-07-26 18:53:23 +08:00
|
|
|
--- a/arch/mips/Kconfig
|
|
|
|
+++ b/arch/mips/Kconfig
|
2008-11-07 04:55:33 +08:00
|
|
|
@@ -78,6 +78,21 @@ config MIPS_COBALT
|
2007-12-21 06:29:45 +08:00
|
|
|
select SYS_SUPPORTS_LITTLE_ENDIAN
|
|
|
|
select GENERIC_HARDIRQS_NO__DO_IRQ
|
|
|
|
|
2007-12-22 08:17:22 +08:00
|
|
|
+config IFXMIPS
|
2008-06-29 00:56:04 +08:00
|
|
|
+ bool "Infineon Twinpass, Danube, Amazon-SE"
|
2008-05-08 15:18:51 +08:00
|
|
|
+ select DMA_NONCOHERENT
|
|
|
|
+ select IRQ_CPU
|
2008-05-10 08:20:36 +08:00
|
|
|
+ select CEVT_R4K
|
|
|
|
+ select CSRC_R4K
|
2008-05-08 15:18:51 +08:00
|
|
|
+ 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
|
2008-06-18 06:44:38 +08:00
|
|
|
+ select GENERIC_GPIO
|
2008-06-08 00:04:31 +08:00
|
|
|
+ select SWAP_IO_SPACE
|
2007-12-21 06:29:45 +08:00
|
|
|
+
|
|
|
|
config MACH_DECSTATION
|
|
|
|
bool "DECstations"
|
|
|
|
select BOOT_ELF32
|
2008-11-07 04:55:33 +08:00
|
|
|
@@ -697,6 +712,7 @@ source "arch/mips/sibyte/Kconfig"
|
2008-05-11 22:14:33 +08:00
|
|
|
source "arch/mips/tx4927/Kconfig"
|
|
|
|
source "arch/mips/tx4938/Kconfig"
|
|
|
|
source "arch/mips/vr41xx/Kconfig"
|
|
|
|
+source "arch/mips/ifxmips/Kconfig"
|
|
|
|
|
|
|
|
endmenu
|
|
|
|
|
2008-07-26 18:53:23 +08:00
|
|
|
--- a/arch/mips/Makefile
|
|
|
|
+++ b/arch/mips/Makefile
|
2008-11-07 04:55:33 +08:00
|
|
|
@@ -283,6 +283,13 @@ cflags-$(CONFIG_MIPS_COBALT) += -Iinclud
|
2007-12-21 06:29:45 +08:00
|
|
|
load-$(CONFIG_MIPS_COBALT) += 0xffffffff80080000
|
|
|
|
|
2008-06-18 06:44:38 +08:00
|
|
|
#
|
2007-12-22 08:17:22 +08:00
|
|
|
+# Infineon IFXMIPS
|
2008-06-18 06:44:38 +08:00
|
|
|
+#
|
2008-05-08 15:18:51 +08:00
|
|
|
+core-$(CONFIG_IFXMIPS) += arch/mips/ifxmips/
|
|
|
|
+cflags-$(CONFIG_IFXMIPS) += -Iinclude/asm-mips/mach-ifxmips
|
|
|
|
+load-$(CONFIG_IFXMIPS) += 0xffffffff80002000
|
|
|
|
+
|
2008-06-18 06:44:38 +08:00
|
|
|
+#
|
2007-12-21 06:29:45 +08:00
|
|
|
# DECstation family
|
|
|
|
#
|
2008-06-18 06:44:38 +08:00
|
|
|
core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/
|
2008-07-26 18:53:23 +08:00
|
|
|
--- a/include/asm-mips/bootinfo.h
|
|
|
|
+++ b/include/asm-mips/bootinfo.h
|
2008-05-08 15:18:51 +08:00
|
|
|
@@ -94,6 +94,12 @@
|
|
|
|
#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
|
|
|
|
#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
|
2007-12-21 06:29:45 +08:00
|
|
|
|
2008-05-08 15:18:51 +08:00
|
|
|
+/*
|
|
|
|
+ * Valid machtype for group IFXMIPS
|
|
|
|
+ */
|
|
|
|
+#define MACH_GROUP_IFXMIPS 29
|
|
|
|
+#define MACH_INFINEON_IFXMIPS 0
|
2007-12-21 06:29:45 +08:00
|
|
|
+
|
|
|
|
#define CL_SIZE COMMAND_LINE_SIZE
|
|
|
|
|
2008-05-08 15:18:51 +08:00
|
|
|
extern char *system_type;
|
2008-07-26 18:53:23 +08:00
|
|
|
--- a/arch/mips/kernel/traps.c
|
|
|
|
+++ b/arch/mips/kernel/traps.c
|
2008-11-07 04:55:33 +08:00
|
|
|
@@ -1464,6 +1464,7 @@ void __cpuinit per_cpu_trap_init(void)
|
2008-05-10 08:20:36 +08:00
|
|
|
*/
|
|
|
|
if (cpu_has_mips_r2) {
|
|
|
|
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
|
|
|
|
+ cp0_compare_irq = CP0_LEGACY_COMPARE_IRQ;
|
|
|
|
cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
|
|
|
|
if (cp0_perfcount_irq == cp0_compare_irq)
|
|
|
|
cp0_perfcount_irq = -1;
|
2008-07-26 18:53:23 +08:00
|
|
|
--- a/arch/mips/pci/Makefile
|
|
|
|
+++ b/arch/mips/pci/Makefile
|
2008-11-07 04:55:33 +08:00
|
|
|
@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-
|
2008-06-18 06:44:38 +08:00
|
|
|
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
|