diff options
Diffstat (limited to 'arch/m32r')
-rw-r--r-- | arch/m32r/Kconfig | 7 | ||||
-rw-r--r-- | arch/m32r/boot/compressed/m32r_sio.c | 19 | ||||
-rw-r--r-- | arch/m32r/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/m32r/kernel/io_m32700ut.c | 92 | ||||
-rw-r--r-- | arch/m32r/kernel/io_mappi.c | 74 | ||||
-rw-r--r-- | arch/m32r/kernel/io_mappi2.c | 92 | ||||
-rw-r--r-- | arch/m32r/kernel/io_mappi3.c | 378 | ||||
-rw-r--r-- | arch/m32r/kernel/io_oaks32r.c | 36 | ||||
-rw-r--r-- | arch/m32r/kernel/io_opsput.c | 79 | ||||
-rw-r--r-- | arch/m32r/kernel/io_usrv.c | 51 | ||||
-rw-r--r-- | arch/m32r/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/m32r/kernel/setup_mappi2.c | 6 | ||||
-rw-r--r-- | arch/m32r/kernel/setup_mappi3.c | 208 | ||||
-rw-r--r-- | arch/m32r/mappi3/defconfig.smp | 751 | ||||
-rw-r--r-- | arch/m32r/mappi3/dot.gdbinit | 224 |
15 files changed, 1636 insertions, 385 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 0d90ea58a0cb..64c133344afe 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig | |||
@@ -78,6 +78,9 @@ config PLAT_OAKS32R | |||
78 | config PLAT_MAPPI2 | 78 | config PLAT_MAPPI2 |
79 | bool "Mappi-II(M3A-ZA36/M3A-ZA52)" | 79 | bool "Mappi-II(M3A-ZA36/M3A-ZA52)" |
80 | 80 | ||
81 | config PLAT_MAPPI3 | ||
82 | bool "Mappi-III(M3A-2170)" | ||
83 | |||
81 | endchoice | 84 | endchoice |
82 | 85 | ||
83 | choice | 86 | choice |
@@ -134,6 +137,7 @@ config BUS_CLOCK | |||
134 | int "Bus Clock [Hz] (integer)" | 137 | int "Bus Clock [Hz] (integer)" |
135 | default "70000000" if PLAT_MAPPI | 138 | default "70000000" if PLAT_MAPPI |
136 | default "25000000" if PLAT_USRV | 139 | default "25000000" if PLAT_USRV |
140 | default "50000000" if PLAT_MAPPI3 | ||
137 | default "50000000" if PLAT_M32700UT | 141 | default "50000000" if PLAT_M32700UT |
138 | default "50000000" if PLAT_OPSPUT | 142 | default "50000000" if PLAT_OPSPUT |
139 | default "33333333" if PLAT_OAKS32R | 143 | default "33333333" if PLAT_OAKS32R |
@@ -149,7 +153,7 @@ config CPU_LITTLE_ENDIAN | |||
149 | 153 | ||
150 | config MEMORY_START | 154 | config MEMORY_START |
151 | hex "Physical memory start address (hex)" | 155 | hex "Physical memory start address (hex)" |
152 | default "08000000" if PLAT_MAPPI || PLAT_MAPPI2 | 156 | default "08000000" if PLAT_MAPPI || PLAT_MAPPI2 || PLAT_MAPPI3 |
153 | default "08000000" if PLAT_USRV | 157 | default "08000000" if PLAT_USRV |
154 | default "08000000" if PLAT_M32700UT | 158 | default "08000000" if PLAT_M32700UT |
155 | default "08000000" if PLAT_OPSPUT | 159 | default "08000000" if PLAT_OPSPUT |
@@ -157,6 +161,7 @@ config MEMORY_START | |||
157 | 161 | ||
158 | config MEMORY_SIZE | 162 | config MEMORY_SIZE |
159 | hex "Physical memory size (hex)" | 163 | hex "Physical memory size (hex)" |
164 | default "08000000" if PLAT_MAPPI3 | ||
160 | default "04000000" if PLAT_MAPPI || PLAT_MAPPI2 | 165 | default "04000000" if PLAT_MAPPI || PLAT_MAPPI2 |
161 | default "02000000" if PLAT_USRV | 166 | default "02000000" if PLAT_USRV |
162 | default "01000000" if PLAT_M32700UT | 167 | default "01000000" if PLAT_M32700UT |
diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c index bad5475eff90..8f9a57271f83 100644 --- a/arch/m32r/boot/compressed/m32r_sio.c +++ b/arch/m32r/boot/compressed/m32r_sio.c | |||
@@ -6,6 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/config.h> | 8 | #include <linux/config.h> |
9 | #include <asm/processor.h> | ||
9 | 10 | ||
10 | static void putc(char c); | 11 | static void putc(char c); |
11 | 12 | ||
@@ -38,16 +39,17 @@ static int puts(const char *s) | |||
38 | 39 | ||
39 | static void putc(char c) | 40 | static void putc(char c) |
40 | { | 41 | { |
41 | 42 | while ((*BOOT_SIO0STS & 0x3) != 0x3) | |
42 | while ((*BOOT_SIO0STS & 0x3) != 0x3) ; | 43 | cpu_relax(); |
43 | if (c == '\n') { | 44 | if (c == '\n') { |
44 | *BOOT_SIO0TXB = '\r'; | 45 | *BOOT_SIO0TXB = '\r'; |
45 | while ((*BOOT_SIO0STS & 0x3) != 0x3) ; | 46 | while ((*BOOT_SIO0STS & 0x3) != 0x3) |
47 | cpu_relax(); | ||
46 | } | 48 | } |
47 | *BOOT_SIO0TXB = c; | 49 | *BOOT_SIO0TXB = c; |
48 | } | 50 | } |
49 | #else /* defined(CONFIG_PLAT_M32700UT_Alpha) || defined(CONFIG_PLAT_M32700UT) */ | 51 | #else /* !(CONFIG_PLAT_M32700UT_Alpha) && !(CONFIG_PLAT_M32700UT) */ |
50 | #ifdef CONFIG_MMU | 52 | #if defined(CONFIG_PLAT_MAPPI2) |
51 | #define SIO0STS (volatile unsigned short *)(0xa0efd000 + 14) | 53 | #define SIO0STS (volatile unsigned short *)(0xa0efd000 + 14) |
52 | #define SIO0TXB (volatile unsigned short *)(0xa0efd000 + 30) | 54 | #define SIO0TXB (volatile unsigned short *)(0xa0efd000 + 30) |
53 | #else | 55 | #else |
@@ -57,11 +59,12 @@ static void putc(char c) | |||
57 | 59 | ||
58 | static void putc(char c) | 60 | static void putc(char c) |
59 | { | 61 | { |
60 | 62 | while ((*SIO0STS & 0x1) == 0) | |
61 | while ((*SIO0STS & 0x1) == 0) ; | 63 | cpu_relax(); |
62 | if (c == '\n') { | 64 | if (c == '\n') { |
63 | *SIO0TXB = '\r'; | 65 | *SIO0TXB = '\r'; |
64 | while ((*SIO0STS & 0x1) == 0) ; | 66 | while ((*SIO0STS & 0x1) == 0) |
67 | cpu_relax(); | ||
65 | } | 68 | } |
66 | *SIO0TXB = c; | 69 | *SIO0TXB = c; |
67 | } | 70 | } |
diff --git a/arch/m32r/kernel/Makefile b/arch/m32r/kernel/Makefile index cfd690bf6d8a..6c6b6c376638 100644 --- a/arch/m32r/kernel/Makefile +++ b/arch/m32r/kernel/Makefile | |||
@@ -10,6 +10,7 @@ obj-y := process.o entry.o traps.o align.o irq.o setup.o time.o \ | |||
10 | obj-$(CONFIG_SMP) += smp.o smpboot.o | 10 | obj-$(CONFIG_SMP) += smp.o smpboot.o |
11 | obj-$(CONFIG_PLAT_MAPPI) += setup_mappi.o io_mappi.o | 11 | obj-$(CONFIG_PLAT_MAPPI) += setup_mappi.o io_mappi.o |
12 | obj-$(CONFIG_PLAT_MAPPI2) += setup_mappi2.o io_mappi2.o | 12 | obj-$(CONFIG_PLAT_MAPPI2) += setup_mappi2.o io_mappi2.o |
13 | obj-$(CONFIG_PLAT_MAPPI3) += setup_mappi3.o io_mappi3.o | ||
13 | obj-$(CONFIG_PLAT_USRV) += setup_usrv.o io_usrv.o | 14 | obj-$(CONFIG_PLAT_USRV) += setup_usrv.o io_usrv.o |
14 | obj-$(CONFIG_PLAT_M32700UT) += setup_m32700ut.o io_m32700ut.o | 15 | obj-$(CONFIG_PLAT_M32700UT) += setup_m32700ut.o io_m32700ut.o |
15 | obj-$(CONFIG_PLAT_OPSPUT) += setup_opsput.o io_opsput.o | 16 | obj-$(CONFIG_PLAT_OPSPUT) += setup_opsput.o io_opsput.o |
@@ -17,4 +18,3 @@ obj-$(CONFIG_MODULES) += module.o | |||
17 | obj-$(CONFIG_PLAT_OAKS32R) += setup_oaks32r.o io_oaks32r.o | 18 | obj-$(CONFIG_PLAT_OAKS32R) += setup_oaks32r.o io_oaks32r.o |
18 | 19 | ||
19 | EXTRA_AFLAGS := -traditional | 20 | EXTRA_AFLAGS := -traditional |
20 | |||
diff --git a/arch/m32r/kernel/io_m32700ut.c b/arch/m32r/kernel/io_m32700ut.c index 371ba904e968..e545b065f7e9 100644 --- a/arch/m32r/kernel/io_m32700ut.c +++ b/arch/m32r/kernel/io_m32700ut.c | |||
@@ -3,8 +3,8 @@ | |||
3 | * | 3 | * |
4 | * Typical I/O routines for M32700UT board. | 4 | * Typical I/O routines for M32700UT board. |
5 | * | 5 | * |
6 | * Copyright (c) 2001, 2002 Hiroyuki Kondo, Hirokazu Takata, | 6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, |
7 | * Hitoshi Yamamoto, Takeo Takahashi | 7 | * Hitoshi Yamamoto, Takeo Takahashi |
8 | * | 8 | * |
9 | * This file is subject to the terms and conditions of the GNU General | 9 | * This file is subject to the terms and conditions of the GNU General |
10 | * Public License. See the file "COPYING" in the main directory of this | 10 | * Public License. See the file "COPYING" in the main directory of this |
@@ -172,64 +172,21 @@ unsigned long _inl(unsigned long port) | |||
172 | 172 | ||
173 | unsigned char _inb_p(unsigned long port) | 173 | unsigned char _inb_p(unsigned long port) |
174 | { | 174 | { |
175 | unsigned char v; | 175 | unsigned char v = _inb(port); |
176 | |||
177 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
178 | v = _ne_inb(PORT2ADDR_NE(port)); | ||
179 | else | ||
180 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
181 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
182 | return *(volatile unsigned char *)__port2addr_ata(port); | ||
183 | } else | ||
184 | #endif | ||
185 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
186 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
187 | unsigned char b; | ||
188 | pcc_ioread_byte(0, port, &b, sizeof(b), 1, 0); | ||
189 | return b; | ||
190 | } else | ||
191 | #endif | ||
192 | v = *(volatile unsigned char *)PORT2ADDR(port); | ||
193 | |||
194 | delay(); | 176 | delay(); |
195 | return (v); | 177 | return (v); |
196 | } | 178 | } |
197 | 179 | ||
198 | unsigned short _inw_p(unsigned long port) | 180 | unsigned short _inw_p(unsigned long port) |
199 | { | 181 | { |
200 | unsigned short v; | 182 | unsigned short v = _inw(port); |
201 | |||
202 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
203 | v = _ne_inw(PORT2ADDR_NE(port)); | ||
204 | else | ||
205 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
206 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
207 | return *(volatile unsigned short *)__port2addr_ata(port); | ||
208 | } else | ||
209 | #endif | ||
210 | #if defined(CONFIG_USB) | ||
211 | if(port >= 0x340 && port < 0x3a0) | ||
212 | return *(volatile unsigned short *)PORT2ADDR_USB(port); | ||
213 | else | ||
214 | #endif | ||
215 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
216 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
217 | unsigned short w; | ||
218 | pcc_ioread_word(0, port, &w, sizeof(w), 1, 0); | ||
219 | return w; | ||
220 | } else | ||
221 | #endif | ||
222 | v = *(volatile unsigned short *)PORT2ADDR(port); | ||
223 | |||
224 | delay(); | 183 | delay(); |
225 | return (v); | 184 | return (v); |
226 | } | 185 | } |
227 | 186 | ||
228 | unsigned long _inl_p(unsigned long port) | 187 | unsigned long _inl_p(unsigned long port) |
229 | { | 188 | { |
230 | unsigned long v; | 189 | unsigned long v = _inl(port); |
231 | |||
232 | v = *(volatile unsigned long *)PORT2ADDR(port); | ||
233 | delay(); | 190 | delay(); |
234 | return (v); | 191 | return (v); |
235 | } | 192 | } |
@@ -287,52 +244,19 @@ void _outl(unsigned long l, unsigned long port) | |||
287 | 244 | ||
288 | void _outb_p(unsigned char b, unsigned long port) | 245 | void _outb_p(unsigned char b, unsigned long port) |
289 | { | 246 | { |
290 | if (port >= LAN_IOSTART && port < LAN_IOEND) | 247 | _outb(b, port); |
291 | _ne_outb(b, PORT2ADDR_NE(port)); | ||
292 | else | ||
293 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
294 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
295 | *(volatile unsigned char *)__port2addr_ata(port) = b; | ||
296 | } else | ||
297 | #endif | ||
298 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
299 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
300 | pcc_iowrite_byte(0, port, &b, sizeof(b), 1, 0); | ||
301 | } else | ||
302 | #endif | ||
303 | *(volatile unsigned char *)PORT2ADDR(port) = b; | ||
304 | |||
305 | delay(); | 248 | delay(); |
306 | } | 249 | } |
307 | 250 | ||
308 | void _outw_p(unsigned short w, unsigned long port) | 251 | void _outw_p(unsigned short w, unsigned long port) |
309 | { | 252 | { |
310 | if (port >= LAN_IOSTART && port < LAN_IOEND) | 253 | _outw(w, port); |
311 | _ne_outw(w, PORT2ADDR_NE(port)); | ||
312 | else | ||
313 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
314 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
315 | *(volatile unsigned short *)__port2addr_ata(port) = w; | ||
316 | } else | ||
317 | #endif | ||
318 | #if defined(CONFIG_USB) | ||
319 | if(port >= 0x340 && port < 0x3a0) | ||
320 | *(volatile unsigned short *)PORT2ADDR_USB(port) = w; | ||
321 | else | ||
322 | #endif | ||
323 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
324 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
325 | pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0); | ||
326 | } else | ||
327 | #endif | ||
328 | *(volatile unsigned short *)PORT2ADDR(port) = w; | ||
329 | |||
330 | delay(); | 254 | delay(); |
331 | } | 255 | } |
332 | 256 | ||
333 | void _outl_p(unsigned long l, unsigned long port) | 257 | void _outl_p(unsigned long l, unsigned long port) |
334 | { | 258 | { |
335 | *(volatile unsigned long *)PORT2ADDR(port) = l; | 259 | _outl(l, port); |
336 | delay(); | 260 | delay(); |
337 | } | 261 | } |
338 | 262 | ||
diff --git a/arch/m32r/kernel/io_mappi.c b/arch/m32r/kernel/io_mappi.c index 85688ffb52f9..78033165fb5c 100644 --- a/arch/m32r/kernel/io_mappi.c +++ b/arch/m32r/kernel/io_mappi.c | |||
@@ -3,8 +3,8 @@ | |||
3 | * | 3 | * |
4 | * Typical I/O routines for Mappi board. | 4 | * Typical I/O routines for Mappi board. |
5 | * | 5 | * |
6 | * Copyright (c) 2001, 2002 Hiroyuki Kondo, Hirokazu Takata, | 6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, |
7 | * Hitoshi Yamamoto | 7 | * Hitoshi Yamamoto |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/config.h> | 10 | #include <linux/config.h> |
@@ -130,57 +130,21 @@ unsigned long _inl(unsigned long port) | |||
130 | 130 | ||
131 | unsigned char _inb_p(unsigned long port) | 131 | unsigned char _inb_p(unsigned long port) |
132 | { | 132 | { |
133 | unsigned char v; | 133 | unsigned char v = _inb(port); |
134 | |||
135 | if (port >= 0x300 && port < 0x320) | ||
136 | v = _ne_inb(PORT2ADDR_NE(port)); | ||
137 | else | ||
138 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC) | ||
139 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
140 | unsigned char b; | ||
141 | pcc_ioread(0, port, &b, sizeof(b), 1, 0); | ||
142 | return b; | ||
143 | } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { | ||
144 | unsigned char b; | ||
145 | pcc_ioread(1, port, &b, sizeof(b), 1, 0); | ||
146 | return b; | ||
147 | } else | ||
148 | #endif | ||
149 | v = *(volatile unsigned char *)PORT2ADDR(port); | ||
150 | |||
151 | delay(); | 134 | delay(); |
152 | return (v); | 135 | return (v); |
153 | } | 136 | } |
154 | 137 | ||
155 | unsigned short _inw_p(unsigned long port) | 138 | unsigned short _inw_p(unsigned long port) |
156 | { | 139 | { |
157 | unsigned short v; | 140 | unsigned short v = _inw(port); |
158 | |||
159 | if (port >= 0x300 && port < 0x320) | ||
160 | v = _ne_inw(PORT2ADDR_NE(port)); | ||
161 | else | ||
162 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC) | ||
163 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
164 | unsigned short w; | ||
165 | pcc_ioread(0, port, &w, sizeof(w), 1, 0); | ||
166 | return w; | ||
167 | } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { | ||
168 | unsigned short w; | ||
169 | pcc_ioread(1, port, &w, sizeof(w), 1, 0); | ||
170 | return w; | ||
171 | } else | ||
172 | #endif | ||
173 | v = *(volatile unsigned short *)PORT2ADDR(port); | ||
174 | |||
175 | delay(); | 141 | delay(); |
176 | return (v); | 142 | return (v); |
177 | } | 143 | } |
178 | 144 | ||
179 | unsigned long _inl_p(unsigned long port) | 145 | unsigned long _inl_p(unsigned long port) |
180 | { | 146 | { |
181 | unsigned long v; | 147 | unsigned long v = _inl(port); |
182 | |||
183 | v = *(volatile unsigned long *)PORT2ADDR(port); | ||
184 | delay(); | 148 | delay(); |
185 | return (v); | 149 | return (v); |
186 | } | 150 | } |
@@ -229,41 +193,19 @@ void _outl(unsigned long l, unsigned long port) | |||
229 | 193 | ||
230 | void _outb_p(unsigned char b, unsigned long port) | 194 | void _outb_p(unsigned char b, unsigned long port) |
231 | { | 195 | { |
232 | if (port >= 0x300 && port < 0x320) | 196 | _outb(b, port); |
233 | _ne_outb(b, PORT2ADDR_NE(port)); | ||
234 | else | ||
235 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC) | ||
236 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
237 | pcc_iowrite(0, port, &b, sizeof(b), 1, 0); | ||
238 | } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { | ||
239 | pcc_iowrite(1, port, &b, sizeof(b), 1, 0); | ||
240 | } else | ||
241 | #endif | ||
242 | *(volatile unsigned char *)PORT2ADDR(port) = b; | ||
243 | |||
244 | delay(); | 197 | delay(); |
245 | } | 198 | } |
246 | 199 | ||
247 | void _outw_p(unsigned short w, unsigned long port) | 200 | void _outw_p(unsigned short w, unsigned long port) |
248 | { | 201 | { |
249 | if (port >= 0x300 && port < 0x320) | 202 | _outw(w, port); |
250 | _ne_outw(w, PORT2ADDR_NE(port)); | ||
251 | else | ||
252 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_PCC) | ||
253 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
254 | pcc_iowrite(0, port, &w, sizeof(w), 1, 0); | ||
255 | } else if (port >= M32R_PCC_IOSTART1 && port <= M32R_PCC_IOEND1) { | ||
256 | pcc_iowrite(1, port, &w, sizeof(w), 1, 0); | ||
257 | } else | ||
258 | #endif | ||
259 | *(volatile unsigned short *)PORT2ADDR(port) = w; | ||
260 | |||
261 | delay(); | 203 | delay(); |
262 | } | 204 | } |
263 | 205 | ||
264 | void _outl_p(unsigned long l, unsigned long port) | 206 | void _outl_p(unsigned long l, unsigned long port) |
265 | { | 207 | { |
266 | *(volatile unsigned long *)PORT2ADDR(port) = l; | 208 | _outl(l, port); |
267 | delay(); | 209 | delay(); |
268 | } | 210 | } |
269 | 211 | ||
diff --git a/arch/m32r/kernel/io_mappi2.c b/arch/m32r/kernel/io_mappi2.c index 4182cd4f97c8..5c03504bf653 100644 --- a/arch/m32r/kernel/io_mappi2.c +++ b/arch/m32r/kernel/io_mappi2.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Typical I/O routines for Mappi2 board. | 4 | * Typical I/O routines for Mappi2 board. |
5 | * | 5 | * |
6 | * Copyright (c) 2001-2003 Hiroyuki Kondo, Hirokazu Takata, | 6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, |
7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
8 | */ | 8 | */ |
9 | 9 | ||
@@ -25,7 +25,7 @@ extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int); | |||
25 | extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int); | 25 | extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int); |
26 | extern void pcc_iowrite_byte(int, unsigned long, void *, size_t, size_t, int); | 26 | extern void pcc_iowrite_byte(int, unsigned long, void *, size_t, size_t, int); |
27 | extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int); | 27 | extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int); |
28 | #endif /* CONFIG_PCMCIA && CONFIG_MAPPI2_CFC */ | 28 | #endif /* CONFIG_PCMCIA && CONFIG_M32R_CFC */ |
29 | 29 | ||
30 | #define PORT2ADDR(port) _port2addr(port) | 30 | #define PORT2ADDR(port) _port2addr(port) |
31 | #define PORT2ADDR_NE(port) _port2addr_ne(port) | 31 | #define PORT2ADDR_NE(port) _port2addr_ne(port) |
@@ -169,64 +169,21 @@ unsigned long _inl(unsigned long port) | |||
169 | 169 | ||
170 | unsigned char _inb_p(unsigned long port) | 170 | unsigned char _inb_p(unsigned long port) |
171 | { | 171 | { |
172 | unsigned char v; | 172 | unsigned char v = _inb(port); |
173 | |||
174 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
175 | v = _ne_inb(PORT2ADDR_NE(port)); | ||
176 | else | ||
177 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
178 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
179 | return *(volatile unsigned char *)__port2addr_ata(port); | ||
180 | } else | ||
181 | #endif | ||
182 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
183 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
184 | unsigned char b; | ||
185 | pcc_ioread_byte(0, port, &b, sizeof(b), 1, 0); | ||
186 | return b; | ||
187 | } else | ||
188 | #endif | ||
189 | v = *(volatile unsigned char *)PORT2ADDR(port); | ||
190 | |||
191 | delay(); | 173 | delay(); |
192 | return (v); | 174 | return (v); |
193 | } | 175 | } |
194 | 176 | ||
195 | unsigned short _inw_p(unsigned long port) | 177 | unsigned short _inw_p(unsigned long port) |
196 | { | 178 | { |
197 | unsigned short v; | 179 | unsigned short v = _inw(port); |
198 | |||
199 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
200 | v = _ne_inw(PORT2ADDR_NE(port)); | ||
201 | else | ||
202 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
203 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
204 | return *(volatile unsigned short *)__port2addr_ata(port); | ||
205 | } else | ||
206 | #endif | ||
207 | #if defined(CONFIG_USB) | ||
208 | if (port >= 0x340 && port < 0x3a0) | ||
209 | v = *(volatile unsigned short *)PORT2ADDR_USB(port); | ||
210 | else | ||
211 | #endif | ||
212 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
213 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
214 | unsigned short w; | ||
215 | pcc_ioread_word(0, port, &w, sizeof(w), 1, 0); | ||
216 | return w; | ||
217 | } else | ||
218 | #endif | ||
219 | v = *(volatile unsigned short *)PORT2ADDR(port); | ||
220 | |||
221 | delay(); | 180 | delay(); |
222 | return (v); | 181 | return (v); |
223 | } | 182 | } |
224 | 183 | ||
225 | unsigned long _inl_p(unsigned long port) | 184 | unsigned long _inl_p(unsigned long port) |
226 | { | 185 | { |
227 | unsigned long v; | 186 | unsigned long v = _inl(port); |
228 | |||
229 | v = *(volatile unsigned long *)PORT2ADDR(port); | ||
230 | delay(); | 187 | delay(); |
231 | return (v); | 188 | return (v); |
232 | } | 189 | } |
@@ -284,52 +241,19 @@ void _outl(unsigned long l, unsigned long port) | |||
284 | 241 | ||
285 | void _outb_p(unsigned char b, unsigned long port) | 242 | void _outb_p(unsigned char b, unsigned long port) |
286 | { | 243 | { |
287 | if (port >= LAN_IOSTART && port < LAN_IOEND) | 244 | _outb(b, port); |
288 | _ne_outb(b, PORT2ADDR_NE(port)); | ||
289 | else | ||
290 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
291 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
292 | *(volatile unsigned char *)__port2addr_ata(port) = b; | ||
293 | } else | ||
294 | #endif | ||
295 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
296 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
297 | pcc_iowrite_byte(0, port, &b, sizeof(b), 1, 0); | ||
298 | } else | ||
299 | #endif | ||
300 | *(volatile unsigned char *)PORT2ADDR(port) = b; | ||
301 | |||
302 | delay(); | 245 | delay(); |
303 | } | 246 | } |
304 | 247 | ||
305 | void _outw_p(unsigned short w, unsigned long port) | 248 | void _outw_p(unsigned short w, unsigned long port) |
306 | { | 249 | { |
307 | if (port >= LAN_IOSTART && port < LAN_IOEND) | 250 | _outw(w, port); |
308 | _ne_outw(w, PORT2ADDR_NE(port)); | ||
309 | else | ||
310 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
311 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
312 | *(volatile unsigned short *)__port2addr_ata(port) = w; | ||
313 | } else | ||
314 | #endif | ||
315 | #if defined(CONFIG_USB) | ||
316 | if (port >= 0x340 && port < 0x3a0) | ||
317 | *(volatile unsigned short *)PORT2ADDR_USB(port) = w; | ||
318 | else | ||
319 | #endif | ||
320 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
321 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
322 | pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0); | ||
323 | } else | ||
324 | #endif | ||
325 | *(volatile unsigned short *)PORT2ADDR(port) = w; | ||
326 | |||
327 | delay(); | 251 | delay(); |
328 | } | 252 | } |
329 | 253 | ||
330 | void _outl_p(unsigned long l, unsigned long port) | 254 | void _outl_p(unsigned long l, unsigned long port) |
331 | { | 255 | { |
332 | *(volatile unsigned long *)PORT2ADDR(port) = l; | 256 | _outl(l, port); |
333 | delay(); | 257 | delay(); |
334 | } | 258 | } |
335 | 259 | ||
diff --git a/arch/m32r/kernel/io_mappi3.c b/arch/m32r/kernel/io_mappi3.c new file mode 100644 index 000000000000..c80bde657854 --- /dev/null +++ b/arch/m32r/kernel/io_mappi3.c | |||
@@ -0,0 +1,378 @@ | |||
1 | /* | ||
2 | * linux/arch/m32r/kernel/io_mappi3.c | ||
3 | * | ||
4 | * Typical I/O routines for Mappi3 board. | ||
5 | * | ||
6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, | ||
7 | * Hitoshi Yamamoto, Mamoru Sakugawa | ||
8 | */ | ||
9 | |||
10 | #include <linux/config.h> | ||
11 | #include <asm/m32r.h> | ||
12 | #include <asm/page.h> | ||
13 | #include <asm/io.h> | ||
14 | #include <asm/byteorder.h> | ||
15 | |||
16 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
17 | #include <linux/types.h> | ||
18 | |||
19 | #define M32R_PCC_IOMAP_SIZE 0x1000 | ||
20 | |||
21 | #define M32R_PCC_IOSTART0 0x1000 | ||
22 | #define M32R_PCC_IOEND0 (M32R_PCC_IOSTART0 + M32R_PCC_IOMAP_SIZE - 1) | ||
23 | |||
24 | extern void pcc_ioread_byte(int, unsigned long, void *, size_t, size_t, int); | ||
25 | extern void pcc_ioread_word(int, unsigned long, void *, size_t, size_t, int); | ||
26 | extern void pcc_iowrite_byte(int, unsigned long, void *, size_t, size_t, int); | ||
27 | extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int); | ||
28 | #endif /* CONFIG_PCMCIA && CONFIG_M32R_CFC */ | ||
29 | |||
30 | #define PORT2ADDR(port) _port2addr(port) | ||
31 | #define PORT2ADDR_NE(port) _port2addr_ne(port) | ||
32 | #define PORT2ADDR_USB(port) _port2addr_usb(port) | ||
33 | |||
34 | static inline void *_port2addr(unsigned long port) | ||
35 | { | ||
36 | return (void *)(port + NONCACHE_OFFSET); | ||
37 | } | ||
38 | |||
39 | #define LAN_IOSTART 0x300 | ||
40 | #define LAN_IOEND 0x320 | ||
41 | |||
42 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
43 | static inline void *__port2addr_ata(unsigned long port) | ||
44 | { | ||
45 | static int dummy_reg; | ||
46 | |||
47 | switch (port) { | ||
48 | case 0x1f0: return (void *)0xb4002000; | ||
49 | case 0x1f1: return (void *)0xb4012800; | ||
50 | case 0x1f2: return (void *)0xb4012002; | ||
51 | case 0x1f3: return (void *)0xb4012802; | ||
52 | case 0x1f4: return (void *)0xb4012004; | ||
53 | case 0x1f5: return (void *)0xb4012804; | ||
54 | case 0x1f6: return (void *)0xb4012006; | ||
55 | case 0x1f7: return (void *)0xb4012806; | ||
56 | case 0x3f6: return (void *)0xb401200e; | ||
57 | default: return (void *)&dummy_reg; | ||
58 | } | ||
59 | } | ||
60 | #endif | ||
61 | |||
62 | static inline void *_port2addr_ne(unsigned long port) | ||
63 | { | ||
64 | return (void *)(port + NONCACHE_OFFSET + 0x10000000); | ||
65 | } | ||
66 | |||
67 | static inline void *_port2addr_usb(unsigned long port) | ||
68 | { | ||
69 | return (void *)(port + NONCACHE_OFFSET + 0x12000000); | ||
70 | } | ||
71 | static inline void delay(void) | ||
72 | { | ||
73 | __asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory"); | ||
74 | } | ||
75 | |||
76 | /* | ||
77 | * NIC I/O function | ||
78 | */ | ||
79 | |||
80 | static inline unsigned char _ne_inb(void *portp) | ||
81 | { | ||
82 | return (unsigned char) *(volatile unsigned char *)portp; | ||
83 | } | ||
84 | |||
85 | static inline unsigned short _ne_inw(void *portp) | ||
86 | { | ||
87 | return (unsigned short)le16_to_cpu(*(volatile unsigned short *)portp); | ||
88 | } | ||
89 | |||
90 | static inline void _ne_insb(void *portp, void * addr, unsigned long count) | ||
91 | { | ||
92 | unsigned char *buf = addr; | ||
93 | |||
94 | while (count--) | ||
95 | *buf++ = *(volatile unsigned char *)portp; | ||
96 | } | ||
97 | |||
98 | static inline void _ne_outb(unsigned char b, void *portp) | ||
99 | { | ||
100 | *(volatile unsigned char *)portp = (unsigned char)b; | ||
101 | } | ||
102 | |||
103 | static inline void _ne_outw(unsigned short w, void *portp) | ||
104 | { | ||
105 | *(volatile unsigned short *)portp = cpu_to_le16(w); | ||
106 | } | ||
107 | |||
108 | unsigned char _inb(unsigned long port) | ||
109 | { | ||
110 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
111 | return _ne_inb(PORT2ADDR_NE(port)); | ||
112 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
113 | else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
114 | return *(volatile unsigned char *)__port2addr_ata(port); | ||
115 | } | ||
116 | #endif | ||
117 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
118 | else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
119 | unsigned char b; | ||
120 | pcc_ioread_byte(0, port, &b, sizeof(b), 1, 0); | ||
121 | return b; | ||
122 | } else | ||
123 | #endif | ||
124 | return *(volatile unsigned char *)PORT2ADDR(port); | ||
125 | } | ||
126 | |||
127 | unsigned short _inw(unsigned long port) | ||
128 | { | ||
129 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
130 | return _ne_inw(PORT2ADDR_NE(port)); | ||
131 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
132 | else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
133 | return *(volatile unsigned short *)__port2addr_ata(port); | ||
134 | } | ||
135 | #endif | ||
136 | #if defined(CONFIG_USB) | ||
137 | else if (port >= 0x340 && port < 0x3a0) | ||
138 | return *(volatile unsigned short *)PORT2ADDR_USB(port); | ||
139 | #endif | ||
140 | |||
141 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
142 | else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
143 | unsigned short w; | ||
144 | pcc_ioread_word(0, port, &w, sizeof(w), 1, 0); | ||
145 | return w; | ||
146 | } else | ||
147 | #endif | ||
148 | return *(volatile unsigned short *)PORT2ADDR(port); | ||
149 | } | ||
150 | |||
151 | unsigned long _inl(unsigned long port) | ||
152 | { | ||
153 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
154 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
155 | unsigned long l; | ||
156 | pcc_ioread_word(0, port, &l, sizeof(l), 1, 0); | ||
157 | return l; | ||
158 | } else | ||
159 | #endif | ||
160 | return *(volatile unsigned long *)PORT2ADDR(port); | ||
161 | } | ||
162 | |||
163 | unsigned char _inb_p(unsigned long port) | ||
164 | { | ||
165 | unsigned char v = _inb(port); | ||
166 | delay(); | ||
167 | return (v); | ||
168 | } | ||
169 | |||
170 | unsigned short _inw_p(unsigned long port) | ||
171 | { | ||
172 | unsigned short v = _inw(port); | ||
173 | delay(); | ||
174 | return (v); | ||
175 | } | ||
176 | |||
177 | unsigned long _inl_p(unsigned long port) | ||
178 | { | ||
179 | unsigned long v = _inl(port); | ||
180 | delay(); | ||
181 | return (v); | ||
182 | } | ||
183 | |||
184 | void _outb(unsigned char b, unsigned long port) | ||
185 | { | ||
186 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
187 | _ne_outb(b, PORT2ADDR_NE(port)); | ||
188 | else | ||
189 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
190 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
191 | *(volatile unsigned char *)__port2addr_ata(port) = b; | ||
192 | } else | ||
193 | #endif | ||
194 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
195 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
196 | pcc_iowrite_byte(0, port, &b, sizeof(b), 1, 0); | ||
197 | } else | ||
198 | #endif | ||
199 | *(volatile unsigned char *)PORT2ADDR(port) = b; | ||
200 | } | ||
201 | |||
202 | void _outw(unsigned short w, unsigned long port) | ||
203 | { | ||
204 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
205 | _ne_outw(w, PORT2ADDR_NE(port)); | ||
206 | else | ||
207 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
208 | if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
209 | *(volatile unsigned short *)__port2addr_ata(port) = w; | ||
210 | } else | ||
211 | #endif | ||
212 | #if defined(CONFIG_USB) | ||
213 | if (port >= 0x340 && port < 0x3a0) | ||
214 | *(volatile unsigned short *)PORT2ADDR_USB(port) = w; | ||
215 | else | ||
216 | #endif | ||
217 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
218 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
219 | pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0); | ||
220 | } else | ||
221 | #endif | ||
222 | *(volatile unsigned short *)PORT2ADDR(port) = w; | ||
223 | } | ||
224 | |||
225 | void _outl(unsigned long l, unsigned long port) | ||
226 | { | ||
227 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
228 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
229 | pcc_iowrite_word(0, port, &l, sizeof(l), 1, 0); | ||
230 | } else | ||
231 | #endif | ||
232 | *(volatile unsigned long *)PORT2ADDR(port) = l; | ||
233 | } | ||
234 | |||
235 | void _outb_p(unsigned char b, unsigned long port) | ||
236 | { | ||
237 | _outb(b, port); | ||
238 | delay(); | ||
239 | } | ||
240 | |||
241 | void _outw_p(unsigned short w, unsigned long port) | ||
242 | { | ||
243 | _outw(w, port); | ||
244 | delay(); | ||
245 | } | ||
246 | |||
247 | void _outl_p(unsigned long l, unsigned long port) | ||
248 | { | ||
249 | _outl(l, port); | ||
250 | delay(); | ||
251 | } | ||
252 | |||
253 | void _insb(unsigned int port, void * addr, unsigned long count) | ||
254 | { | ||
255 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
256 | _ne_insb(PORT2ADDR_NE(port), addr, count); | ||
257 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
258 | else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
259 | unsigned char *buf = addr; | ||
260 | unsigned char *portp = __port2addr_ata(port); | ||
261 | while (count--) | ||
262 | *buf++ = *(volatile unsigned char *)portp; | ||
263 | } | ||
264 | #endif | ||
265 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
266 | else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
267 | pcc_ioread_byte(0, port, (void *)addr, sizeof(unsigned char), | ||
268 | count, 1); | ||
269 | } | ||
270 | #endif | ||
271 | else { | ||
272 | unsigned char *buf = addr; | ||
273 | unsigned char *portp = PORT2ADDR(port); | ||
274 | while (count--) | ||
275 | *buf++ = *(volatile unsigned char *)portp; | ||
276 | } | ||
277 | } | ||
278 | |||
279 | void _insw(unsigned int port, void * addr, unsigned long count) | ||
280 | { | ||
281 | unsigned short *buf = addr; | ||
282 | unsigned short *portp; | ||
283 | |||
284 | if (port >= LAN_IOSTART && port < LAN_IOEND) { | ||
285 | portp = PORT2ADDR_NE(port); | ||
286 | while (count--) | ||
287 | *buf++ = *(volatile unsigned short *)portp; | ||
288 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
289 | } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
290 | pcc_ioread_word(9, port, (void *)addr, sizeof(unsigned short), | ||
291 | count, 1); | ||
292 | #endif | ||
293 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
294 | } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
295 | portp = __port2addr_ata(port); | ||
296 | while (count--) | ||
297 | *buf++ = *(volatile unsigned short *)portp; | ||
298 | #endif | ||
299 | } else { | ||
300 | portp = PORT2ADDR(port); | ||
301 | while (count--) | ||
302 | *buf++ = *(volatile unsigned short *)portp; | ||
303 | } | ||
304 | } | ||
305 | |||
306 | void _insl(unsigned int port, void * addr, unsigned long count) | ||
307 | { | ||
308 | unsigned long *buf = addr; | ||
309 | unsigned long *portp; | ||
310 | |||
311 | portp = PORT2ADDR(port); | ||
312 | while (count--) | ||
313 | *buf++ = *(volatile unsigned long *)portp; | ||
314 | } | ||
315 | |||
316 | void _outsb(unsigned int port, const void * addr, unsigned long count) | ||
317 | { | ||
318 | const unsigned char *buf = addr; | ||
319 | unsigned char *portp; | ||
320 | |||
321 | if (port >= LAN_IOSTART && port < LAN_IOEND) { | ||
322 | portp = PORT2ADDR_NE(port); | ||
323 | while (count--) | ||
324 | _ne_outb(*buf++, portp); | ||
325 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
326 | } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
327 | portp = __port2addr_ata(port); | ||
328 | while (count--) | ||
329 | *(volatile unsigned char *)portp = *buf++; | ||
330 | #endif | ||
331 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
332 | } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
333 | pcc_iowrite_byte(0, port, (void *)addr, sizeof(unsigned char), | ||
334 | count, 1); | ||
335 | #endif | ||
336 | } else { | ||
337 | portp = PORT2ADDR(port); | ||
338 | while (count--) | ||
339 | *(volatile unsigned char *)portp = *buf++; | ||
340 | } | ||
341 | } | ||
342 | |||
343 | void _outsw(unsigned int port, const void * addr, unsigned long count) | ||
344 | { | ||
345 | const unsigned short *buf = addr; | ||
346 | unsigned short *portp; | ||
347 | |||
348 | if (port >= LAN_IOSTART && port < LAN_IOEND) { | ||
349 | portp = PORT2ADDR_NE(port); | ||
350 | while (count--) | ||
351 | *(volatile unsigned short *)portp = *buf++; | ||
352 | #if defined(CONFIG_IDE) && !defined(CONFIG_M32R_CFC) | ||
353 | } else if ((port >= 0x1f0 && port <=0x1f7) || port == 0x3f6) { | ||
354 | portp = __port2addr_ata(port); | ||
355 | while (count--) | ||
356 | *(volatile unsigned short *)portp = *buf++; | ||
357 | #endif | ||
358 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
359 | } else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
360 | pcc_iowrite_word(9, port, (void *)addr, sizeof(unsigned short), | ||
361 | count, 1); | ||
362 | #endif | ||
363 | } else { | ||
364 | portp = PORT2ADDR(port); | ||
365 | while (count--) | ||
366 | *(volatile unsigned short *)portp = *buf++; | ||
367 | } | ||
368 | } | ||
369 | |||
370 | void _outsl(unsigned int port, const void * addr, unsigned long count) | ||
371 | { | ||
372 | const unsigned long *buf = addr; | ||
373 | unsigned char *portp; | ||
374 | |||
375 | portp = PORT2ADDR(port); | ||
376 | while (count--) | ||
377 | *(volatile unsigned long *)portp = *buf++; | ||
378 | } | ||
diff --git a/arch/m32r/kernel/io_oaks32r.c b/arch/m32r/kernel/io_oaks32r.c index 286964794d51..9997dddd24d7 100644 --- a/arch/m32r/kernel/io_oaks32r.c +++ b/arch/m32r/kernel/io_oaks32r.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Typical I/O routines for OAKS32R board. | 4 | * Typical I/O routines for OAKS32R board. |
5 | * | 5 | * |
6 | * Copyright (c) 2001-2004 Hiroyuki Kondo, Hirokazu Takata, | 6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, |
7 | * Hitoshi Yamamoto, Mamoru Sakugawa | 7 | * Hitoshi Yamamoto, Mamoru Sakugawa |
8 | */ | 8 | */ |
9 | 9 | ||
@@ -90,35 +90,21 @@ unsigned long _inl(unsigned long port) | |||
90 | 90 | ||
91 | unsigned char _inb_p(unsigned long port) | 91 | unsigned char _inb_p(unsigned long port) |
92 | { | 92 | { |
93 | unsigned char v; | 93 | unsigned char v = _inb(port); |
94 | |||
95 | if (port >= 0x300 && port < 0x320) | ||
96 | v = _ne_inb(PORT2ADDR_NE(port)); | ||
97 | else | ||
98 | v = *(volatile unsigned char *)PORT2ADDR(port); | ||
99 | |||
100 | delay(); | 94 | delay(); |
101 | return (v); | 95 | return (v); |
102 | } | 96 | } |
103 | 97 | ||
104 | unsigned short _inw_p(unsigned long port) | 98 | unsigned short _inw_p(unsigned long port) |
105 | { | 99 | { |
106 | unsigned short v; | 100 | unsigned short v = _inw(port); |
107 | |||
108 | if (port >= 0x300 && port < 0x320) | ||
109 | v = _ne_inw(PORT2ADDR_NE(port)); | ||
110 | else | ||
111 | v = *(volatile unsigned short *)PORT2ADDR(port); | ||
112 | |||
113 | delay(); | 101 | delay(); |
114 | return (v); | 102 | return (v); |
115 | } | 103 | } |
116 | 104 | ||
117 | unsigned long _inl_p(unsigned long port) | 105 | unsigned long _inl_p(unsigned long port) |
118 | { | 106 | { |
119 | unsigned long v; | 107 | unsigned long v = _inl(port); |
120 | |||
121 | v = *(volatile unsigned long *)PORT2ADDR(port); | ||
122 | delay(); | 108 | delay(); |
123 | return (v); | 109 | return (v); |
124 | } | 110 | } |
@@ -146,27 +132,19 @@ void _outl(unsigned long l, unsigned long port) | |||
146 | 132 | ||
147 | void _outb_p(unsigned char b, unsigned long port) | 133 | void _outb_p(unsigned char b, unsigned long port) |
148 | { | 134 | { |
149 | if (port >= 0x300 && port < 0x320) | 135 | _outb(b, port); |
150 | _ne_outb(b, PORT2ADDR_NE(port)); | ||
151 | else | ||
152 | *(volatile unsigned char *)PORT2ADDR(port) = b; | ||
153 | |||
154 | delay(); | 136 | delay(); |
155 | } | 137 | } |
156 | 138 | ||
157 | void _outw_p(unsigned short w, unsigned long port) | 139 | void _outw_p(unsigned short w, unsigned long port) |
158 | { | 140 | { |
159 | if (port >= 0x300 && port < 0x320) | 141 | _outw(w, port); |
160 | _ne_outw(w, PORT2ADDR_NE(port)); | ||
161 | else | ||
162 | *(volatile unsigned short *)PORT2ADDR(port) = w; | ||
163 | |||
164 | delay(); | 142 | delay(); |
165 | } | 143 | } |
166 | 144 | ||
167 | void _outl_p(unsigned long l, unsigned long port) | 145 | void _outl_p(unsigned long l, unsigned long port) |
168 | { | 146 | { |
169 | *(volatile unsigned long *)PORT2ADDR(port) = l; | 147 | _outl(l, port); |
170 | delay(); | 148 | delay(); |
171 | } | 149 | } |
172 | 150 | ||
diff --git a/arch/m32r/kernel/io_opsput.c b/arch/m32r/kernel/io_opsput.c index aaf42f9f76da..e34951e8156f 100644 --- a/arch/m32r/kernel/io_opsput.c +++ b/arch/m32r/kernel/io_opsput.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/m32r/kernel/io_mappi.c | 2 | * linux/arch/m32r/kernel/io_opsput.c |
3 | * | 3 | * |
4 | * Typical I/O routines for OPSPUT board. | 4 | * Typical I/O routines for OPSPUT board. |
5 | * | 5 | * |
6 | * Copyright (c) 2001, 2002 Hiroyuki Kondo, Hirokazu Takata, | 6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, |
7 | * Hitoshi Yamamoto, Takeo Takahashi | 7 | * Hitoshi Yamamoto, Takeo Takahashi |
8 | * | 8 | * |
9 | * This file is subject to the terms and conditions of the GNU General | 9 | * This file is subject to the terms and conditions of the GNU General |
10 | * Public License. See the file "COPYING" in the main directory of this | 10 | * Public License. See the file "COPYING" in the main directory of this |
@@ -98,7 +98,6 @@ unsigned char _inb(unsigned long port) | |||
98 | { | 98 | { |
99 | if (port >= LAN_IOSTART && port < LAN_IOEND) | 99 | if (port >= LAN_IOSTART && port < LAN_IOEND) |
100 | return _ne_inb(PORT2ADDR_NE(port)); | 100 | return _ne_inb(PORT2ADDR_NE(port)); |
101 | |||
102 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | 101 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) |
103 | else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | 102 | else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { |
104 | unsigned char b; | 103 | unsigned char b; |
@@ -118,7 +117,6 @@ unsigned short _inw(unsigned long port) | |||
118 | else if(port >= 0x340 && port < 0x3a0) | 117 | else if(port >= 0x340 && port < 0x3a0) |
119 | return *(volatile unsigned short *)PORT2ADDR_USB(port); | 118 | return *(volatile unsigned short *)PORT2ADDR_USB(port); |
120 | #endif | 119 | #endif |
121 | |||
122 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | 120 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) |
123 | else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | 121 | else if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { |
124 | unsigned short w; | 122 | unsigned short w; |
@@ -143,55 +141,21 @@ unsigned long _inl(unsigned long port) | |||
143 | 141 | ||
144 | unsigned char _inb_p(unsigned long port) | 142 | unsigned char _inb_p(unsigned long port) |
145 | { | 143 | { |
146 | unsigned char v; | 144 | unsigned char v = _inb(port); |
147 | |||
148 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
149 | v = _ne_inb(PORT2ADDR_NE(port)); | ||
150 | else | ||
151 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
152 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
153 | unsigned char b; | ||
154 | pcc_ioread_byte(0, port, &b, sizeof(b), 1, 0); | ||
155 | return b; | ||
156 | } else | ||
157 | #endif | ||
158 | v = *(volatile unsigned char *)PORT2ADDR(port); | ||
159 | |||
160 | delay(); | 145 | delay(); |
161 | return (v); | 146 | return (v); |
162 | } | 147 | } |
163 | 148 | ||
164 | unsigned short _inw_p(unsigned long port) | 149 | unsigned short _inw_p(unsigned long port) |
165 | { | 150 | { |
166 | unsigned short v; | 151 | unsigned short v = _inw(port); |
167 | |||
168 | if (port >= LAN_IOSTART && port < LAN_IOEND) | ||
169 | v = _ne_inw(PORT2ADDR_NE(port)); | ||
170 | else | ||
171 | #if defined(CONFIG_USB) | ||
172 | if(port >= 0x340 && port < 0x3a0) | ||
173 | return *(volatile unsigned short *)PORT2ADDR_USB(port); | ||
174 | else | ||
175 | #endif | ||
176 | |||
177 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
178 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
179 | unsigned short w; | ||
180 | pcc_ioread_word(0, port, &w, sizeof(w), 1, 0); | ||
181 | return w; | ||
182 | } else | ||
183 | #endif | ||
184 | v = *(volatile unsigned short *)PORT2ADDR(port); | ||
185 | |||
186 | delay(); | 152 | delay(); |
187 | return (v); | 153 | return (v); |
188 | } | 154 | } |
189 | 155 | ||
190 | unsigned long _inl_p(unsigned long port) | 156 | unsigned long _inl_p(unsigned long port) |
191 | { | 157 | { |
192 | unsigned long v; | 158 | unsigned long v = _inl(port); |
193 | |||
194 | v = *(volatile unsigned long *)PORT2ADDR(port); | ||
195 | delay(); | 159 | delay(); |
196 | return (v); | 160 | return (v); |
197 | } | 161 | } |
@@ -219,7 +183,6 @@ void _outw(unsigned short w, unsigned long port) | |||
219 | *(volatile unsigned short *)PORT2ADDR_USB(port) = w; | 183 | *(volatile unsigned short *)PORT2ADDR_USB(port) = w; |
220 | else | 184 | else |
221 | #endif | 185 | #endif |
222 | |||
223 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | 186 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) |
224 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | 187 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { |
225 | pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0); | 188 | pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0); |
@@ -240,43 +203,19 @@ void _outl(unsigned long l, unsigned long port) | |||
240 | 203 | ||
241 | void _outb_p(unsigned char b, unsigned long port) | 204 | void _outb_p(unsigned char b, unsigned long port) |
242 | { | 205 | { |
243 | if (port >= LAN_IOSTART && port < LAN_IOEND) | 206 | _outb(b, port); |
244 | _ne_outb(b, PORT2ADDR_NE(port)); | ||
245 | else | ||
246 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
247 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
248 | pcc_iowrite_byte(0, port, &b, sizeof(b), 1, 0); | ||
249 | } else | ||
250 | #endif | ||
251 | *(volatile unsigned char *)PORT2ADDR(port) = b; | ||
252 | |||
253 | delay(); | 207 | delay(); |
254 | } | 208 | } |
255 | 209 | ||
256 | void _outw_p(unsigned short w, unsigned long port) | 210 | void _outw_p(unsigned short w, unsigned long port) |
257 | { | 211 | { |
258 | if (port >= LAN_IOSTART && port < LAN_IOEND) | 212 | _outw(w, port); |
259 | _ne_outw(w, PORT2ADDR_NE(port)); | ||
260 | else | ||
261 | #if defined(CONFIG_USB) | ||
262 | if(port >= 0x340 && port < 0x3a0) | ||
263 | *(volatile unsigned short *)PORT2ADDR_USB(port) = w; | ||
264 | else | ||
265 | #endif | ||
266 | |||
267 | #if defined(CONFIG_PCMCIA) && defined(CONFIG_M32R_CFC) | ||
268 | if (port >= M32R_PCC_IOSTART0 && port <= M32R_PCC_IOEND0) { | ||
269 | pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0); | ||
270 | } else | ||
271 | #endif | ||
272 | *(volatile unsigned short *)PORT2ADDR(port) = w; | ||
273 | |||
274 | delay(); | 213 | delay(); |
275 | } | 214 | } |
276 | 215 | ||
277 | void _outl_p(unsigned long l, unsigned long port) | 216 | void _outl_p(unsigned long l, unsigned long port) |
278 | { | 217 | { |
279 | *(volatile unsigned long *)PORT2ADDR(port) = l; | 218 | _outl(l, port); |
280 | delay(); | 219 | delay(); |
281 | } | 220 | } |
282 | 221 | ||
diff --git a/arch/m32r/kernel/io_usrv.c b/arch/m32r/kernel/io_usrv.c index 27928a0b99ed..9eb161dcc104 100644 --- a/arch/m32r/kernel/io_usrv.c +++ b/arch/m32r/kernel/io_usrv.c | |||
@@ -3,8 +3,8 @@ | |||
3 | * | 3 | * |
4 | * Typical I/O routines for uServer board. | 4 | * Typical I/O routines for uServer board. |
5 | * | 5 | * |
6 | * Copyright (c) 2001 - 2003 Hiroyuki Kondo, Hirokazu Takata, | 6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, |
7 | * Hitoshi Yamamoto, Takeo Takahashi | 7 | * Hitoshi Yamamoto, Takeo Takahashi |
8 | * | 8 | * |
9 | * This file is subject to the terms and conditions of the GNU General | 9 | * This file is subject to the terms and conditions of the GNU General |
10 | * Public License. See the file "COPYING" in the main directory of this | 10 | * Public License. See the file "COPYING" in the main directory of this |
@@ -39,7 +39,7 @@ extern void pcc_iowrite_word(int, unsigned long, void *, size_t, size_t, int); | |||
39 | 39 | ||
40 | #define PORT2ADDR(port) _port2addr(port) | 40 | #define PORT2ADDR(port) _port2addr(port) |
41 | 41 | ||
42 | static __inline__ void *_port2addr(unsigned long port) | 42 | static inline void *_port2addr(unsigned long port) |
43 | { | 43 | { |
44 | #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) | 44 | #if defined(CONFIG_SERIAL_8250) || defined(CONFIG_SERIAL_8250_MODULE) |
45 | if (port >= UART0_IOSTART && port <= UART0_IOEND) | 45 | if (port >= UART0_IOSTART && port <= UART0_IOEND) |
@@ -50,7 +50,7 @@ static __inline__ void *_port2addr(unsigned long port) | |||
50 | return (void *)(port + NONCACHE_OFFSET); | 50 | return (void *)(port + NONCACHE_OFFSET); |
51 | } | 51 | } |
52 | 52 | ||
53 | static __inline__ void delay(void) | 53 | static inline void delay(void) |
54 | { | 54 | { |
55 | __asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory"); | 55 | __asm__ __volatile__ ("push r0; \n\t pop r0;" : : :"memory"); |
56 | } | 56 | } |
@@ -87,39 +87,22 @@ unsigned long _inl(unsigned long port) | |||
87 | 87 | ||
88 | unsigned char _inb_p(unsigned long port) | 88 | unsigned char _inb_p(unsigned long port) |
89 | { | 89 | { |
90 | unsigned char b; | 90 | unsigned char v = _inb(port); |
91 | 91 | delay(); | |
92 | if (port >= CFC_IOSTART && port <= CFC_IOEND) { | 92 | return v; |
93 | pcc_ioread_byte(0, port, &b, sizeof(b), 1, 0); | ||
94 | return b; | ||
95 | } else { | ||
96 | b = *(volatile unsigned char *)PORT2ADDR(port); | ||
97 | delay(); | ||
98 | return b; | ||
99 | } | ||
100 | } | 93 | } |
101 | 94 | ||
102 | unsigned short _inw_p(unsigned long port) | 95 | unsigned short _inw_p(unsigned long port) |
103 | { | 96 | { |
104 | unsigned short w; | 97 | unsigned short v = _inw(port); |
105 | 98 | delay(); | |
106 | if (port >= CFC_IOSTART && port <= CFC_IOEND) { | 99 | return v; |
107 | pcc_ioread_word(0, port, &w, sizeof(w), 1, 0); | ||
108 | return w; | ||
109 | } else { | ||
110 | w = *(volatile unsigned short *)PORT2ADDR(port); | ||
111 | delay(); | ||
112 | return w; | ||
113 | } | ||
114 | } | 100 | } |
115 | 101 | ||
116 | unsigned long _inl_p(unsigned long port) | 102 | unsigned long _inl_p(unsigned long port) |
117 | { | 103 | { |
118 | unsigned long v; | 104 | unsigned long v = _inl(port); |
119 | |||
120 | v = *(volatile unsigned long *)PORT2ADDR(port); | ||
121 | delay(); | 105 | delay(); |
122 | |||
123 | return v; | 106 | return v; |
124 | } | 107 | } |
125 | 108 | ||
@@ -149,25 +132,19 @@ void _outl(unsigned long l, unsigned long port) | |||
149 | 132 | ||
150 | void _outb_p(unsigned char b, unsigned long port) | 133 | void _outb_p(unsigned char b, unsigned long port) |
151 | { | 134 | { |
152 | if (port >= CFC_IOSTART && port <= CFC_IOEND) | 135 | _outb(b, port); |
153 | pcc_iowrite_byte(0, port, &b, sizeof(b), 1, 0); | ||
154 | else | ||
155 | *(volatile unsigned char *)PORT2ADDR(port) = b; | ||
156 | delay(); | 136 | delay(); |
157 | } | 137 | } |
158 | 138 | ||
159 | void _outw_p(unsigned short w, unsigned long port) | 139 | void _outw_p(unsigned short w, unsigned long port) |
160 | { | 140 | { |
161 | if (port >= CFC_IOSTART && port <= CFC_IOEND) | 141 | _outw(w, port); |
162 | pcc_iowrite_word(0, port, &w, sizeof(w), 1, 0); | ||
163 | else | ||
164 | *(volatile unsigned short *)PORT2ADDR(port) = w; | ||
165 | delay(); | 142 | delay(); |
166 | } | 143 | } |
167 | 144 | ||
168 | void _outl_p(unsigned long l, unsigned long port) | 145 | void _outl_p(unsigned long l, unsigned long port) |
169 | { | 146 | { |
170 | *(volatile unsigned long *)PORT2ADDR(port) = l; | 147 | _outl(l, port); |
171 | delay(); | 148 | delay(); |
172 | } | 149 | } |
173 | 150 | ||
diff --git a/arch/m32r/kernel/setup.c b/arch/m32r/kernel/setup.c index 4826cd6e40e8..ec5674727e7f 100644 --- a/arch/m32r/kernel/setup.c +++ b/arch/m32r/kernel/setup.c | |||
@@ -330,6 +330,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
330 | seq_printf(m, "Machine\t\t: Mappi Evaluation board\n"); | 330 | seq_printf(m, "Machine\t\t: Mappi Evaluation board\n"); |
331 | #elif CONFIG_PLAT_MAPPI2 | 331 | #elif CONFIG_PLAT_MAPPI2 |
332 | seq_printf(m, "Machine\t\t: Mappi-II Evaluation board\n"); | 332 | seq_printf(m, "Machine\t\t: Mappi-II Evaluation board\n"); |
333 | #elif CONFIG_PLAT_MAPPI3 | ||
334 | seq_printf(m, "Machine\t\t: Mappi-III Evaluation board\n"); | ||
333 | #elif CONFIG_PLAT_M32700UT | 335 | #elif CONFIG_PLAT_M32700UT |
334 | seq_printf(m, "Machine\t\t: M32700UT Evaluation board\n"); | 336 | seq_printf(m, "Machine\t\t: M32700UT Evaluation board\n"); |
335 | #elif CONFIG_PLAT_OPSPUT | 337 | #elif CONFIG_PLAT_OPSPUT |
diff --git a/arch/m32r/kernel/setup_mappi2.c b/arch/m32r/kernel/setup_mappi2.c index 1904d465a507..248fc658dbd5 100644 --- a/arch/m32r/kernel/setup_mappi2.c +++ b/arch/m32r/kernel/setup_mappi2.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/arch/m32r/kernel/setup_mappi.c | 2 | * linux/arch/m32r/kernel/setup_mappi2.c |
3 | * | 3 | * |
4 | * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board | 4 | * Setup routines for Renesas MAPPI-II(M3A-ZA36) Board |
5 | * | 5 | * |
@@ -156,7 +156,6 @@ void __init init_IRQ(void) | |||
156 | irq_desc[PLD_IRQ_CFIREQ].handler = &mappi2_irq_type; | 156 | irq_desc[PLD_IRQ_CFIREQ].handler = &mappi2_irq_type; |
157 | irq_desc[PLD_IRQ_CFIREQ].action = 0; | 157 | irq_desc[PLD_IRQ_CFIREQ].action = 0; |
158 | irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ | 158 | irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ |
159 | // icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; | ||
160 | icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; | 159 | icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; |
161 | disable_mappi2_irq(PLD_IRQ_CFIREQ); | 160 | disable_mappi2_irq(PLD_IRQ_CFIREQ); |
162 | 161 | ||
@@ -167,7 +166,6 @@ void __init init_IRQ(void) | |||
167 | irq_desc[PLD_IRQ_CFC_INSERT].action = 0; | 166 | irq_desc[PLD_IRQ_CFC_INSERT].action = 0; |
168 | irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ | 167 | irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ |
169 | icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; | 168 | icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; |
170 | // icu_data[PLD_IRQ_CFC_INSERT].icucr = 0; | ||
171 | disable_mappi2_irq(PLD_IRQ_CFC_INSERT); | 169 | disable_mappi2_irq(PLD_IRQ_CFC_INSERT); |
172 | 170 | ||
173 | /* ICUCR42: CFC Eject */ | 171 | /* ICUCR42: CFC Eject */ |
@@ -176,9 +174,7 @@ void __init init_IRQ(void) | |||
176 | irq_desc[PLD_IRQ_CFC_EJECT].action = 0; | 174 | irq_desc[PLD_IRQ_CFC_EJECT].action = 0; |
177 | irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ | 175 | irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ |
178 | icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; | 176 | icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; |
179 | // icu_data[PLD_IRQ_CFC_EJECT].icucr = 0; | ||
180 | disable_mappi2_irq(PLD_IRQ_CFC_EJECT); | 177 | disable_mappi2_irq(PLD_IRQ_CFC_EJECT); |
181 | |||
182 | #endif /* CONFIG_MAPPI2_CFC */ | 178 | #endif /* CONFIG_MAPPI2_CFC */ |
183 | } | 179 | } |
184 | 180 | ||
diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c new file mode 100644 index 000000000000..72b5b7609cea --- /dev/null +++ b/arch/m32r/kernel/setup_mappi3.c | |||
@@ -0,0 +1,208 @@ | |||
1 | /* | ||
2 | * linux/arch/m32r/kernel/setup_mappi3.c | ||
3 | * | ||
4 | * Setup routines for Renesas MAPPI-III(M3A-2170) Board | ||
5 | * | ||
6 | * Copyright (c) 2001-2005 Hiroyuki Kondo, Hirokazu Takata, | ||
7 | * Hitoshi Yamamoto, Mamoru Sakugawa | ||
8 | */ | ||
9 | |||
10 | #include <linux/config.h> | ||
11 | #include <linux/irq.h> | ||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/device.h> | ||
15 | |||
16 | #include <asm/system.h> | ||
17 | #include <asm/m32r.h> | ||
18 | #include <asm/io.h> | ||
19 | |||
20 | #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) | ||
21 | |||
22 | #ifndef CONFIG_SMP | ||
23 | typedef struct { | ||
24 | unsigned long icucr; /* ICU Control Register */ | ||
25 | } icu_data_t; | ||
26 | #endif /* CONFIG_SMP */ | ||
27 | |||
28 | icu_data_t icu_data[NR_IRQS]; | ||
29 | |||
30 | static void disable_mappi3_irq(unsigned int irq) | ||
31 | { | ||
32 | unsigned long port, data; | ||
33 | |||
34 | if ((irq == 0) ||(irq >= NR_IRQS)) { | ||
35 | printk("bad irq 0x%08x\n", irq); | ||
36 | return; | ||
37 | } | ||
38 | port = irq2port(irq); | ||
39 | data = icu_data[irq].icucr|M32R_ICUCR_ILEVEL7; | ||
40 | outl(data, port); | ||
41 | } | ||
42 | |||
43 | static void enable_mappi3_irq(unsigned int irq) | ||
44 | { | ||
45 | unsigned long port, data; | ||
46 | |||
47 | if ((irq == 0) ||(irq >= NR_IRQS)) { | ||
48 | printk("bad irq 0x%08x\n", irq); | ||
49 | return; | ||
50 | } | ||
51 | port = irq2port(irq); | ||
52 | data = icu_data[irq].icucr|M32R_ICUCR_IEN|M32R_ICUCR_ILEVEL6; | ||
53 | outl(data, port); | ||
54 | } | ||
55 | |||
56 | static void mask_and_ack_mappi3(unsigned int irq) | ||
57 | { | ||
58 | disable_mappi3_irq(irq); | ||
59 | } | ||
60 | |||
61 | static void end_mappi3_irq(unsigned int irq) | ||
62 | { | ||
63 | enable_mappi3_irq(irq); | ||
64 | } | ||
65 | |||
66 | static unsigned int startup_mappi3_irq(unsigned int irq) | ||
67 | { | ||
68 | enable_mappi3_irq(irq); | ||
69 | return (0); | ||
70 | } | ||
71 | |||
72 | static void shutdown_mappi3_irq(unsigned int irq) | ||
73 | { | ||
74 | unsigned long port; | ||
75 | |||
76 | port = irq2port(irq); | ||
77 | outl(M32R_ICUCR_ILEVEL7, port); | ||
78 | } | ||
79 | |||
80 | static struct hw_interrupt_type mappi3_irq_type = | ||
81 | { | ||
82 | "MAPPI3-IRQ", | ||
83 | startup_mappi3_irq, | ||
84 | shutdown_mappi3_irq, | ||
85 | enable_mappi3_irq, | ||
86 | disable_mappi3_irq, | ||
87 | mask_and_ack_mappi3, | ||
88 | end_mappi3_irq | ||
89 | }; | ||
90 | |||
91 | void __init init_IRQ(void) | ||
92 | { | ||
93 | #if defined(CONFIG_SMC91X) | ||
94 | /* INT0 : LAN controller (SMC91111) */ | ||
95 | irq_desc[M32R_IRQ_INT0].status = IRQ_DISABLED; | ||
96 | irq_desc[M32R_IRQ_INT0].handler = &mappi3_irq_type; | ||
97 | irq_desc[M32R_IRQ_INT0].action = 0; | ||
98 | irq_desc[M32R_IRQ_INT0].depth = 1; | ||
99 | icu_data[M32R_IRQ_INT0].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; | ||
100 | disable_mappi3_irq(M32R_IRQ_INT0); | ||
101 | #endif /* CONFIG_SMC91X */ | ||
102 | |||
103 | /* MFT2 : system timer */ | ||
104 | irq_desc[M32R_IRQ_MFT2].status = IRQ_DISABLED; | ||
105 | irq_desc[M32R_IRQ_MFT2].handler = &mappi3_irq_type; | ||
106 | irq_desc[M32R_IRQ_MFT2].action = 0; | ||
107 | irq_desc[M32R_IRQ_MFT2].depth = 1; | ||
108 | icu_data[M32R_IRQ_MFT2].icucr = M32R_ICUCR_IEN; | ||
109 | disable_mappi3_irq(M32R_IRQ_MFT2); | ||
110 | |||
111 | #ifdef CONFIG_SERIAL_M32R_SIO | ||
112 | /* SIO0_R : uart receive data */ | ||
113 | irq_desc[M32R_IRQ_SIO0_R].status = IRQ_DISABLED; | ||
114 | irq_desc[M32R_IRQ_SIO0_R].handler = &mappi3_irq_type; | ||
115 | irq_desc[M32R_IRQ_SIO0_R].action = 0; | ||
116 | irq_desc[M32R_IRQ_SIO0_R].depth = 1; | ||
117 | icu_data[M32R_IRQ_SIO0_R].icucr = 0; | ||
118 | disable_mappi3_irq(M32R_IRQ_SIO0_R); | ||
119 | |||
120 | /* SIO0_S : uart send data */ | ||
121 | irq_desc[M32R_IRQ_SIO0_S].status = IRQ_DISABLED; | ||
122 | irq_desc[M32R_IRQ_SIO0_S].handler = &mappi3_irq_type; | ||
123 | irq_desc[M32R_IRQ_SIO0_S].action = 0; | ||
124 | irq_desc[M32R_IRQ_SIO0_S].depth = 1; | ||
125 | icu_data[M32R_IRQ_SIO0_S].icucr = 0; | ||
126 | disable_mappi3_irq(M32R_IRQ_SIO0_S); | ||
127 | /* SIO1_R : uart receive data */ | ||
128 | irq_desc[M32R_IRQ_SIO1_R].status = IRQ_DISABLED; | ||
129 | irq_desc[M32R_IRQ_SIO1_R].handler = &mappi3_irq_type; | ||
130 | irq_desc[M32R_IRQ_SIO1_R].action = 0; | ||
131 | irq_desc[M32R_IRQ_SIO1_R].depth = 1; | ||
132 | icu_data[M32R_IRQ_SIO1_R].icucr = 0; | ||
133 | disable_mappi3_irq(M32R_IRQ_SIO1_R); | ||
134 | |||
135 | /* SIO1_S : uart send data */ | ||
136 | irq_desc[M32R_IRQ_SIO1_S].status = IRQ_DISABLED; | ||
137 | irq_desc[M32R_IRQ_SIO1_S].handler = &mappi3_irq_type; | ||
138 | irq_desc[M32R_IRQ_SIO1_S].action = 0; | ||
139 | irq_desc[M32R_IRQ_SIO1_S].depth = 1; | ||
140 | icu_data[M32R_IRQ_SIO1_S].icucr = 0; | ||
141 | disable_mappi3_irq(M32R_IRQ_SIO1_S); | ||
142 | #endif /* CONFIG_M32R_USE_DBG_CONSOLE */ | ||
143 | |||
144 | #if defined(CONFIG_USB) | ||
145 | /* INT1 : USB Host controller interrupt */ | ||
146 | irq_desc[M32R_IRQ_INT1].status = IRQ_DISABLED; | ||
147 | irq_desc[M32R_IRQ_INT1].handler = &mappi3_irq_type; | ||
148 | irq_desc[M32R_IRQ_INT1].action = 0; | ||
149 | irq_desc[M32R_IRQ_INT1].depth = 1; | ||
150 | icu_data[M32R_IRQ_INT1].icucr = M32R_ICUCR_ISMOD01; | ||
151 | disable_mappi3_irq(M32R_IRQ_INT1); | ||
152 | #endif /* CONFIG_USB */ | ||
153 | |||
154 | /* ICUCR40: CFC IREQ */ | ||
155 | irq_desc[PLD_IRQ_CFIREQ].status = IRQ_DISABLED; | ||
156 | irq_desc[PLD_IRQ_CFIREQ].handler = &mappi3_irq_type; | ||
157 | irq_desc[PLD_IRQ_CFIREQ].action = 0; | ||
158 | irq_desc[PLD_IRQ_CFIREQ].depth = 1; /* disable nested irq */ | ||
159 | icu_data[PLD_IRQ_CFIREQ].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD01; | ||
160 | disable_mappi3_irq(PLD_IRQ_CFIREQ); | ||
161 | |||
162 | #if defined(CONFIG_M32R_CFC) | ||
163 | /* ICUCR41: CFC Insert */ | ||
164 | irq_desc[PLD_IRQ_CFC_INSERT].status = IRQ_DISABLED; | ||
165 | irq_desc[PLD_IRQ_CFC_INSERT].handler = &mappi3_irq_type; | ||
166 | irq_desc[PLD_IRQ_CFC_INSERT].action = 0; | ||
167 | irq_desc[PLD_IRQ_CFC_INSERT].depth = 1; /* disable nested irq */ | ||
168 | icu_data[PLD_IRQ_CFC_INSERT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD00; | ||
169 | disable_mappi3_irq(PLD_IRQ_CFC_INSERT); | ||
170 | |||
171 | /* ICUCR42: CFC Eject */ | ||
172 | irq_desc[PLD_IRQ_CFC_EJECT].status = IRQ_DISABLED; | ||
173 | irq_desc[PLD_IRQ_CFC_EJECT].handler = &mappi3_irq_type; | ||
174 | irq_desc[PLD_IRQ_CFC_EJECT].action = 0; | ||
175 | irq_desc[PLD_IRQ_CFC_EJECT].depth = 1; /* disable nested irq */ | ||
176 | icu_data[PLD_IRQ_CFC_EJECT].icucr = M32R_ICUCR_IEN|M32R_ICUCR_ISMOD10; | ||
177 | disable_mappi3_irq(PLD_IRQ_CFC_EJECT); | ||
178 | #endif /* CONFIG_M32R_CFC */ | ||
179 | } | ||
180 | |||
181 | #define LAN_IOSTART 0x300 | ||
182 | #define LAN_IOEND 0x320 | ||
183 | static struct resource smc91x_resources[] = { | ||
184 | [0] = { | ||
185 | .start = (LAN_IOSTART), | ||
186 | .end = (LAN_IOEND), | ||
187 | .flags = IORESOURCE_MEM, | ||
188 | }, | ||
189 | [1] = { | ||
190 | .start = M32R_IRQ_INT0, | ||
191 | .end = M32R_IRQ_INT0, | ||
192 | .flags = IORESOURCE_IRQ, | ||
193 | } | ||
194 | }; | ||
195 | |||
196 | static struct platform_device smc91x_device = { | ||
197 | .name = "smc91x", | ||
198 | .id = 0, | ||
199 | .num_resources = ARRAY_SIZE(smc91x_resources), | ||
200 | .resource = smc91x_resources, | ||
201 | }; | ||
202 | |||
203 | static int __init platform_init(void) | ||
204 | { | ||
205 | platform_device_register(&smc91x_device); | ||
206 | return 0; | ||
207 | } | ||
208 | arch_initcall(platform_init); | ||
diff --git a/arch/m32r/mappi3/defconfig.smp b/arch/m32r/mappi3/defconfig.smp new file mode 100644 index 000000000000..2eebe75fc071 --- /dev/null +++ b/arch/m32r/mappi3/defconfig.smp | |||
@@ -0,0 +1,751 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.12-rc5 | ||
4 | # Tue May 31 17:55:34 2005 | ||
5 | # | ||
6 | CONFIG_M32R=y | ||
7 | # CONFIG_UID16 is not set | ||
8 | CONFIG_GENERIC_ISA_DMA=y | ||
9 | CONFIG_GENERIC_HARDIRQS=y | ||
10 | CONFIG_GENERIC_IRQ_PROBE=y | ||
11 | |||
12 | # | ||
13 | # Code maturity level options | ||
14 | # | ||
15 | CONFIG_EXPERIMENTAL=y | ||
16 | # CONFIG_CLEAN_COMPILE is not set | ||
17 | CONFIG_BROKEN=y | ||
18 | CONFIG_BROKEN_ON_SMP=y | ||
19 | CONFIG_LOCK_KERNEL=y | ||
20 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
21 | |||
22 | # | ||
23 | # General setup | ||
24 | # | ||
25 | CONFIG_LOCALVERSION="" | ||
26 | CONFIG_SWAP=y | ||
27 | CONFIG_SYSVIPC=y | ||
28 | # CONFIG_POSIX_MQUEUE is not set | ||
29 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
30 | CONFIG_SYSCTL=y | ||
31 | # CONFIG_AUDIT is not set | ||
32 | CONFIG_HOTPLUG=y | ||
33 | CONFIG_KOBJECT_UEVENT=y | ||
34 | CONFIG_IKCONFIG=y | ||
35 | CONFIG_IKCONFIG_PROC=y | ||
36 | # CONFIG_CPUSETS is not set | ||
37 | CONFIG_EMBEDDED=y | ||
38 | # CONFIG_KALLSYMS is not set | ||
39 | CONFIG_PRINTK=y | ||
40 | CONFIG_BUG=y | ||
41 | CONFIG_BASE_FULL=y | ||
42 | # CONFIG_FUTEX is not set | ||
43 | # CONFIG_EPOLL is not set | ||
44 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
45 | CONFIG_SHMEM=y | ||
46 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
47 | CONFIG_CC_ALIGN_LABELS=0 | ||
48 | CONFIG_CC_ALIGN_LOOPS=0 | ||
49 | CONFIG_CC_ALIGN_JUMPS=0 | ||
50 | # CONFIG_TINY_SHMEM is not set | ||
51 | CONFIG_BASE_SMALL=0 | ||
52 | |||
53 | # | ||
54 | # Loadable module support | ||
55 | # | ||
56 | CONFIG_MODULES=y | ||
57 | CONFIG_MODULE_UNLOAD=y | ||
58 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
59 | CONFIG_OBSOLETE_MODPARM=y | ||
60 | # CONFIG_MODVERSIONS is not set | ||
61 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
62 | CONFIG_KMOD=y | ||
63 | CONFIG_STOP_MACHINE=y | ||
64 | |||
65 | # | ||
66 | # Processor type and features | ||
67 | # | ||
68 | # CONFIG_PLAT_MAPPI is not set | ||
69 | # CONFIG_PLAT_USRV is not set | ||
70 | # CONFIG_PLAT_M32700UT is not set | ||
71 | # CONFIG_PLAT_OPSPUT is not set | ||
72 | # CONFIG_PLAT_OAKS32R is not set | ||
73 | # CONFIG_PLAT_MAPPI2 is not set | ||
74 | CONFIG_PLAT_MAPPI3=y | ||
75 | CONFIG_CHIP_M32700=y | ||
76 | # CONFIG_CHIP_M32102 is not set | ||
77 | # CONFIG_CHIP_VDEC2 is not set | ||
78 | # CONFIG_CHIP_OPSP is not set | ||
79 | CONFIG_MMU=y | ||
80 | CONFIG_TLB_ENTRIES=32 | ||
81 | CONFIG_ISA_M32R2=y | ||
82 | CONFIG_ISA_DSP_LEVEL2=y | ||
83 | CONFIG_ISA_DUAL_ISSUE=y | ||
84 | CONFIG_BUS_CLOCK=10000000 | ||
85 | CONFIG_TIMER_DIVIDE=128 | ||
86 | # CONFIG_CPU_LITTLE_ENDIAN is not set | ||
87 | CONFIG_MEMORY_START=0x08000000 | ||
88 | CONFIG_MEMORY_SIZE=0x08000000 | ||
89 | CONFIG_NOHIGHMEM=y | ||
90 | CONFIG_DISCONTIGMEM=y | ||
91 | CONFIG_IRAM_START=0x00f00000 | ||
92 | CONFIG_IRAM_SIZE=0x00080000 | ||
93 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | ||
94 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | ||
95 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
96 | CONFIG_PREEMPT=y | ||
97 | # CONFIG_HAVE_DEC_LOCK is not set | ||
98 | CONFIG_SMP=y | ||
99 | # CONFIG_CHIP_M32700_TS1 is not set | ||
100 | CONFIG_NR_CPUS=2 | ||
101 | # CONFIG_NUMA is not set | ||
102 | |||
103 | # | ||
104 | # Bus options (PCI, PCMCIA, EISA, MCA, ISA) | ||
105 | # | ||
106 | # CONFIG_PCI is not set | ||
107 | # CONFIG_ISA is not set | ||
108 | |||
109 | # | ||
110 | # PCCARD (PCMCIA/CardBus) support | ||
111 | # | ||
112 | CONFIG_PCCARD=y | ||
113 | # CONFIG_PCMCIA_DEBUG is not set | ||
114 | CONFIG_PCMCIA=y | ||
115 | |||
116 | # | ||
117 | # PC-card bridges | ||
118 | # | ||
119 | # CONFIG_TCIC is not set | ||
120 | # CONFIG_M32R_PCC is not set | ||
121 | # CONFIG_M32R_CFC is not set | ||
122 | |||
123 | # | ||
124 | # PCI Hotplug Support | ||
125 | # | ||
126 | |||
127 | # | ||
128 | # Executable file formats | ||
129 | # | ||
130 | CONFIG_BINFMT_ELF=y | ||
131 | # CONFIG_BINFMT_MISC is not set | ||
132 | |||
133 | # | ||
134 | # Device Drivers | ||
135 | # | ||
136 | |||
137 | # | ||
138 | # Generic Driver Options | ||
139 | # | ||
140 | CONFIG_STANDALONE=y | ||
141 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
142 | CONFIG_FW_LOADER=y | ||
143 | |||
144 | # | ||
145 | # Memory Technology Devices (MTD) | ||
146 | # | ||
147 | CONFIG_MTD=y | ||
148 | # CONFIG_MTD_DEBUG is not set | ||
149 | # CONFIG_MTD_CONCAT is not set | ||
150 | CONFIG_MTD_PARTITIONS=y | ||
151 | CONFIG_MTD_REDBOOT_PARTS=y | ||
152 | CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 | ||
153 | # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set | ||
154 | # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set | ||
155 | # CONFIG_MTD_CMDLINE_PARTS is not set | ||
156 | |||
157 | # | ||
158 | # User Modules And Translation Layers | ||
159 | # | ||
160 | CONFIG_MTD_CHAR=y | ||
161 | CONFIG_MTD_BLOCK=y | ||
162 | # CONFIG_FTL is not set | ||
163 | # CONFIG_NFTL is not set | ||
164 | # CONFIG_INFTL is not set | ||
165 | |||
166 | # | ||
167 | # RAM/ROM/Flash chip drivers | ||
168 | # | ||
169 | # CONFIG_MTD_CFI is not set | ||
170 | # CONFIG_MTD_JEDECPROBE is not set | ||
171 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
172 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
173 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
174 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
175 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
176 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
177 | CONFIG_MTD_CFI_I1=y | ||
178 | CONFIG_MTD_CFI_I2=y | ||
179 | # CONFIG_MTD_CFI_I4 is not set | ||
180 | # CONFIG_MTD_CFI_I8 is not set | ||
181 | # CONFIG_MTD_RAM is not set | ||
182 | # CONFIG_MTD_ROM is not set | ||
183 | # CONFIG_MTD_ABSENT is not set | ||
184 | # CONFIG_MTD_OBSOLETE_CHIPS is not set | ||
185 | |||
186 | # | ||
187 | # Mapping drivers for chip access | ||
188 | # | ||
189 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
190 | |||
191 | # | ||
192 | # Self-contained MTD device drivers | ||
193 | # | ||
194 | # CONFIG_MTD_SLRAM is not set | ||
195 | # CONFIG_MTD_PHRAM is not set | ||
196 | # CONFIG_MTD_MTDRAM is not set | ||
197 | # CONFIG_MTD_BLKMTD is not set | ||
198 | # CONFIG_MTD_BLOCK2MTD is not set | ||
199 | |||
200 | # | ||
201 | # Disk-On-Chip Device Drivers | ||
202 | # | ||
203 | # CONFIG_MTD_DOC2000 is not set | ||
204 | # CONFIG_MTD_DOC2001 is not set | ||
205 | # CONFIG_MTD_DOC2001PLUS is not set | ||
206 | |||
207 | # | ||
208 | # NAND Flash Device Drivers | ||
209 | # | ||
210 | # CONFIG_MTD_NAND is not set | ||
211 | |||
212 | # | ||
213 | # Parallel port support | ||
214 | # | ||
215 | # CONFIG_PARPORT is not set | ||
216 | |||
217 | # | ||
218 | # Plug and Play support | ||
219 | # | ||
220 | |||
221 | # | ||
222 | # Block devices | ||
223 | # | ||
224 | # CONFIG_BLK_DEV_FD is not set | ||
225 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
226 | CONFIG_BLK_DEV_LOOP=y | ||
227 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
228 | CONFIG_BLK_DEV_NBD=m | ||
229 | CONFIG_BLK_DEV_RAM=y | ||
230 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
231 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
232 | CONFIG_BLK_DEV_INITRD=y | ||
233 | CONFIG_INITRAMFS_SOURCE="" | ||
234 | # CONFIG_CDROM_PKTCDVD is not set | ||
235 | |||
236 | # | ||
237 | # IO Schedulers | ||
238 | # | ||
239 | CONFIG_IOSCHED_NOOP=y | ||
240 | # CONFIG_IOSCHED_AS is not set | ||
241 | CONFIG_IOSCHED_DEADLINE=y | ||
242 | CONFIG_IOSCHED_CFQ=y | ||
243 | # CONFIG_ATA_OVER_ETH is not set | ||
244 | |||
245 | # | ||
246 | # ATA/ATAPI/MFM/RLL support | ||
247 | # | ||
248 | CONFIG_IDE=y | ||
249 | CONFIG_BLK_DEV_IDE=y | ||
250 | |||
251 | # | ||
252 | # Please see Documentation/ide.txt for help/info on IDE drives | ||
253 | # | ||
254 | # CONFIG_BLK_DEV_IDE_SATA is not set | ||
255 | CONFIG_BLK_DEV_IDEDISK=y | ||
256 | # CONFIG_IDEDISK_MULTI_MODE is not set | ||
257 | CONFIG_BLK_DEV_IDECS=y | ||
258 | CONFIG_BLK_DEV_IDECD=m | ||
259 | # CONFIG_BLK_DEV_IDETAPE is not set | ||
260 | # CONFIG_BLK_DEV_IDEFLOPPY is not set | ||
261 | # CONFIG_IDE_TASK_IOCTL is not set | ||
262 | |||
263 | # | ||
264 | # IDE chipset support/bugfixes | ||
265 | # | ||
266 | CONFIG_IDE_GENERIC=y | ||
267 | # CONFIG_IDE_ARM is not set | ||
268 | # CONFIG_BLK_DEV_IDEDMA is not set | ||
269 | # CONFIG_IDEDMA_AUTO is not set | ||
270 | # CONFIG_BLK_DEV_HD is not set | ||
271 | |||
272 | # | ||
273 | # SCSI device support | ||
274 | # | ||
275 | # CONFIG_SCSI is not set | ||
276 | |||
277 | # | ||
278 | # Multi-device support (RAID and LVM) | ||
279 | # | ||
280 | # CONFIG_MD is not set | ||
281 | |||
282 | # | ||
283 | # Fusion MPT device support | ||
284 | # | ||
285 | |||
286 | # | ||
287 | # IEEE 1394 (FireWire) support | ||
288 | # | ||
289 | # CONFIG_IEEE1394 is not set | ||
290 | |||
291 | # | ||
292 | # I2O device support | ||
293 | # | ||
294 | |||
295 | # | ||
296 | # Networking support | ||
297 | # | ||
298 | CONFIG_NET=y | ||
299 | |||
300 | # | ||
301 | # Networking options | ||
302 | # | ||
303 | # CONFIG_PACKET is not set | ||
304 | CONFIG_UNIX=y | ||
305 | # CONFIG_NET_KEY is not set | ||
306 | CONFIG_INET=y | ||
307 | # CONFIG_IP_MULTICAST is not set | ||
308 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
309 | CONFIG_IP_PNP=y | ||
310 | CONFIG_IP_PNP_DHCP=y | ||
311 | # CONFIG_IP_PNP_BOOTP is not set | ||
312 | # CONFIG_IP_PNP_RARP is not set | ||
313 | # CONFIG_NET_IPIP is not set | ||
314 | # CONFIG_NET_IPGRE is not set | ||
315 | # CONFIG_ARPD is not set | ||
316 | # CONFIG_SYN_COOKIES is not set | ||
317 | # CONFIG_INET_AH is not set | ||
318 | # CONFIG_INET_ESP is not set | ||
319 | # CONFIG_INET_IPCOMP is not set | ||
320 | # CONFIG_INET_TUNNEL is not set | ||
321 | CONFIG_IP_TCPDIAG=y | ||
322 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
323 | # CONFIG_IPV6 is not set | ||
324 | # CONFIG_NETFILTER is not set | ||
325 | |||
326 | # | ||
327 | # SCTP Configuration (EXPERIMENTAL) | ||
328 | # | ||
329 | # CONFIG_IP_SCTP is not set | ||
330 | # CONFIG_ATM is not set | ||
331 | # CONFIG_BRIDGE is not set | ||
332 | # CONFIG_VLAN_8021Q is not set | ||
333 | # CONFIG_DECNET is not set | ||
334 | # CONFIG_LLC2 is not set | ||
335 | # CONFIG_IPX is not set | ||
336 | # CONFIG_ATALK is not set | ||
337 | # CONFIG_X25 is not set | ||
338 | # CONFIG_LAPB is not set | ||
339 | # CONFIG_NET_DIVERT is not set | ||
340 | # CONFIG_ECONET is not set | ||
341 | # CONFIG_WAN_ROUTER is not set | ||
342 | |||
343 | # | ||
344 | # QoS and/or fair queueing | ||
345 | # | ||
346 | # CONFIG_NET_SCHED is not set | ||
347 | # CONFIG_NET_CLS_ROUTE is not set | ||
348 | |||
349 | # | ||
350 | # Network testing | ||
351 | # | ||
352 | # CONFIG_NET_PKTGEN is not set | ||
353 | # CONFIG_NETPOLL is not set | ||
354 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
355 | # CONFIG_HAMRADIO is not set | ||
356 | # CONFIG_IRDA is not set | ||
357 | # CONFIG_BT is not set | ||
358 | CONFIG_NETDEVICES=y | ||
359 | # CONFIG_DUMMY is not set | ||
360 | # CONFIG_BONDING is not set | ||
361 | # CONFIG_EQUALIZER is not set | ||
362 | # CONFIG_TUN is not set | ||
363 | |||
364 | # | ||
365 | # Ethernet (10 or 100Mbit) | ||
366 | # | ||
367 | CONFIG_NET_ETHERNET=y | ||
368 | CONFIG_MII=y | ||
369 | CONFIG_SMC91X=y | ||
370 | # CONFIG_NE2000 is not set | ||
371 | |||
372 | # | ||
373 | # Ethernet (1000 Mbit) | ||
374 | # | ||
375 | |||
376 | # | ||
377 | # Ethernet (10000 Mbit) | ||
378 | # | ||
379 | |||
380 | # | ||
381 | # Token Ring devices | ||
382 | # | ||
383 | |||
384 | # | ||
385 | # Wireless LAN (non-hamradio) | ||
386 | # | ||
387 | # CONFIG_NET_RADIO is not set | ||
388 | |||
389 | # | ||
390 | # PCMCIA network device support | ||
391 | # | ||
392 | # CONFIG_NET_PCMCIA is not set | ||
393 | |||
394 | # | ||
395 | # Wan interfaces | ||
396 | # | ||
397 | # CONFIG_WAN is not set | ||
398 | # CONFIG_PPP is not set | ||
399 | # CONFIG_SLIP is not set | ||
400 | # CONFIG_SHAPER is not set | ||
401 | # CONFIG_NETCONSOLE is not set | ||
402 | |||
403 | # | ||
404 | # ISDN subsystem | ||
405 | # | ||
406 | # CONFIG_ISDN is not set | ||
407 | |||
408 | # | ||
409 | # Telephony Support | ||
410 | # | ||
411 | # CONFIG_PHONE is not set | ||
412 | |||
413 | # | ||
414 | # Input device support | ||
415 | # | ||
416 | CONFIG_INPUT=y | ||
417 | |||
418 | # | ||
419 | # Userland interfaces | ||
420 | # | ||
421 | CONFIG_INPUT_MOUSEDEV=y | ||
422 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
423 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
424 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
425 | # CONFIG_INPUT_JOYDEV is not set | ||
426 | # CONFIG_INPUT_TSDEV is not set | ||
427 | # CONFIG_INPUT_EVDEV is not set | ||
428 | # CONFIG_INPUT_EVBUG is not set | ||
429 | |||
430 | # | ||
431 | # Input Device Drivers | ||
432 | # | ||
433 | # CONFIG_INPUT_KEYBOARD is not set | ||
434 | # CONFIG_INPUT_MOUSE is not set | ||
435 | # CONFIG_INPUT_JOYSTICK is not set | ||
436 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
437 | # CONFIG_INPUT_MISC is not set | ||
438 | |||
439 | # | ||
440 | # Hardware I/O ports | ||
441 | # | ||
442 | CONFIG_SERIO=y | ||
443 | # CONFIG_SERIO_I8042 is not set | ||
444 | # CONFIG_SERIO_SERPORT is not set | ||
445 | # CONFIG_SERIO_LIBPS2 is not set | ||
446 | # CONFIG_SERIO_RAW is not set | ||
447 | # CONFIG_GAMEPORT is not set | ||
448 | CONFIG_SOUND_GAMEPORT=y | ||
449 | |||
450 | # | ||
451 | # Character devices | ||
452 | # | ||
453 | # CONFIG_VT is not set | ||
454 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
455 | |||
456 | # | ||
457 | # Serial drivers | ||
458 | # | ||
459 | # CONFIG_SERIAL_8250 is not set | ||
460 | |||
461 | # | ||
462 | # Non-8250 serial port support | ||
463 | # | ||
464 | CONFIG_SERIAL_CORE=y | ||
465 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
466 | CONFIG_SERIAL_M32R_SIO=y | ||
467 | CONFIG_SERIAL_M32R_SIO_CONSOLE=y | ||
468 | # CONFIG_SERIAL_M32R_PLDSIO is not set | ||
469 | CONFIG_UNIX98_PTYS=y | ||
470 | CONFIG_LEGACY_PTYS=y | ||
471 | CONFIG_LEGACY_PTY_COUNT=256 | ||
472 | |||
473 | # | ||
474 | # IPMI | ||
475 | # | ||
476 | # CONFIG_IPMI_HANDLER is not set | ||
477 | |||
478 | # | ||
479 | # Watchdog Cards | ||
480 | # | ||
481 | # CONFIG_WATCHDOG is not set | ||
482 | # CONFIG_RTC is not set | ||
483 | # CONFIG_GEN_RTC is not set | ||
484 | # CONFIG_DTLK is not set | ||
485 | # CONFIG_R3964 is not set | ||
486 | |||
487 | # | ||
488 | # Ftape, the floppy tape device driver | ||
489 | # | ||
490 | # CONFIG_DRM is not set | ||
491 | |||
492 | # | ||
493 | # PCMCIA character devices | ||
494 | # | ||
495 | # CONFIG_SYNCLINK_CS is not set | ||
496 | # CONFIG_RAW_DRIVER is not set | ||
497 | |||
498 | # | ||
499 | # TPM devices | ||
500 | # | ||
501 | |||
502 | # | ||
503 | # I2C support | ||
504 | # | ||
505 | # CONFIG_I2C is not set | ||
506 | |||
507 | # | ||
508 | # Dallas's 1-wire bus | ||
509 | # | ||
510 | # CONFIG_W1 is not set | ||
511 | |||
512 | # | ||
513 | # Misc devices | ||
514 | # | ||
515 | |||
516 | # | ||
517 | # Multimedia devices | ||
518 | # | ||
519 | # CONFIG_VIDEO_DEV is not set | ||
520 | |||
521 | # | ||
522 | # Digital Video Broadcasting Devices | ||
523 | # | ||
524 | # CONFIG_DVB is not set | ||
525 | |||
526 | # | ||
527 | # Graphics support | ||
528 | # | ||
529 | # CONFIG_FB is not set | ||
530 | |||
531 | # | ||
532 | # Sound | ||
533 | # | ||
534 | # CONFIG_SOUND is not set | ||
535 | |||
536 | # | ||
537 | # USB support | ||
538 | # | ||
539 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
540 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
541 | |||
542 | # | ||
543 | # USB Gadget Support | ||
544 | # | ||
545 | # CONFIG_USB_GADGET is not set | ||
546 | |||
547 | # | ||
548 | # MMC/SD Card support | ||
549 | # | ||
550 | # CONFIG_MMC is not set | ||
551 | |||
552 | # | ||
553 | # InfiniBand support | ||
554 | # | ||
555 | # CONFIG_INFINIBAND is not set | ||
556 | |||
557 | # | ||
558 | # File systems | ||
559 | # | ||
560 | CONFIG_EXT2_FS=y | ||
561 | # CONFIG_EXT2_FS_XATTR is not set | ||
562 | CONFIG_EXT3_FS=y | ||
563 | CONFIG_EXT3_FS_XATTR=y | ||
564 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
565 | # CONFIG_EXT3_FS_SECURITY is not set | ||
566 | CONFIG_JBD=y | ||
567 | # CONFIG_JBD_DEBUG is not set | ||
568 | CONFIG_FS_MBCACHE=y | ||
569 | # CONFIG_REISERFS_FS is not set | ||
570 | # CONFIG_JFS_FS is not set | ||
571 | |||
572 | # | ||
573 | # XFS support | ||
574 | # | ||
575 | # CONFIG_XFS_FS is not set | ||
576 | # CONFIG_MINIX_FS is not set | ||
577 | CONFIG_ROMFS_FS=y | ||
578 | # CONFIG_QUOTA is not set | ||
579 | CONFIG_DNOTIFY=y | ||
580 | # CONFIG_AUTOFS_FS is not set | ||
581 | # CONFIG_AUTOFS4_FS is not set | ||
582 | |||
583 | # | ||
584 | # CD-ROM/DVD Filesystems | ||
585 | # | ||
586 | CONFIG_ISO9660_FS=y | ||
587 | # CONFIG_JOLIET is not set | ||
588 | # CONFIG_ZISOFS is not set | ||
589 | # CONFIG_UDF_FS is not set | ||
590 | |||
591 | # | ||
592 | # DOS/FAT/NT Filesystems | ||
593 | # | ||
594 | CONFIG_FAT_FS=m | ||
595 | CONFIG_MSDOS_FS=m | ||
596 | CONFIG_VFAT_FS=m | ||
597 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
598 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
599 | # CONFIG_NTFS_FS is not set | ||
600 | |||
601 | # | ||
602 | # Pseudo filesystems | ||
603 | # | ||
604 | CONFIG_PROC_FS=y | ||
605 | CONFIG_PROC_KCORE=y | ||
606 | CONFIG_SYSFS=y | ||
607 | CONFIG_DEVFS_FS=y | ||
608 | CONFIG_DEVFS_MOUNT=y | ||
609 | # CONFIG_DEVFS_DEBUG is not set | ||
610 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
611 | CONFIG_TMPFS=y | ||
612 | # CONFIG_TMPFS_XATTR is not set | ||
613 | # CONFIG_HUGETLBFS is not set | ||
614 | # CONFIG_HUGETLB_PAGE is not set | ||
615 | CONFIG_RAMFS=y | ||
616 | |||
617 | # | ||
618 | # Miscellaneous filesystems | ||
619 | # | ||
620 | # CONFIG_ADFS_FS is not set | ||
621 | # CONFIG_AFFS_FS is not set | ||
622 | # CONFIG_HFS_FS is not set | ||
623 | # CONFIG_HFSPLUS_FS is not set | ||
624 | # CONFIG_BEFS_FS is not set | ||
625 | # CONFIG_BFS_FS is not set | ||
626 | # CONFIG_EFS_FS is not set | ||
627 | CONFIG_JFFS_FS=y | ||
628 | CONFIG_JFFS_FS_VERBOSE=0 | ||
629 | CONFIG_JFFS_PROC_FS=y | ||
630 | CONFIG_JFFS2_FS=y | ||
631 | CONFIG_JFFS2_FS_DEBUG=0 | ||
632 | # CONFIG_JFFS2_FS_NAND is not set | ||
633 | # CONFIG_JFFS2_FS_NOR_ECC is not set | ||
634 | # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set | ||
635 | CONFIG_JFFS2_ZLIB=y | ||
636 | CONFIG_JFFS2_RTIME=y | ||
637 | # CONFIG_JFFS2_RUBIN is not set | ||
638 | # CONFIG_CRAMFS is not set | ||
639 | # CONFIG_VXFS_FS is not set | ||
640 | # CONFIG_HPFS_FS is not set | ||
641 | # CONFIG_QNX4FS_FS is not set | ||
642 | # CONFIG_SYSV_FS is not set | ||
643 | # CONFIG_UFS_FS is not set | ||
644 | |||
645 | # | ||
646 | # Network File Systems | ||
647 | # | ||
648 | CONFIG_NFS_FS=y | ||
649 | CONFIG_NFS_V3=y | ||
650 | # CONFIG_NFS_V4 is not set | ||
651 | # CONFIG_NFS_DIRECTIO is not set | ||
652 | # CONFIG_NFSD is not set | ||
653 | CONFIG_ROOT_NFS=y | ||
654 | CONFIG_LOCKD=y | ||
655 | CONFIG_LOCKD_V4=y | ||
656 | CONFIG_SUNRPC=y | ||
657 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
658 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
659 | # CONFIG_SMB_FS is not set | ||
660 | # CONFIG_CIFS is not set | ||
661 | # CONFIG_NCP_FS is not set | ||
662 | # CONFIG_CODA_FS is not set | ||
663 | # CONFIG_AFS_FS is not set | ||
664 | |||
665 | # | ||
666 | # Partition Types | ||
667 | # | ||
668 | # CONFIG_PARTITION_ADVANCED is not set | ||
669 | CONFIG_MSDOS_PARTITION=y | ||
670 | |||
671 | # | ||
672 | # Native Language Support | ||
673 | # | ||
674 | CONFIG_NLS=y | ||
675 | CONFIG_NLS_DEFAULT="iso8859-1" | ||
676 | # CONFIG_NLS_CODEPAGE_437 is not set | ||
677 | # CONFIG_NLS_CODEPAGE_737 is not set | ||
678 | # CONFIG_NLS_CODEPAGE_775 is not set | ||
679 | # CONFIG_NLS_CODEPAGE_850 is not set | ||
680 | # CONFIG_NLS_CODEPAGE_852 is not set | ||
681 | # CONFIG_NLS_CODEPAGE_855 is not set | ||
682 | # CONFIG_NLS_CODEPAGE_857 is not set | ||
683 | # CONFIG_NLS_CODEPAGE_860 is not set | ||
684 | # CONFIG_NLS_CODEPAGE_861 is not set | ||
685 | # CONFIG_NLS_CODEPAGE_862 is not set | ||
686 | # CONFIG_NLS_CODEPAGE_863 is not set | ||
687 | # CONFIG_NLS_CODEPAGE_864 is not set | ||
688 | # CONFIG_NLS_CODEPAGE_865 is not set | ||
689 | # CONFIG_NLS_CODEPAGE_866 is not set | ||
690 | # CONFIG_NLS_CODEPAGE_869 is not set | ||
691 | # CONFIG_NLS_CODEPAGE_936 is not set | ||
692 | # CONFIG_NLS_CODEPAGE_950 is not set | ||
693 | # CONFIG_NLS_CODEPAGE_932 is not set | ||
694 | # CONFIG_NLS_CODEPAGE_949 is not set | ||
695 | # CONFIG_NLS_CODEPAGE_874 is not set | ||
696 | # CONFIG_NLS_ISO8859_8 is not set | ||
697 | # CONFIG_NLS_CODEPAGE_1250 is not set | ||
698 | # CONFIG_NLS_CODEPAGE_1251 is not set | ||
699 | # CONFIG_NLS_ASCII is not set | ||
700 | # CONFIG_NLS_ISO8859_1 is not set | ||
701 | # CONFIG_NLS_ISO8859_2 is not set | ||
702 | # CONFIG_NLS_ISO8859_3 is not set | ||
703 | # CONFIG_NLS_ISO8859_4 is not set | ||
704 | # CONFIG_NLS_ISO8859_5 is not set | ||
705 | # CONFIG_NLS_ISO8859_6 is not set | ||
706 | # CONFIG_NLS_ISO8859_7 is not set | ||
707 | # CONFIG_NLS_ISO8859_9 is not set | ||
708 | # CONFIG_NLS_ISO8859_13 is not set | ||
709 | # CONFIG_NLS_ISO8859_14 is not set | ||
710 | # CONFIG_NLS_ISO8859_15 is not set | ||
711 | # CONFIG_NLS_KOI8_R is not set | ||
712 | # CONFIG_NLS_KOI8_U is not set | ||
713 | # CONFIG_NLS_UTF8 is not set | ||
714 | |||
715 | # | ||
716 | # Profiling support | ||
717 | # | ||
718 | # CONFIG_PROFILING is not set | ||
719 | |||
720 | # | ||
721 | # Kernel hacking | ||
722 | # | ||
723 | # CONFIG_PRINTK_TIME is not set | ||
724 | # CONFIG_DEBUG_KERNEL is not set | ||
725 | CONFIG_LOG_BUF_SHIFT=15 | ||
726 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
727 | # CONFIG_FRAME_POINTER is not set | ||
728 | |||
729 | # | ||
730 | # Security options | ||
731 | # | ||
732 | # CONFIG_KEYS is not set | ||
733 | # CONFIG_SECURITY is not set | ||
734 | |||
735 | # | ||
736 | # Cryptographic options | ||
737 | # | ||
738 | # CONFIG_CRYPTO is not set | ||
739 | |||
740 | # | ||
741 | # Hardware crypto devices | ||
742 | # | ||
743 | |||
744 | # | ||
745 | # Library routines | ||
746 | # | ||
747 | # CONFIG_CRC_CCITT is not set | ||
748 | CONFIG_CRC32=y | ||
749 | # CONFIG_LIBCRC32C is not set | ||
750 | CONFIG_ZLIB_INFLATE=y | ||
751 | CONFIG_ZLIB_DEFLATE=y | ||
diff --git a/arch/m32r/mappi3/dot.gdbinit b/arch/m32r/mappi3/dot.gdbinit new file mode 100644 index 000000000000..89c22184e139 --- /dev/null +++ b/arch/m32r/mappi3/dot.gdbinit | |||
@@ -0,0 +1,224 @@ | |||
1 | # .gdbinit file | ||
2 | # $Id: dot.gdbinit,v 1.1 2005/04/11 02:21:08 sakugawa Exp $ | ||
3 | |||
4 | # setting | ||
5 | set width 0d70 | ||
6 | set radix 0d16 | ||
7 | use_debug_dma | ||
8 | |||
9 | # Initialize SDRAM controller for Mappi | ||
10 | define sdram_init | ||
11 | # SDIR0 | ||
12 | set *(unsigned long *)0x00ef6008 = 0x00000182 | ||
13 | # SDIR1 | ||
14 | set *(unsigned long *)0x00ef600c = 0x00000001 | ||
15 | # Initialize wait | ||
16 | shell sleep 0.1 | ||
17 | # MOD | ||
18 | set *(unsigned long *)0x00ef602c = 0x00000020 | ||
19 | set *(unsigned long *)0x00ef604c = 0x00000020 | ||
20 | # TR | ||
21 | set *(unsigned long *)0x00ef6028 = 0x00051502 | ||
22 | set *(unsigned long *)0x00ef6048 = 0x00051502 | ||
23 | # ADR | ||
24 | set *(unsigned long *)0x00ef6020 = 0x08000004 | ||
25 | set *(unsigned long *)0x00ef6040 = 0x0c000004 | ||
26 | # AutoRef On | ||
27 | set *(unsigned long *)0x00ef6004 = 0x00010517 | ||
28 | # Access enable | ||
29 | set *(unsigned long *)0x00ef6024 = 0x00000001 | ||
30 | set *(unsigned long *)0x00ef6044 = 0x00000001 | ||
31 | end | ||
32 | |||
33 | # Initialize LAN controller for Mappi | ||
34 | define lanc_init | ||
35 | # Set BSEL4 | ||
36 | #set *(unsigned long *)0x00ef5004 = 0x0fff330f | ||
37 | #set *(unsigned long *)0x00ef5004 = 0x01113301 | ||
38 | |||
39 | # set *(unsigned long *)0x00ef5004 = 0x02011101 | ||
40 | # set *(unsigned long *)0x00ef5004 = 0x04441104 | ||
41 | end | ||
42 | |||
43 | define clock_init | ||
44 | set *(unsigned long *)0x00ef4010 = 2 | ||
45 | set *(unsigned long *)0x00ef4014 = 2 | ||
46 | set *(unsigned long *)0x00ef4020 = 3 | ||
47 | set *(unsigned long *)0x00ef4024 = 3 | ||
48 | set *(unsigned long *)0x00ef4004 = 0x7 | ||
49 | # shell sleep 0.1 | ||
50 | # set *(unsigned long *)0x00ef4004 = 0x5 | ||
51 | shell sleep 0.1 | ||
52 | set *(unsigned long *)0x00ef4008 = 0x0200 | ||
53 | end | ||
54 | |||
55 | define port_init | ||
56 | set $sfrbase = 0x00ef0000 | ||
57 | set *(unsigned short *)0x00ef1060 = 0x5555 | ||
58 | set *(unsigned short *)0x00ef1062 = 0x5555 | ||
59 | set *(unsigned short *)0x00ef1064 = 0x5555 | ||
60 | set *(unsigned short *)0x00ef1066 = 0x5555 | ||
61 | set *(unsigned short *)0x00ef1068 = 0x5555 | ||
62 | set *(unsigned short *)0x00ef106a = 0x0000 | ||
63 | set *(unsigned short *)0x00ef106e = 0x5555 | ||
64 | set *(unsigned short *)0x00ef1070 = 0x5555 | ||
65 | end | ||
66 | |||
67 | # MMU enable | ||
68 | define mmu_enable | ||
69 | set $evb=0x88000000 | ||
70 | set *(unsigned long *)0xffff0024=1 | ||
71 | end | ||
72 | |||
73 | # MMU disable | ||
74 | define mmu_disable | ||
75 | set $evb=0 | ||
76 | set *(unsigned long *)0xffff0024=0 | ||
77 | end | ||
78 | |||
79 | # Show TLB entries | ||
80 | define show_tlb_entries | ||
81 | set $i = 0 | ||
82 | set $addr = $arg0 | ||
83 | while ($i < 0d16 ) | ||
84 | set $tlb_tag = *(unsigned long*)$addr | ||
85 | set $tlb_data = *(unsigned long*)($addr + 4) | ||
86 | printf " [%2d] 0x%08lx : 0x%08lx - 0x%08lx\n", $i, $addr, $tlb_tag, $tlb_data | ||
87 | set $i = $i + 1 | ||
88 | set $addr = $addr + 8 | ||
89 | end | ||
90 | end | ||
91 | define itlb | ||
92 | set $itlb=0xfe000000 | ||
93 | show_tlb_entries $itlb | ||
94 | end | ||
95 | define dtlb | ||
96 | set $dtlb=0xfe000800 | ||
97 | show_tlb_entries $dtlb | ||
98 | end | ||
99 | |||
100 | # Cache ON | ||
101 | define set_cache_type | ||
102 | set $mctype = (void*)0xfffffff8 | ||
103 | # chaos | ||
104 | # set *(unsigned long *)($mctype) = 0x0000c000 | ||
105 | # m32102 i-cache only | ||
106 | set *(unsigned long *)($mctype) = 0x00008000 | ||
107 | # m32102 d-cache only | ||
108 | # set *(unsigned long *)($mctype) = 0x00004000 | ||
109 | end | ||
110 | define cache_on | ||
111 | set $param = (void*)0x08001000 | ||
112 | set *(unsigned long *)($param) = 0x60ff6102 | ||
113 | end | ||
114 | |||
115 | |||
116 | # Show current task structure | ||
117 | define show_current | ||
118 | set $current = $spi & 0xffffe000 | ||
119 | printf "$current=0x%08lX\n",$current | ||
120 | print *(struct task_struct *)$current | ||
121 | end | ||
122 | |||
123 | # Show user assigned task structure | ||
124 | define show_task | ||
125 | set $task = $arg0 & 0xffffe000 | ||
126 | printf "$task=0x%08lX\n",$task | ||
127 | print *(struct task_struct *)$task | ||
128 | end | ||
129 | document show_task | ||
130 | Show user assigned task structure | ||
131 | arg0 : task structure address | ||
132 | end | ||
133 | |||
134 | # Show M32R registers | ||
135 | define show_regs | ||
136 | printf " R0[0x%08lX] R1[0x%08lX] R2[0x%08lX] R3[0x%08lX]\n",$r0,$r1,$r2,$r3 | ||
137 | printf " R4[0x%08lX] R5[0x%08lX] R6[0x%08lX] R7[0x%08lX]\n",$r4,$r5,$r6,$r7 | ||
138 | printf " R8[0x%08lX] R9[0x%08lX] R10[0x%08lX] R11[0x%08lX]\n",$r8,$r9,$r10,$r11 | ||
139 | printf "R12[0x%08lX] FP[0x%08lX] LR[0x%08lX] SP[0x%08lX]\n",$r12,$fp,$lr,$sp | ||
140 | printf "PSW[0x%08lX] CBR[0x%08lX] SPI[0x%08lX] SPU[0x%08lX]\n",$psw,$cbr,$spi,$spu | ||
141 | printf "BPC[0x%08lX] PC[0x%08lX] ACCL[0x%08lX] ACCH[0x%08lX]\n",$bpc,$pc,$accl,$acch | ||
142 | printf "EVB[0x%08lX]\n",$evb | ||
143 | |||
144 | set $mests = *(unsigned long *)0xffff000c | ||
145 | set $mdeva = *(unsigned long *)0xffff0010 | ||
146 | printf "MESTS[0x%08lX] MDEVA[0x%08lX]\n",$mests,$mdeva | ||
147 | end | ||
148 | |||
149 | |||
150 | # Setup all | ||
151 | define setup | ||
152 | clock_init | ||
153 | shell sleep 0.1 | ||
154 | port_init | ||
155 | sdram_init | ||
156 | # lanc_init | ||
157 | # dispc_init | ||
158 | # set $evb=0x08000000 | ||
159 | end | ||
160 | |||
161 | # Load modules | ||
162 | define load_modules | ||
163 | use_debug_dma | ||
164 | load | ||
165 | # load busybox.mot | ||
166 | end | ||
167 | |||
168 | # Set kernel parameters | ||
169 | define set_kernel_parameters | ||
170 | set $param = (void*)0x08001000 | ||
171 | |||
172 | ## MOUNT_ROOT_RDONLY | ||
173 | set {long}($param+0x00)=0 | ||
174 | ## RAMDISK_FLAGS | ||
175 | #set {long}($param+0x04)=0 | ||
176 | ## ORIG_ROOT_DEV | ||
177 | #set {long}($param+0x08)=0x00000100 | ||
178 | ## LOADER_TYPE | ||
179 | #set {long}($param+0x0C)=0 | ||
180 | ## INITRD_START | ||
181 | set {long}($param+0x10)=0x082a0000 | ||
182 | ## INITRD_SIZE | ||
183 | set {long}($param+0x14)=0d6200000 | ||
184 | |||
185 | # M32R_CPUCLK | ||
186 | set *(unsigned long *)($param + 0x0018) = 0d100000000 | ||
187 | # M32R_BUSCLK | ||
188 | set *(unsigned long *)($param + 0x001c) = 0d50000000 | ||
189 | # M32R_TIMER_DIVIDE | ||
190 | set *(unsigned long *)($param + 0x0020) = 0d128 | ||
191 | |||
192 | |||
193 | set {char[0x200]}($param + 0x100) = "console=ttyS0,115200n8x root=/dev/nfsroot nfsroot=192.168.0.1:/project/m32r-linux/export/root.2.6_04 nfsaddrs=192.168.0.102:192.168.0.1:192.168.0.1:255.255.255.0:mappi: \0" | ||
194 | |||
195 | |||
196 | end | ||
197 | |||
198 | # Boot | ||
199 | define boot | ||
200 | set_kernel_parameters | ||
201 | debug_chaos | ||
202 | set *(unsigned long *)0x00f00000=0x08002000 | ||
203 | set $pc=0x08002000 | ||
204 | set $fp=0 | ||
205 | del b | ||
206 | si | ||
207 | end | ||
208 | |||
209 | # Restart | ||
210 | define restart | ||
211 | sdireset | ||
212 | sdireset | ||
213 | setup | ||
214 | load_modules | ||
215 | boot | ||
216 | end | ||
217 | |||
218 | sdireset | ||
219 | sdireset | ||
220 | file vmlinux | ||
221 | target m32rsdi | ||
222 | |||
223 | restart | ||
224 | boot | ||