X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/c164e9d4b74927f374544ee61d4315780974b486..c4174021acc57c9d482e4496733352bcac5a0d13:/target/linux/ifxmips/patches/100-board.patch?ds=sidebyside

diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch
index 60d2fe737..2a5d79cc9 100644
--- a/target/linux/ifxmips/patches/100-board.patch
+++ b/target/linux/ifxmips/patches/100-board.patch
@@ -1,81 +1,62 @@
-Index: linux-2.6.25.4/arch/mips/Kconfig
+Index: linux-2.6.35.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
- 	select SYS_SUPPORTS_LITTLE_ENDIAN
- 	select GENERIC_HARDIRQS_NO__DO_IRQ
+--- linux-2.6.35.4.orig/arch/mips/Kconfig	2010-09-23 20:41:50.000000000 +0200
++++ linux-2.6.35.4/arch/mips/Kconfig	2010-09-23 20:41:52.000000000 +0200
+@@ -139,6 +139,9 @@
+ 
+ 	  otherwise choose R3000.
  
 +config IFXMIPS
-+	bool "IFXMips support"
-+	select DMA_NONCOHERENT
-+	select IRQ_CPU
-+	select CEVT_R4K
-+	select CSRC_R4K
-+	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
-+	select GENERIC_GPIO 
-+	select SWAP_IO_SPACE
++	bool "Infineon MIPS"
 +
- config MACH_DECSTATION
- 	bool "DECstations"
- 	select BOOT_ELF32
-@@ -693,6 +706,7 @@ source "arch/mips/sibyte/Kconfig"
- source "arch/mips/tx4927/Kconfig"
- source "arch/mips/tx4938/Kconfig"
+ config MACH_JAZZ
+ 	bool "Jazz family of machines"
+ 	select ARC
+@@ -695,6 +698,7 @@
  source "arch/mips/vr41xx/Kconfig"
+ source "arch/mips/cavium-octeon/Kconfig"
+ source "arch/mips/loongson/Kconfig"
 +source "arch/mips/ifxmips/Kconfig"
  
  endmenu
  
-Index: linux-2.6.25.4/arch/mips/Makefile
+Index: linux-2.6.35.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/
- cflags-$(CONFIG_MIPS_COBALT)	+= -Iinclude/asm-mips/mach-cobalt
+--- linux-2.6.35.4.orig/arch/mips/Makefile	2010-09-23 20:41:50.000000000 +0200
++++ linux-2.6.35.4/arch/mips/Makefile	2010-09-23 22:41:58.000000000 +0200
+@@ -339,6 +339,22 @@
  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/common/
++cflags-$(CONFIG_IFXMIPS)   += -I$(srctree)/arch/mips/include/asm/mach-ifxmips
 +
- #
++core-$(CONFIG_IFXMIPS_DANUBE) += arch/mips/ifxmips/danube/
++cflags-$(CONFIG_IFXMIPS_DANUBE)   += -I$(srctree)/arch/mips/include/asm/mach-ifxmips/danube/
++load-$(CONFIG_IFXMIPS_DANUBE) += 0xffffffff80002000
++
++core-$(CONFIG_IFXMIPS_AR9) += arch/mips/ifxmips/ar9/
++cflags-$(CONFIG_IFXMIPS_AR9)   += -I$(srctree)/arch/mips/include/asm/mach-ifxmips/ar9/
++load-$(CONFIG_IFXMIPS_AR9) += 0xffffffff80002000
++
++core-$(CONFIG_IFXMIPS_COMPAT) += arch/mips/ifxmips/compat/
++
++#
  # 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
-@@ -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 IFXMIPS
-+ */
-+#define MACH_GROUP_IFXMIPS     29
-+#define MACH_INFINEON_IFXMIPS  0
-+
- #define CL_SIZE			COMMAND_LINE_SIZE
- 
- extern char *system_type;
-Index: linux-2.6.25.4/arch/mips/kernel/traps.c
+ core-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/
+Index: linux-2.6.35.4/arch/mips/pci/Makefile
 ===================================================================
---- 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)
- 	 */
- 	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;
+--- linux-2.6.35.4.orig/arch/mips/pci/Makefile	2010-08-27 01:47:12.000000000 +0200
++++ linux-2.6.35.4/arch/mips/pci/Makefile	2010-09-23 20:41:52.000000000 +0200
+@@ -55,7 +55,7 @@
+ obj-$(CONFIG_WR_PPMC)		+= fixup-wrppmc.o
+ obj-$(CONFIG_MIKROTIK_RB532)	+= pci-rc32434.o ops-rc32434.o fixup-rc32434.o
+ obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= pci-octeon.o pcie-octeon.o
+-
++obj-$(CONFIG_IFXMIPS)			+= pci-ifxmips.o ops-ifxmips.o
+ ifdef CONFIG_PCI_MSI
+ obj-$(CONFIG_CPU_CAVIUM_OCTEON)	+= msi-octeon.o
+ endif