[kernel] generic-2.6/2.6.30: refresh patches

[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 c73c4e7..052a08a 100644 (file)
--- a/target/linux/ifxmips/patches/100-board.patch
+++ b/target/linux/ifxmips/patches/100-board.patch
@@ -1,66 +1,72 @@
-Index: linux-2.6.23/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 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -78,6 +78,23 @@ config MIPS_COBALT

        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
  
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
  

-+config DANUBE
-+      bool "Danube 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
++config IFXMIPS
++      bool "Infineon Twinpass, Danube, Amazon-SE"
++      select DMA_NONCOHERENT
++      select IRQ_CPU
++      select CEVT_R4K
++      select CSRC_R4K
++      select SYS_HAS_CPU_MIPS32_R1
++      select SYS_HAS_CPU_MIPS32_R2
++      select HAVE_STD_PC_SERIAL_PORT
++      select SYS_SUPPORTS_BIG_ENDIAN
++      select SYS_SUPPORTS_32BIT_KERNEL
++      select SYS_SUPPORTS_MULTITHREADING
++      select SYS_HAS_EARLY_PRINTK
++      select HW_HAS_PCI
++      select GENERIC_GPIO
++      select SWAP_IO_SPACE

 +
  config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
 +
  config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32

-@@ -605,6 +615,7 @@
+@@ -697,6 +714,7 @@ source "arch/mips/sibyte/Kconfig"

  source "arch/mips/tx4927/Kconfig"
  source "arch/mips/tx4938/Kconfig"
  source "arch/mips/vr41xx/Kconfig"
  source "arch/mips/tx4927/Kconfig"
  source "arch/mips/tx4938/Kconfig"
  source "arch/mips/vr41xx/Kconfig"

-+source "arch/mips/danube/Kconfig"
++source "arch/mips/ifxmips/Kconfig"

  
  endmenu
  
  
  endmenu
  

-Index: linux-2.6.23/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
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -283,6 +283,13 @@ cflags-$(CONFIG_MIPS_COBALT)      += -Iinclud

  load-$(CONFIG_MIPS_COBALT)    += 0xffffffff80080000
  
  load-$(CONFIG_MIPS_COBALT)    += 0xffffffff80080000
  

-+# 
-+# Infineon DANUBE
-+# 
-+core-$(CONFIG_DANUBE) += arch/mips/danube/ 
-+cflags-$(CONFIG_DANUBE)       += -Iinclude/asm-mips/mach-danube 
-+load-$(CONFIG_DANUBE) += 0xffffffff80002000 
-+ 

  #
  #

++# Infineon IFXMIPS
++#
++core-$(CONFIG_IFXMIPS) += arch/mips/ifxmips/
++cflags-$(CONFIG_IFXMIPS)   += -Iinclude/asm-mips/mach-ifxmips
++load-$(CONFIG_IFXMIPS) += 0xffffffff80002000
++
++#

  # DECstation family
  #
  # DECstation family
  #

-Index: linux-2.6.23/include/asm-mips/bootinfo.h
-===================================================================
---- 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
+ core-$(CONFIG_MACH_DECSTATION)        += arch/mips/dec/
+--- 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 */

  
  

-+/* 
-+ * Valid machtype for group ATHEROS 
-+ */ 
-+#define MACH_GROUP_DANUBE             29 
-+#define MACH_INFINEON_DANUBE  0
-+
++/*
++ * Valid machtype for group IFXMIPS
++ */
++#define MACH_GROUP_IFXMIPS     29
++#define MACH_INFINEON_IFXMIPS  0

 +
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
 +
  #define CL_SIZE                       COMMAND_LINE_SIZE
  

- const char *get_system_type(void);
+ extern char *system_type;
+--- a/arch/mips/pci/Makefile
++++ b/arch/mips/pci/Makefile
+@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938)       += fixup-
+ 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