update to the latest stable kernels

[openwrt.git] / target / linux / ifxmips / patches / 100-board.patch

diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch
index 89b706c..2a5d79c 100644 (file)
--- a/target/linux/ifxmips/patches/100-board.patch
+++ b/target/linux/ifxmips/patches/100-board.patch
@@ -1,66 +1,62 @@
-Index: linux-2.6.23/arch/mips/Kconfig
+Index: linux-2.6.35.4/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 @@
-       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
  
 +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 "Infineon MIPS"

 +
 +

- config MACH_DECSTATION
-       bool "DECstations"
-       select BOOT_ELF32
-@@ -605,6 +615,7 @@
- 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/vr41xx/Kconfig"

+ source "arch/mips/cavium-octeon/Kconfig"
+ source "arch/mips/loongson/Kconfig"

 +source "arch/mips/ifxmips/Kconfig"
  
  endmenu
  
 +source "arch/mips/ifxmips/Kconfig"
  
  endmenu
  

-Index: linux-2.6.23/arch/mips/Makefile
+Index: linux-2.6.35.4/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 @@
- 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
  
  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 
-+ 

  #
  #

++# Infineon IFXMIPS
++#
++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
  #
  # DECstation family
  #

-Index: linux-2.6.23/include/asm-mips/bootinfo.h
+ core-$(CONFIG_MACH_DECSTATION)        += arch/mips/dec/
+Index: linux-2.6.35.4/arch/mips/pci/Makefile

 ===================================================================
 ===================================================================

---- 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
- 
-+/* 
-+ * Valid machtype for group ATHEROS 
-+ */ 
-+#define MACH_GROUP_IFXMIPS            29 
-+#define MACH_INFINEON_IFXMIPS 0
-+
-+
- #define CL_SIZE                       COMMAND_LINE_SIZE
- 
- const char *get_system_type(void);
+--- 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