[backfire] merge r27449
[openwrt-10.03/.git] / target / linux / ifxmips / patches-2.6.30 / 100-board.patch
1 Index: linux-2.6.30.10/arch/mips/Kconfig
2 ===================================================================
3 --- linux-2.6.30.10.orig/arch/mips/Kconfig      2010-03-24 15:32:02.000000000 +0100
4 +++ linux-2.6.30.10/arch/mips/Kconfig   2010-03-24 21:56:29.000000000 +0100
5 @@ -79,6 +79,23 @@
6         select SYS_SUPPORTS_64BIT_KERNEL
7         select SYS_SUPPORTS_LITTLE_ENDIAN
8  
9 +config IFXMIPS
10 +       bool "Infineon Twinpass, Danube, Amazon-SE"
11 +       select DMA_NONCOHERENT
12 +       select IRQ_CPU
13 +       select CEVT_R4K
14 +       select CSRC_R4K
15 +       select SYS_HAS_CPU_MIPS32_R1
16 +       select SYS_HAS_CPU_MIPS32_R2
17 +       select HAVE_STD_PC_SERIAL_PORT
18 +       select SYS_SUPPORTS_BIG_ENDIAN
19 +       select SYS_SUPPORTS_32BIT_KERNEL
20 +       select SYS_SUPPORTS_MULTITHREADING
21 +       select SYS_HAS_EARLY_PRINTK
22 +       select HW_HAS_PCI
23 +       select ARCH_REQUIRE_GPIOLIB
24 +       select SWAP_IO_SPACE
25 +
26  config MACH_DECSTATION
27         bool "DECstations"
28         select BOOT_ELF32
29 @@ -643,6 +660,7 @@
30  source "arch/mips/txx9/Kconfig"
31  source "arch/mips/vr41xx/Kconfig"
32  source "arch/mips/cavium-octeon/Kconfig"
33 +source "arch/mips/ifxmips/Kconfig"
34  
35  endmenu
36  
37 Index: linux-2.6.30.10/arch/mips/Makefile
38 ===================================================================
39 --- linux-2.6.30.10.orig/arch/mips/Makefile     2010-03-24 15:32:02.000000000 +0100
40 +++ linux-2.6.30.10/arch/mips/Makefile  2010-03-24 15:32:04.000000000 +0100
41 @@ -290,6 +290,13 @@
42  load-$(CONFIG_MIPS_COBALT)     += 0xffffffff80080000
43  
44  #
45 +# Infineon IFXMIPS
46 +#
47 +core-$(CONFIG_IFXMIPS) += arch/mips/ifxmips/
48 +cflags-$(CONFIG_IFXMIPS)   += -I$(srctree)/arch/mips/include/asm/mach-ifxmips
49 +load-$(CONFIG_IFXMIPS) += 0xffffffff80002000
50 +
51 +#
52  # DECstation family
53  #
54  core-$(CONFIG_MACH_DECSTATION) += arch/mips/dec/
55 Index: linux-2.6.30.10/arch/mips/include/asm/bootinfo.h
56 ===================================================================
57 --- linux-2.6.30.10.orig/arch/mips/include/asm/bootinfo.h       2009-12-04 07:00:07.000000000 +0100
58 +++ linux-2.6.30.10/arch/mips/include/asm/bootinfo.h    2010-03-24 15:32:04.000000000 +0100
59 @@ -57,6 +57,8 @@
60  #define        MACH_MIKROTIK_RB532     0       /* Mikrotik RouterBoard 532     */
61  #define MACH_MIKROTIK_RB532A   1       /* Mikrotik RouterBoard 532A    */
62  
63 +#define MACH_INFINEON_IFXMIPS  0
64 +
65  #define CL_SIZE                        COMMAND_LINE_SIZE
66  
67  extern char *system_type;