aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/sh/Kconfig247
-rw-r--r--arch/sh/Makefile15
-rw-r--r--arch/sh/boards/Kconfig245
-rw-r--r--arch/sh/boards/mach-se/7206/io.c2
-rw-r--r--arch/sh/boards/mach-se/7206/irq.c2
-rw-r--r--arch/sh/boards/mach-se/7206/setup.c2
-rw-r--r--arch/sh/boards/mach-se/7343/irq.c6
-rw-r--r--arch/sh/boards/mach-se/7343/setup.c4
-rw-r--r--arch/sh/boards/mach-se/770x/io.c2
-rw-r--r--arch/sh/boards/mach-se/770x/irq.c2
-rw-r--r--arch/sh/boards/mach-se/770x/setup.c2
-rw-r--r--arch/sh/boards/mach-se/7721/irq.c2
-rw-r--r--arch/sh/boards/mach-se/7721/setup.c2
-rw-r--r--arch/sh/boards/mach-se/7722/irq.c2
-rw-r--r--arch/sh/boards/mach-se/7722/setup.c2
-rw-r--r--arch/sh/boards/mach-se/7751/io.c2
-rw-r--r--arch/sh/boards/mach-se/7751/irq.c2
-rw-r--r--arch/sh/boards/mach-se/7751/setup.c2
-rw-r--r--arch/sh/boards/mach-se/7780/irq.c2
-rw-r--r--arch/sh/boards/mach-se/7780/setup.c2
-rw-r--r--arch/sh/boards/mach-se/Makefile8
-rw-r--r--arch/sh/drivers/pci/ops-se7780.c2
-rw-r--r--arch/sh/include/mach-se/mach/se.h (renamed from arch/sh/include/asm/se.h)0
-rw-r--r--arch/sh/include/mach-se/mach/se7206.h (renamed from arch/sh/include/asm/se7206.h)0
-rw-r--r--arch/sh/include/mach-se/mach/se7343.h (renamed from arch/sh/include/asm/se7343.h)0
-rw-r--r--arch/sh/include/mach-se/mach/se7721.h (renamed from arch/sh/include/asm/se7721.h)0
-rw-r--r--arch/sh/include/mach-se/mach/se7722.h (renamed from arch/sh/include/asm/se7722.h)0
-rw-r--r--arch/sh/include/mach-se/mach/se7751.h (renamed from arch/sh/include/asm/se7751.h)0
-rw-r--r--arch/sh/include/mach-se/mach/se7780.h (renamed from arch/sh/include/asm/se7780.h)0
-rw-r--r--arch/sh/kernel/cf-enabler.c6
30 files changed, 282 insertions, 281 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 83d170ccb0f8..2b742206ba07 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -352,253 +352,10 @@ config CPU_SUBTYPE_SH5_103
352endchoice 352endchoice
353 353
354source "arch/sh/mm/Kconfig" 354source "arch/sh/mm/Kconfig"
355
355source "arch/sh/Kconfig.cpu" 356source "arch/sh/Kconfig.cpu"
356 357
357menu "Board support" 358source "arch/sh/boards/Kconfig"
358
359config SOLUTION_ENGINE
360 bool
361
362config SH_SOLUTION_ENGINE
363 bool "SolutionEngine"
364 select SOLUTION_ENGINE
365 select CPU_HAS_IPR_IRQ
366 depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \
367 CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \
368 CPU_SUBTYPE_SH7750R
369 help
370 Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,
371 SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.
372
373config SH_7206_SOLUTION_ENGINE
374 bool "SolutionEngine7206"
375 select SOLUTION_ENGINE
376 depends on CPU_SUBTYPE_SH7206
377 help
378 Select 7206 SolutionEngine if configuring for a Hitachi SH7206
379 evaluation board.
380
381config SH_7619_SOLUTION_ENGINE
382 bool "SolutionEngine7619"
383 select SOLUTION_ENGINE
384 depends on CPU_SUBTYPE_SH7619
385 help
386 Select 7619 SolutionEngine if configuring for a Hitachi SH7619
387 evaluation board.
388
389config SH_7721_SOLUTION_ENGINE
390 bool "SolutionEngine7721"
391 select SOLUTION_ENGINE
392 depends on CPU_SUBTYPE_SH7721
393 help
394 Select 7721 SolutionEngine if configuring for a Hitachi SH7721
395 evaluation board.
396
397config SH_7722_SOLUTION_ENGINE
398 bool "SolutionEngine7722"
399 select SOLUTION_ENGINE
400 depends on CPU_SUBTYPE_SH7722
401 help
402 Select 7722 SolutionEngine if configuring for a Hitachi SH772
403 evaluation board.
404
405config SH_7751_SOLUTION_ENGINE
406 bool "SolutionEngine7751"
407 select SOLUTION_ENGINE
408 select CPU_HAS_IPR_IRQ
409 depends on CPU_SUBTYPE_SH7751
410 help
411 Select 7751 SolutionEngine if configuring for a Hitachi SH7751
412 evaluation board.
413
414config SH_7780_SOLUTION_ENGINE
415 bool "SolutionEngine7780"
416 select SOLUTION_ENGINE
417 select SYS_SUPPORTS_PCI
418 depends on CPU_SUBTYPE_SH7780
419 help
420 Select 7780 SolutionEngine if configuring for a Renesas SH7780
421 evaluation board.
422
423config SH_7343_SOLUTION_ENGINE
424 bool "SolutionEngine7343"
425 select SOLUTION_ENGINE
426 depends on CPU_SUBTYPE_SH7343
427 help
428 Select 7343 SolutionEngine if configuring for a Hitachi
429 SH7343 (SH-Mobile 3AS) evaluation board.
430
431config SH_7751_SYSTEMH
432 bool "SystemH7751R"
433 depends on CPU_SUBTYPE_SH7751R
434 help
435 Select SystemH if you are configuring for a Renesas SystemH
436 7751R evaluation board.
437
438config SH_HP6XX
439 bool "HP6XX"
440 select SYS_SUPPORTS_APM_EMULATION
441 select HD6446X_SERIES
442 depends on CPU_SUBTYPE_SH7709
443 help
444 Select HP6XX if configuring for a HP jornada HP6xx.
445 More information (hardware only) at
446 <http://www.hp.com/jornada/>.
447
448config SH_DREAMCAST
449 bool "Dreamcast"
450 select SYS_SUPPORTS_PCI
451 depends on CPU_SUBTYPE_SH7091
452 help
453 Select Dreamcast if configuring for a SEGA Dreamcast.
454 More information at <http://www.linux-sh.org>
455
456config SH_SH03
457 bool "Interface CTP/PCI-SH03"
458 depends on CPU_SUBTYPE_SH7751
459 select CPU_HAS_IPR_IRQ
460 select SYS_SUPPORTS_PCI
461 help
462 CTP/PCI-SH03 is a CPU module computer that is produced
463 by Interface Corporation.
464 More information at <http://www.interface.co.jp>
465
466config SH_SECUREEDGE5410
467 bool "SecureEdge5410"
468 depends on CPU_SUBTYPE_SH7751R
469 select CPU_HAS_IPR_IRQ
470 select SYS_SUPPORTS_PCI
471 help
472 Select SecureEdge5410 if configuring for a SnapGear SH board.
473 This includes both the OEM SecureEdge products as well as the
474 SME product line.
475
476config SH_RTS7751R2D
477 bool "RTS7751R2D"
478 depends on CPU_SUBTYPE_SH7751R
479 select SYS_SUPPORTS_PCI
480 select IO_TRAPPED
481 help
482 Select RTS7751R2D if configuring for a Renesas Technology
483 Sales SH-Graphics board.
484
485config SH_RSK7203
486 bool "RSK7203"
487 depends on CPU_SUBTYPE_SH7203
488
489config SH_SDK7780
490 bool "SDK7780R3"
491 depends on CPU_SUBTYPE_SH7780
492 select SYS_SUPPORTS_PCI
493 help
494 Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3
495 evaluation board.
496
497config SH_HIGHLANDER
498 bool "Highlander"
499 depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
500 select SYS_SUPPORTS_PCI
501 select IO_TRAPPED
502
503config SH_SH7785LCR
504 bool "SH7785LCR"
505 depends on CPU_SUBTYPE_SH7785
506 select SYS_SUPPORTS_PCI
507 select IO_TRAPPED
508
509config SH_SH7785LCR_29BIT_PHYSMAPS
510 bool "SH7785LCR 29bit physmaps"
511 depends on SH_SH7785LCR
512 default y
513 help
514 This board has 2 physical memory maps. It can be changed with
515 DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,
516 you can access all on-board device in 29bit address mode.
517
518config SH_MIGOR
519 bool "Migo-R"
520 depends on CPU_SUBTYPE_SH7722
521 help
522 Select Migo-R if configuring for the SH7722 Migo-R platform
523 by Renesas System Solutions Asia Pte. Ltd.
524
525config SH_AP325RXA
526 bool "AP-325RXA"
527 depends on CPU_SUBTYPE_SH7723
528 help
529 Renesas "AP-325RXA" support.
530 Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
531
532config SH_SH7763RDP
533 bool "SH7763RDP"
534 depends on CPU_SUBTYPE_SH7763
535 help
536 Select SH7763RDP if configuring for a Renesas SH7763
537 evaluation board.
538
539config SH_EDOSK7705
540 bool "EDOSK7705"
541 depends on CPU_SUBTYPE_SH7705
542
543config SH_SH4202_MICRODEV
544 bool "SH4-202 MicroDev"
545 depends on CPU_SUBTYPE_SH4_202
546 help
547 Select SH4-202 MicroDev if configuring for a SuperH MicroDev board
548 with an SH4-202 CPU.
549
550config SH_LANDISK
551 bool "LANDISK"
552 depends on CPU_SUBTYPE_SH7751R
553 select SYS_SUPPORTS_PCI
554 help
555 I-O DATA DEVICE, INC. "LANDISK Series" support.
556
557config SH_TITAN
558 bool "TITAN"
559 depends on CPU_SUBTYPE_SH7751R
560 select CPU_HAS_IPR_IRQ
561 select SYS_SUPPORTS_PCI
562 help
563 Select Titan if you are configuring for a Nimble Microsystems
564 NetEngine NP51R.
565
566config SH_SHMIN
567 bool "SHMIN"
568 depends on CPU_SUBTYPE_SH7706
569 select CPU_HAS_IPR_IRQ
570 help
571 Select SHMIN if configuring for the SHMIN board.
572
573config SH_LBOX_RE2
574 bool "L-BOX RE2"
575 depends on CPU_SUBTYPE_SH7751R
576 select SYS_SUPPORTS_PCI
577 help
578 Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
579
580config SH_X3PROTO
581 bool "SH-X3 Prototype board"
582 depends on CPU_SUBTYPE_SHX3
583
584config SH_MAGIC_PANEL_R2
585 bool "Magic Panel R2"
586 depends on CPU_SUBTYPE_SH7720
587 help
588 Select Magic Panel R2 if configuring for Magic Panel R2.
589
590config SH_CAYMAN
591 bool "Hitachi Cayman"
592 depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
593 select SYS_SUPPORTS_PCI
594
595endmenu
596
597source "arch/sh/boards/mach-r2d/Kconfig"
598source "arch/sh/boards/mach-highlander/Kconfig"
599source "arch/sh/boards/mach-sdk7780/Kconfig"
600source "arch/sh/boards/mach-migor/Kconfig"
601source "arch/sh/boards/mach-magicpanelr2/Kconfig"
602 359
603menu "Timer and clock configuration" 360menu "Timer and clock configuration"
604 361
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index 47bbfd8ae664..fb3b65ed2910 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -101,15 +101,8 @@ LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
101core-y += arch/sh/kernel/ arch/sh/mm/ 101core-y += arch/sh/kernel/ arch/sh/mm/
102core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/ 102core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/
103 103
104# Boards 104# Boards and Mach groups
105machdir-$(CONFIG_SH_SOLUTION_ENGINE) += mach-se/770x 105machdir-$(CONFIG_SOLUTION_ENGINE) += mach-se
106machdir-$(CONFIG_SH_7206_SOLUTION_ENGINE) += mach-se/7206
107machdir-$(CONFIG_SH_7619_SOLUTION_ENGINE) += mach-se/7619
108machdir-$(CONFIG_SH_7722_SOLUTION_ENGINE) += mach-se/7722
109machdir-$(CONFIG_SH_7751_SOLUTION_ENGINE) += mach-se/7751
110machdir-$(CONFIG_SH_7780_SOLUTION_ENGINE) += mach-se/7780
111machdir-$(CONFIG_SH_7343_SOLUTION_ENGINE) += mach-se/7343
112machdir-$(CONFIG_SH_7721_SOLUTION_ENGINE) += mach-se/7721
113machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx 106machdir-$(CONFIG_SH_HP6XX) += mach-hp6xx
114machdir-$(CONFIG_SH_DREAMCAST) += mach-dreamcast 107machdir-$(CONFIG_SH_DREAMCAST) += mach-dreamcast
115machdir-$(CONFIG_SH_SH03) += mach-sh03 108machdir-$(CONFIG_SH_SH03) += mach-sh03
@@ -133,8 +126,6 @@ machdir-$(CONFIG_SH_LBOX_RE2) += mach-lboxre2
133machdir-$(CONFIG_SH_MAGIC_PANEL_R2) += mach-magicpanelr2 126machdir-$(CONFIG_SH_MAGIC_PANEL_R2) += mach-magicpanelr2
134machdir-$(CONFIG_SH_CAYMAN) += mach-cayman 127machdir-$(CONFIG_SH_CAYMAN) += mach-cayman
135 128
136incdir-y := $(notdir $(machdir-y))
137
138ifneq ($(machdir-y),) 129ifneq ($(machdir-y),)
139core-y += $(addprefix arch/sh/boards/, \ 130core-y += $(addprefix arch/sh/boards/, \
140 $(filter-out ., $(patsubst %,%/,$(machdir-y)))) 131 $(filter-out ., $(patsubst %,%/,$(machdir-y))))
@@ -159,7 +150,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sh/oprofile/
159boot := arch/sh/boot 150boot := arch/sh/boot
160 151
161cflags-y += -Iarch/sh/include/$(cpuincdir-y) 152cflags-y += -Iarch/sh/include/$(cpuincdir-y)
162cflags-y += $(foreach d, $(incdir-y), -Iarch/sh/include/mach-$(d)) 153cflags-y += $(foreach d, $(machdir-y), -Iarch/sh/include/$(d))
163 154
164KBUILD_CFLAGS += -pipe $(cflags-y) 155KBUILD_CFLAGS += -pipe $(cflags-y)
165KBUILD_CPPFLAGS += $(cflags-y) 156KBUILD_CPPFLAGS += $(cflags-y)
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
new file mode 100644
index 000000000000..324c25ac95ce
--- /dev/null
+++ b/arch/sh/boards/Kconfig
@@ -0,0 +1,245 @@
1menu "Board support"
2
3config SOLUTION_ENGINE
4 bool
5
6config SH_SOLUTION_ENGINE
7 bool "SolutionEngine"
8 select SOLUTION_ENGINE
9 select CPU_HAS_IPR_IRQ
10 depends on CPU_SUBTYPE_SH7705 || CPU_SUBTYPE_SH7709 || CPU_SUBTYPE_SH7710 || \
11 CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7750S || \
12 CPU_SUBTYPE_SH7750R
13 help
14 Select SolutionEngine if configuring for a Hitachi SH7705, SH7709,
15 SH7710, SH7712, SH7750, SH7750S or SH7750R evaluation board.
16
17config SH_7206_SOLUTION_ENGINE
18 bool "SolutionEngine7206"
19 select SOLUTION_ENGINE
20 depends on CPU_SUBTYPE_SH7206
21 help
22 Select 7206 SolutionEngine if configuring for a Hitachi SH7206
23 evaluation board.
24
25config SH_7619_SOLUTION_ENGINE
26 bool "SolutionEngine7619"
27 select SOLUTION_ENGINE
28 depends on CPU_SUBTYPE_SH7619
29 help
30 Select 7619 SolutionEngine if configuring for a Hitachi SH7619
31 evaluation board.
32
33config SH_7721_SOLUTION_ENGINE
34 bool "SolutionEngine7721"
35 select SOLUTION_ENGINE
36 depends on CPU_SUBTYPE_SH7721
37 help
38 Select 7721 SolutionEngine if configuring for a Hitachi SH7721
39 evaluation board.
40
41config SH_7722_SOLUTION_ENGINE
42 bool "SolutionEngine7722"
43 select SOLUTION_ENGINE
44 depends on CPU_SUBTYPE_SH7722
45 help
46 Select 7722 SolutionEngine if configuring for a Hitachi SH772
47 evaluation board.
48
49config SH_7751_SOLUTION_ENGINE
50 bool "SolutionEngine7751"
51 select SOLUTION_ENGINE
52 select CPU_HAS_IPR_IRQ
53 depends on CPU_SUBTYPE_SH7751
54 help
55 Select 7751 SolutionEngine if configuring for a Hitachi SH7751
56 evaluation board.
57
58config SH_7780_SOLUTION_ENGINE
59 bool "SolutionEngine7780"
60 select SOLUTION_ENGINE
61 select SYS_SUPPORTS_PCI
62 depends on CPU_SUBTYPE_SH7780
63 help
64 Select 7780 SolutionEngine if configuring for a Renesas SH7780
65 evaluation board.
66
67config SH_7343_SOLUTION_ENGINE
68 bool "SolutionEngine7343"
69 select SOLUTION_ENGINE
70 depends on CPU_SUBTYPE_SH7343
71 help
72 Select 7343 SolutionEngine if configuring for a Hitachi
73 SH7343 (SH-Mobile 3AS) evaluation board.
74
75config SH_7751_SYSTEMH
76 bool "SystemH7751R"
77 depends on CPU_SUBTYPE_SH7751R
78 help
79 Select SystemH if you are configuring for a Renesas SystemH
80 7751R evaluation board.
81
82config SH_HP6XX
83 bool "HP6XX"
84 select SYS_SUPPORTS_APM_EMULATION
85 select HD6446X_SERIES
86 depends on CPU_SUBTYPE_SH7709
87 help
88 Select HP6XX if configuring for a HP jornada HP6xx.
89 More information (hardware only) at
90 <http://www.hp.com/jornada/>.
91
92config SH_DREAMCAST
93 bool "Dreamcast"
94 select SYS_SUPPORTS_PCI
95 depends on CPU_SUBTYPE_SH7091
96 help
97 Select Dreamcast if configuring for a SEGA Dreamcast.
98 More information at <http://www.linux-sh.org>
99
100config SH_SH03
101 bool "Interface CTP/PCI-SH03"
102 depends on CPU_SUBTYPE_SH7751
103 select CPU_HAS_IPR_IRQ
104 select SYS_SUPPORTS_PCI
105 help
106 CTP/PCI-SH03 is a CPU module computer that is produced
107 by Interface Corporation.
108 More information at <http://www.interface.co.jp>
109
110config SH_SECUREEDGE5410
111 bool "SecureEdge5410"
112 depends on CPU_SUBTYPE_SH7751R
113 select CPU_HAS_IPR_IRQ
114 select SYS_SUPPORTS_PCI
115 help
116 Select SecureEdge5410 if configuring for a SnapGear SH board.
117 This includes both the OEM SecureEdge products as well as the
118 SME product line.
119
120config SH_RTS7751R2D
121 bool "RTS7751R2D"
122 depends on CPU_SUBTYPE_SH7751R
123 select SYS_SUPPORTS_PCI
124 select IO_TRAPPED
125 help
126 Select RTS7751R2D if configuring for a Renesas Technology
127 Sales SH-Graphics board.
128
129config SH_RSK7203
130 bool "RSK7203"
131 depends on CPU_SUBTYPE_SH7203
132
133config SH_SDK7780
134 bool "SDK7780R3"
135 depends on CPU_SUBTYPE_SH7780
136 select SYS_SUPPORTS_PCI
137 help
138 Select SDK7780 if configuring for a Renesas SH7780 SDK7780R3
139 evaluation board.
140
141config SH_HIGHLANDER
142 bool "Highlander"
143 depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785
144 select SYS_SUPPORTS_PCI
145 select IO_TRAPPED
146
147config SH_SH7785LCR
148 bool "SH7785LCR"
149 depends on CPU_SUBTYPE_SH7785
150 select SYS_SUPPORTS_PCI
151 select IO_TRAPPED
152
153config SH_SH7785LCR_29BIT_PHYSMAPS
154 bool "SH7785LCR 29bit physmaps"
155 depends on SH_SH7785LCR
156 default y
157 help
158 This board has 2 physical memory maps. It can be changed with
159 DIP switch(S2-5). If you set the DIP switch for S2-5 = ON,
160 you can access all on-board device in 29bit address mode.
161
162config SH_MIGOR
163 bool "Migo-R"
164 depends on CPU_SUBTYPE_SH7722
165 help
166 Select Migo-R if configuring for the SH7722 Migo-R platform
167 by Renesas System Solutions Asia Pte. Ltd.
168
169config SH_AP325RXA
170 bool "AP-325RXA"
171 depends on CPU_SUBTYPE_SH7723
172 help
173 Renesas "AP-325RXA" support.
174 Compatible with ALGO SYSTEM CO.,LTD. "AP-320A"
175
176config SH_SH7763RDP
177 bool "SH7763RDP"
178 depends on CPU_SUBTYPE_SH7763
179 help
180 Select SH7763RDP if configuring for a Renesas SH7763
181 evaluation board.
182
183config SH_EDOSK7705
184 bool "EDOSK7705"
185 depends on CPU_SUBTYPE_SH7705
186
187config SH_SH4202_MICRODEV
188 bool "SH4-202 MicroDev"
189 depends on CPU_SUBTYPE_SH4_202
190 help
191 Select SH4-202 MicroDev if configuring for a SuperH MicroDev board
192 with an SH4-202 CPU.
193
194config SH_LANDISK
195 bool "LANDISK"
196 depends on CPU_SUBTYPE_SH7751R
197 select SYS_SUPPORTS_PCI
198 help
199 I-O DATA DEVICE, INC. "LANDISK Series" support.
200
201config SH_TITAN
202 bool "TITAN"
203 depends on CPU_SUBTYPE_SH7751R
204 select CPU_HAS_IPR_IRQ
205 select SYS_SUPPORTS_PCI
206 help
207 Select Titan if you are configuring for a Nimble Microsystems
208 NetEngine NP51R.
209
210config SH_SHMIN
211 bool "SHMIN"
212 depends on CPU_SUBTYPE_SH7706
213 select CPU_HAS_IPR_IRQ
214 help
215 Select SHMIN if configuring for the SHMIN board.
216
217config SH_LBOX_RE2
218 bool "L-BOX RE2"
219 depends on CPU_SUBTYPE_SH7751R
220 select SYS_SUPPORTS_PCI
221 help
222 Select L-BOX RE2 if configuring for the NTT COMWARE L-BOX RE2.
223
224config SH_X3PROTO
225 bool "SH-X3 Prototype board"
226 depends on CPU_SUBTYPE_SHX3
227
228config SH_MAGIC_PANEL_R2
229 bool "Magic Panel R2"
230 depends on CPU_SUBTYPE_SH7720
231 help
232 Select Magic Panel R2 if configuring for Magic Panel R2.
233
234config SH_CAYMAN
235 bool "Hitachi Cayman"
236 depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103
237 select SYS_SUPPORTS_PCI
238
239endmenu
240
241source "arch/sh/boards/mach-r2d/Kconfig"
242source "arch/sh/boards/mach-highlander/Kconfig"
243source "arch/sh/boards/mach-sdk7780/Kconfig"
244source "arch/sh/boards/mach-migor/Kconfig"
245source "arch/sh/boards/mach-magicpanelr2/Kconfig"
diff --git a/arch/sh/boards/mach-se/7206/io.c b/arch/sh/boards/mach-se/7206/io.c
index 1308e618e044..9c3a33210d61 100644
--- a/arch/sh/boards/mach-se/7206/io.c
+++ b/arch/sh/boards/mach-se/7206/io.c
@@ -11,7 +11,7 @@
11#include <linux/kernel.h> 11#include <linux/kernel.h>
12#include <linux/types.h> 12#include <linux/types.h>
13#include <asm/io.h> 13#include <asm/io.h>
14#include <asm/se7206.h> 14#include <mach-se/mach/se7206.h>
15 15
16 16
17static inline void delay(void) 17static inline void delay(void)
diff --git a/arch/sh/boards/mach-se/7206/irq.c b/arch/sh/boards/mach-se/7206/irq.c
index 9d5bfc77d0de..aef7f052851a 100644
--- a/arch/sh/boards/mach-se/7206/irq.c
+++ b/arch/sh/boards/mach-se/7206/irq.c
@@ -10,7 +10,7 @@
10#include <linux/irq.h> 10#include <linux/irq.h>
11#include <linux/io.h> 11#include <linux/io.h>
12#include <linux/interrupt.h> 12#include <linux/interrupt.h>
13#include <asm/se7206.h> 13#include <mach-se/mach/se7206.h>
14 14
15#define INTSTS0 0x31800000 15#define INTSTS0 0x31800000
16#define INTSTS1 0x31800002 16#define INTSTS1 0x31800002
diff --git a/arch/sh/boards/mach-se/7206/setup.c b/arch/sh/boards/mach-se/7206/setup.c
index 4fe84cc08406..f5466384972e 100644
--- a/arch/sh/boards/mach-se/7206/setup.c
+++ b/arch/sh/boards/mach-se/7206/setup.c
@@ -10,7 +10,7 @@
10#include <linux/init.h> 10#include <linux/init.h>
11#include <linux/platform_device.h> 11#include <linux/platform_device.h>
12#include <linux/smc91x.h> 12#include <linux/smc91x.h>
13#include <asm/se7206.h> 13#include <mach-se/mach/se7206.h>
14#include <asm/io.h> 14#include <asm/io.h>
15#include <asm/machvec.h> 15#include <asm/machvec.h>
16#include <asm/heartbeat.h> 16#include <asm/heartbeat.h>
diff --git a/arch/sh/boards/mach-se/7343/irq.c b/arch/sh/boards/mach-se/7343/irq.c
index 1112e86aa93a..5d96e2eef82a 100644
--- a/arch/sh/boards/mach-se/7343/irq.c
+++ b/arch/sh/boards/mach-se/7343/irq.c
@@ -13,9 +13,9 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/irq.h> 14#include <linux/irq.h>
15#include <linux/interrupt.h> 15#include <linux/interrupt.h>
16#include <asm/irq.h> 16#include <linux/irq.h>
17#include <asm/io.h> 17#include <linux/io.h>
18#include <asm/se7343.h> 18#include <mach-se/mach/se7343.h>
19 19
20static void disable_se7343_irq(unsigned int irq) 20static void disable_se7343_irq(unsigned int irq)
21{ 21{
diff --git a/arch/sh/boards/mach-se/7343/setup.c b/arch/sh/boards/mach-se/7343/setup.c
index 59dc92e20f64..486f40bf9274 100644
--- a/arch/sh/boards/mach-se/7343/setup.c
+++ b/arch/sh/boards/mach-se/7343/setup.c
@@ -1,8 +1,8 @@
1#include <linux/init.h> 1#include <linux/init.h>
2#include <linux/platform_device.h> 2#include <linux/platform_device.h>
3#include <linux/mtd/physmap.h> 3#include <linux/mtd/physmap.h>
4#include <machvec.h> 4#include <asm/machvec.h>
5#include <mach/se7343.h> 5#include <mach-se/mach/se7343.h>
6#include <asm/heartbeat.h> 6#include <asm/heartbeat.h>
7#include <asm/irq.h> 7#include <asm/irq.h>
8#include <asm/io.h> 8#include <asm/io.h>
diff --git a/arch/sh/boards/mach-se/770x/io.c b/arch/sh/boards/mach-se/770x/io.c
index b1ec085b8673..28833c8786ea 100644
--- a/arch/sh/boards/mach-se/770x/io.c
+++ b/arch/sh/boards/mach-se/770x/io.c
@@ -6,7 +6,7 @@
6#include <linux/kernel.h> 6#include <linux/kernel.h>
7#include <linux/types.h> 7#include <linux/types.h>
8#include <asm/io.h> 8#include <asm/io.h>
9#include <asm/se.h> 9#include <mach-se/mach/se.h>
10 10
11/* MS7750 requires special versions of in*, out* routines, since 11/* MS7750 requires special versions of in*, out* routines, since
12 PC-like io ports are located at upper half byte of 16-bit word which 12 PC-like io ports are located at upper half byte of 16-bit word which
diff --git a/arch/sh/boards/mach-se/770x/irq.c b/arch/sh/boards/mach-se/770x/irq.c
index cdb0807928a5..ec1fea571b52 100644
--- a/arch/sh/boards/mach-se/770x/irq.c
+++ b/arch/sh/boards/mach-se/770x/irq.c
@@ -13,7 +13,7 @@
13#include <linux/irq.h> 13#include <linux/irq.h>
14#include <asm/irq.h> 14#include <asm/irq.h>
15#include <asm/io.h> 15#include <asm/io.h>
16#include <asm/se.h> 16#include <mach-se/mach/se.h>
17 17
18static struct ipr_data ipr_irq_table[] = { 18static struct ipr_data ipr_irq_table[] = {
19 /* 19 /*
diff --git a/arch/sh/boards/mach-se/770x/setup.c b/arch/sh/boards/mach-se/770x/setup.c
index 6c64d774da3a..9123d9687bf7 100644
--- a/arch/sh/boards/mach-se/770x/setup.c
+++ b/arch/sh/boards/mach-se/770x/setup.c
@@ -9,7 +9,7 @@
9#include <linux/init.h> 9#include <linux/init.h>
10#include <linux/platform_device.h> 10#include <linux/platform_device.h>
11#include <asm/machvec.h> 11#include <asm/machvec.h>
12#include <asm/se.h> 12#include <mach-se/mach/se.h>
13#include <asm/io.h> 13#include <asm/io.h>
14#include <asm/smc37c93x.h> 14#include <asm/smc37c93x.h>
15#include <asm/heartbeat.h> 15#include <asm/heartbeat.h>
diff --git a/arch/sh/boards/mach-se/7721/irq.c b/arch/sh/boards/mach-se/7721/irq.c
index c4fdd622bf8b..b417acc4dad0 100644
--- a/arch/sh/boards/mach-se/7721/irq.c
+++ b/arch/sh/boards/mach-se/7721/irq.c
@@ -11,7 +11,7 @@
11#include <linux/irq.h> 11#include <linux/irq.h>
12#include <linux/interrupt.h> 12#include <linux/interrupt.h>
13#include <linux/io.h> 13#include <linux/io.h>
14#include <asm/se7721.h> 14#include <mach-se/mach/se7721.h>
15 15
16enum { 16enum {
17 UNUSED = 0, 17 UNUSED = 0,
diff --git a/arch/sh/boards/mach-se/7721/setup.c b/arch/sh/boards/mach-se/7721/setup.c
index 1be3e92752f7..d3fc80ff4d83 100644
--- a/arch/sh/boards/mach-se/7721/setup.c
+++ b/arch/sh/boards/mach-se/7721/setup.c
@@ -13,7 +13,7 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/platform_device.h> 14#include <linux/platform_device.h>
15#include <asm/machvec.h> 15#include <asm/machvec.h>
16#include <asm/se7721.h> 16#include <mach-se/mach/se7721.h>
17#include <asm/io.h> 17#include <asm/io.h>
18#include <asm/heartbeat.h> 18#include <asm/heartbeat.h>
19 19
diff --git a/arch/sh/boards/mach-se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c
index 0b03f3f610b8..02d21a3e2a8f 100644
--- a/arch/sh/boards/mach-se/7722/irq.c
+++ b/arch/sh/boards/mach-se/7722/irq.c
@@ -14,7 +14,7 @@
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <asm/irq.h> 15#include <asm/irq.h>
16#include <asm/io.h> 16#include <asm/io.h>
17#include <asm/se7722.h> 17#include <mach-se/mach/se7722.h>
18 18
19static void disable_se7722_irq(unsigned int irq) 19static void disable_se7722_irq(unsigned int irq)
20{ 20{
diff --git a/arch/sh/boards/mach-se/7722/setup.c b/arch/sh/boards/mach-se/7722/setup.c
index 6e228ea59788..fe6f96517e12 100644
--- a/arch/sh/boards/mach-se/7722/setup.c
+++ b/arch/sh/boards/mach-se/7722/setup.c
@@ -17,7 +17,7 @@
17#include <linux/smc91x.h> 17#include <linux/smc91x.h>
18#include <asm/machvec.h> 18#include <asm/machvec.h>
19#include <asm/clock.h> 19#include <asm/clock.h>
20#include <asm/se7722.h> 20#include <mach-se/mach/se7722.h>
21#include <asm/io.h> 21#include <asm/io.h>
22#include <asm/heartbeat.h> 22#include <asm/heartbeat.h>
23#include <asm/sh_keysc.h> 23#include <asm/sh_keysc.h>
diff --git a/arch/sh/boards/mach-se/7751/io.c b/arch/sh/boards/mach-se/7751/io.c
index e8d846cec89d..6287ae570319 100644
--- a/arch/sh/boards/mach-se/7751/io.c
+++ b/arch/sh/boards/mach-se/7751/io.c
@@ -12,7 +12,7 @@
12#include <linux/types.h> 12#include <linux/types.h>
13#include <linux/pci.h> 13#include <linux/pci.h>
14#include <asm/io.h> 14#include <asm/io.h>
15#include <asm/se7751.h> 15#include <mach-se/mach/se7751.h>
16#include <asm/addrspace.h> 16#include <asm/addrspace.h>
17 17
18static inline volatile u16 *port2adr(unsigned int port) 18static inline volatile u16 *port2adr(unsigned int port)
diff --git a/arch/sh/boards/mach-se/7751/irq.c b/arch/sh/boards/mach-se/7751/irq.c
index c3d12590e5db..5c9847ea1e7c 100644
--- a/arch/sh/boards/mach-se/7751/irq.c
+++ b/arch/sh/boards/mach-se/7751/irq.c
@@ -12,7 +12,7 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/irq.h> 13#include <linux/irq.h>
14#include <asm/irq.h> 14#include <asm/irq.h>
15#include <asm/se7751.h> 15#include <mach-se/mach/se7751.h>
16 16
17static struct ipr_data ipr_irq_table[] = { 17static struct ipr_data ipr_irq_table[] = {
18 { 13, 3, 3, 2 }, 18 { 13, 3, 3, 2 },
diff --git a/arch/sh/boards/mach-se/7751/setup.c b/arch/sh/boards/mach-se/7751/setup.c
index deefbfd92591..50572512e3e8 100644
--- a/arch/sh/boards/mach-se/7751/setup.c
+++ b/arch/sh/boards/mach-se/7751/setup.c
@@ -11,7 +11,7 @@
11#include <linux/init.h> 11#include <linux/init.h>
12#include <linux/platform_device.h> 12#include <linux/platform_device.h>
13#include <asm/machvec.h> 13#include <asm/machvec.h>
14#include <asm/se7751.h> 14#include <mach-se/mach/se7751.h>
15#include <asm/io.h> 15#include <asm/io.h>
16#include <asm/heartbeat.h> 16#include <asm/heartbeat.h>
17 17
diff --git a/arch/sh/boards/mach-se/7780/irq.c b/arch/sh/boards/mach-se/7780/irq.c
index 6bd70da6bb47..66ad292c9fc3 100644
--- a/arch/sh/boards/mach-se/7780/irq.c
+++ b/arch/sh/boards/mach-se/7780/irq.c
@@ -14,7 +14,7 @@
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <asm/irq.h> 15#include <asm/irq.h>
16#include <asm/io.h> 16#include <asm/io.h>
17#include <asm/se7780.h> 17#include <mach-se/mach/se7780.h>
18 18
19/* 19/*
20 * Initialize IRQ setting 20 * Initialize IRQ setting
diff --git a/arch/sh/boards/mach-se/7780/setup.c b/arch/sh/boards/mach-se/7780/setup.c
index 0f08ab3b2bec..1d3a867e94e3 100644
--- a/arch/sh/boards/mach-se/7780/setup.c
+++ b/arch/sh/boards/mach-se/7780/setup.c
@@ -12,7 +12,7 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/platform_device.h> 13#include <linux/platform_device.h>
14#include <asm/machvec.h> 14#include <asm/machvec.h>
15#include <asm/se7780.h> 15#include <mach-se/mach/se7780.h>
16#include <asm/io.h> 16#include <asm/io.h>
17#include <asm/heartbeat.h> 17#include <asm/heartbeat.h>
18 18
diff --git a/arch/sh/boards/mach-se/Makefile b/arch/sh/boards/mach-se/Makefile
new file mode 100644
index 000000000000..ad2b38ef65dc
--- /dev/null
+++ b/arch/sh/boards/mach-se/Makefile
@@ -0,0 +1,8 @@
1obj-$(CONFIG_SH_SOLUTION_ENGINE) += 770x/
2obj-$(CONFIG_SH_7206_SOLUTION_ENGINE) += 7206/
3obj-$(CONFIG_SH_7619_SOLUTION_ENGINE) += 7619/
4obj-$(CONFIG_SH_7722_SOLUTION_ENGINE) += 7722/
5obj-$(CONFIG_SH_7751_SOLUTION_ENGINE) += 7751/
6obj-$(CONFIG_SH_7780_SOLUTION_ENGINE) += 7780/
7obj-$(CONFIG_SH_7343_SOLUTION_ENGINE) += 7343/
8obj-$(CONFIG_SH_7721_SOLUTION_ENGINE) += 7721/
diff --git a/arch/sh/drivers/pci/ops-se7780.c b/arch/sh/drivers/pci/ops-se7780.c
index bbdb48c124a2..3145c62484d6 100644
--- a/arch/sh/drivers/pci/ops-se7780.c
+++ b/arch/sh/drivers/pci/ops-se7780.c
@@ -13,7 +13,7 @@
13#include <linux/init.h> 13#include <linux/init.h>
14#include <linux/delay.h> 14#include <linux/delay.h>
15#include <linux/pci.h> 15#include <linux/pci.h>
16#include <asm/se7780.h> 16#include <mach-se/mach/se7780.h>
17#include <asm/io.h> 17#include <asm/io.h>
18#include "pci-sh4.h" 18#include "pci-sh4.h"
19 19
diff --git a/arch/sh/include/asm/se.h b/arch/sh/include/mach-se/mach/se.h
index eb23000e1bbe..eb23000e1bbe 100644
--- a/arch/sh/include/asm/se.h
+++ b/arch/sh/include/mach-se/mach/se.h
diff --git a/arch/sh/include/asm/se7206.h b/arch/sh/include/mach-se/mach/se7206.h
index 698eb80389ab..698eb80389ab 100644
--- a/arch/sh/include/asm/se7206.h
+++ b/arch/sh/include/mach-se/mach/se7206.h
diff --git a/arch/sh/include/asm/se7343.h b/arch/sh/include/mach-se/mach/se7343.h
index 98458460e632..98458460e632 100644
--- a/arch/sh/include/asm/se7343.h
+++ b/arch/sh/include/mach-se/mach/se7343.h
diff --git a/arch/sh/include/asm/se7721.h b/arch/sh/include/mach-se/mach/se7721.h
index b957f6041193..b957f6041193 100644
--- a/arch/sh/include/asm/se7721.h
+++ b/arch/sh/include/mach-se/mach/se7721.h
diff --git a/arch/sh/include/asm/se7722.h b/arch/sh/include/mach-se/mach/se7722.h
index e971d9a82f4a..e971d9a82f4a 100644
--- a/arch/sh/include/asm/se7722.h
+++ b/arch/sh/include/mach-se/mach/se7722.h
diff --git a/arch/sh/include/asm/se7751.h b/arch/sh/include/mach-se/mach/se7751.h
index b36792ac5d66..b36792ac5d66 100644
--- a/arch/sh/include/asm/se7751.h
+++ b/arch/sh/include/mach-se/mach/se7751.h
diff --git a/arch/sh/include/asm/se7780.h b/arch/sh/include/mach-se/mach/se7780.h
index 40e9b41458cd..40e9b41458cd 100644
--- a/arch/sh/include/asm/se7780.h
+++ b/arch/sh/include/mach-se/mach/se7780.h
diff --git a/arch/sh/kernel/cf-enabler.c b/arch/sh/kernel/cf-enabler.c
index d3d9f3204230..bea40339919b 100644
--- a/arch/sh/kernel/cf-enabler.c
+++ b/arch/sh/kernel/cf-enabler.c
@@ -80,11 +80,11 @@ static int __init cf_init_default(void)
80} 80}
81 81
82#if defined(CONFIG_SH_SOLUTION_ENGINE) 82#if defined(CONFIG_SH_SOLUTION_ENGINE)
83#include <asm/se.h> 83#include <mach-se/mach/se.h>
84#elif defined(CONFIG_SH_7722_SOLUTION_ENGINE) 84#elif defined(CONFIG_SH_7722_SOLUTION_ENGINE)
85#include <asm/se7722.h> 85#include <mach-se/mach/se7722.h>
86#elif defined(CONFIG_SH_7721_SOLUTION_ENGINE) 86#elif defined(CONFIG_SH_7721_SOLUTION_ENGINE)
87#include <asm/se7721.h> 87#include <mach-se/mach/se7721.h>
88#endif 88#endif
89 89
90/* 90/*
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-07 05:33:55 -0400