b1577150c9f9df4b5479ee6bf98c655187fc7093
[openwrt/svn-archive/archive.git] / target / linux / ar7 / patches-2.6.22 / 100-board_support.patch
1 diff -urN linux-2.6.22/arch/mips/Kconfig linux-2.6.22.new/arch/mips/Kconfig
2 --- linux-2.6.22/arch/mips/Kconfig 2007-07-09 01:32:17.000000000 +0200
3 +++ linux-2.6.22.new/arch/mips/Kconfig 2007-07-11 02:34:51.000000000 +0200
4 @@ -15,6 +15,22 @@
5 prompt "System type"
6 default SGI_IP22
7
8 +config AR7
9 + bool "Texas Instruments AR7"
10 + select BOOT_ELF32
11 + select DMA_NONCOHERENT
12 + select HW_HAS_PCI
13 + select IRQ_CPU
14 + select SWAP_IO_SPACE
15 + select SYS_HAS_CPU_MIPS32_R1
16 + select SYS_HAS_EARLY_PRINTK
17 + select SYS_SUPPORTS_32BIT_KERNEL
18 + select SYS_SUPPORTS_KGDB
19 + select SYS_SUPPORTS_LITTLE_ENDIAN
20 + select SYS_SUPPORTS_BIG_ENDIAN
21 + select GENERIC_GPIO
22 + select GENERIC_HARDIRQS_NO__DO_IRQ
23 +
24 config MACH_ALCHEMY
25 bool "Alchemy processor based machines"
26
27 diff -urN linux-2.6.22/arch/mips/kernel/traps.c linux-2.6.22.new/arch/mips/kernel/traps.c
28 --- linux-2.6.22/arch/mips/kernel/traps.c 2007-07-09 01:32:17.000000000 +0200
29 +++ linux-2.6.22.new/arch/mips/kernel/traps.c 2007-07-11 02:32:39.000000000 +0200
30 @@ -1074,11 +1074,23 @@ void *set_except_vector(int n, void *addr)
31 unsigned long old_handler = exception_handlers[n];
32
33 exception_handlers[n] = handler;
34 - if (n == 0 && cpu_has_divec) {
35 - *(volatile u32 *)(ebase + 0x200) = 0x08000000 |
36 - (0x03ffffff & (handler >> 2));
37 - flush_icache_range(ebase + 0x200, ebase + 0x204);
38 - }
39 + if (n == 0 && cpu_has_divec)
40 + if ((handler ^ (ebase + 4)) & 0xfc000000) {
41 + /* lui k0, 0x0000 */
42 + *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
43 + /* ori k0, 0x0000 */
44 + *(u32 *)(ebase + 0x204) =
45 + 0x375a0000 | (handler & 0xffff);
46 + /* jr k0 */
47 + *(u32 *)(ebase + 0x208) = 0x03400008;
48 + /* nop */
49 + *(u32 *)(ebase + 0x20C) = 0x00000000;
50 + flush_icache_range(ebase + 0x200, ebase + 0x210);
51 + } else {
52 + *(volatile u32 *)(ebase + 0x200) =
53 + 0x08000000 | (0x03ffffff & (handler >> 2));
54 + flush_icache_range(ebase + 0x200, ebase + 0x204);
55 + }
56 return (void *)old_handler;
57 }
58
59 diff -urN linux-2.6.22/arch/mips/Makefile linux-2.6.22.new/arch/mips/Makefile
60 --- linux-2.6.22/arch/mips/Makefile 2007-07-09 01:32:17.000000000 +0200
61 +++ linux-2.6.22.new/arch/mips/Makefile 2007-07-11 02:32:39.000000000 +0200
62 @@ -158,6 +158,13 @@
63 #
64
65 #
66 +# Texas Instruments AR7
67 +#
68 +core-$(CONFIG_AR7) += arch/mips/ar7/
69 +cflags-$(CONFIG_AR7) += -Iinclude/asm-mips/ar7
70 +load-$(CONFIG_AR7) += 0xffffffff94100000
71 +
72 +#
73 # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
74 #
75 core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
76 diff -urN linux-2.6.22.4/include/asm-mips/page.h linux-2.6.22.4.new/include/asm-mips/page.h
77 --- linux-2.6.22.4/include/asm-mips/page.h 2007-08-21 12:33:06.000000000 +0800
78 +++ linux-2.6.22.4.new/include/asm-mips/page.h 2007-09-13 15:13:00.000000000 +0800
79 @@ -187,8 +187,10 @@
80 #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
81 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
82
83 -#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE)
84 -#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET)
85 +#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \
86 + PHYS_OFFSET)
87 +#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \
88 + PHYS_OFFSET)
89
90 #include <asm-generic/memory_model.h>
91 #include <asm-generic/page.h>