diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-10-13 15:58:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:23:26 -0400 |
commit | 8c68383edfeaa524f589aeca1d217baff6bae69b (patch) | |
tree | b8d7082893520d4c31987b71752a4ff6a2ff58ca | |
parent | 08a3db94f2a36c28278922732bc281c1722ceb18 (diff) |
m68k: Reverse platform MMU logic so Sun 3 is last
Currently Sun 3 support is the first platform option, as the Sun 3 MMU is
incompatible with standard Motorola MMUs. However, this means that
`allmodconfig' enables support for Sun 3, and thus disables support for all
other platforms.
Reverse the logic and move Sun 3 last, so `allmodconfig' enables all
platforms except for Sun 3, increasing compile-coverage.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m68k/Kconfig | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 41e5bf02e230..c56af4b7054c 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -105,21 +105,9 @@ config PCMCIA | |||
105 | To compile this driver as modules, choose M here: the | 105 | To compile this driver as modules, choose M here: the |
106 | modules will be called pcmcia_core and ds. | 106 | modules will be called pcmcia_core and ds. |
107 | 107 | ||
108 | config SUN3 | ||
109 | bool "Sun3 support" | ||
110 | select M68020 | ||
111 | select MMU_SUN3 if MMU | ||
112 | help | ||
113 | This option enables support for the Sun 3 series of workstations | ||
114 | (3/50, 3/60, 3/1xx, 3/2xx systems). Enabling this option requires | ||
115 | that all other hardware types must be disabled, as Sun 3 kernels | ||
116 | are incompatible with all other m68k targets (including Sun 3x!). | ||
117 | |||
118 | If you don't want to compile a kernel exclusively for a Sun 3, say N. | ||
119 | |||
120 | config AMIGA | 108 | config AMIGA |
121 | bool "Amiga support" | 109 | bool "Amiga support" |
122 | depends on !MMU_SUN3 | 110 | select MMU_MOTOROLA if MMU |
123 | help | 111 | help |
124 | This option enables support for the Amiga series of computers. If | 112 | This option enables support for the Amiga series of computers. If |
125 | you plan to use this kernel on an Amiga, say Y here and browse the | 113 | you plan to use this kernel on an Amiga, say Y here and browse the |
@@ -127,7 +115,7 @@ config AMIGA | |||
127 | 115 | ||
128 | config ATARI | 116 | config ATARI |
129 | bool "Atari support" | 117 | bool "Atari support" |
130 | depends on !MMU_SUN3 | 118 | select MMU_MOTOROLA if MMU |
131 | help | 119 | help |
132 | This option enables support for the 68000-based Atari series of | 120 | This option enables support for the 68000-based Atari series of |
133 | computers (including the TT, Falcon and Medusa). If you plan to use | 121 | computers (including the TT, Falcon and Medusa). If you plan to use |
@@ -153,7 +141,7 @@ config PCI | |||
153 | 141 | ||
154 | config MAC | 142 | config MAC |
155 | bool "Macintosh support" | 143 | bool "Macintosh support" |
156 | depends on !MMU_SUN3 | 144 | select MMU_MOTOROLA if MMU |
157 | help | 145 | help |
158 | This option enables support for the Apple Macintosh series of | 146 | This option enables support for the Apple Macintosh series of |
159 | computers (yes, there is experimental support now, at least for part | 147 | computers (yes, there is experimental support now, at least for part |
@@ -174,14 +162,14 @@ config M68K_L2_CACHE | |||
174 | 162 | ||
175 | config APOLLO | 163 | config APOLLO |
176 | bool "Apollo support" | 164 | bool "Apollo support" |
177 | depends on !MMU_SUN3 | 165 | select MMU_MOTOROLA if MMU |
178 | help | 166 | help |
179 | Say Y here if you want to run Linux on an MC680x0-based Apollo | 167 | Say Y here if you want to run Linux on an MC680x0-based Apollo |
180 | Domain workstation such as the DN3500. | 168 | Domain workstation such as the DN3500. |
181 | 169 | ||
182 | config VME | 170 | config VME |
183 | bool "VME (Motorola and BVM) support" | 171 | bool "VME (Motorola and BVM) support" |
184 | depends on !MMU_SUN3 | 172 | select MMU_MOTOROLA if MMU |
185 | help | 173 | help |
186 | Say Y here if you want to build a kernel for a 680x0 based VME | 174 | Say Y here if you want to build a kernel for a 680x0 based VME |
187 | board. Boards currently supported include Motorola boards MVME147, | 175 | board. Boards currently supported include Motorola boards MVME147, |
@@ -218,7 +206,7 @@ config BVME6000 | |||
218 | 206 | ||
219 | config HP300 | 207 | config HP300 |
220 | bool "HP9000/300 and HP9000/400 support" | 208 | bool "HP9000/300 and HP9000/400 support" |
221 | depends on !MMU_SUN3 | 209 | select MMU_MOTOROLA if MMU |
222 | help | 210 | help |
223 | This option enables support for the HP9000/300 and HP9000/400 series | 211 | This option enables support for the HP9000/300 and HP9000/400 series |
224 | of workstations. Support for these machines is still somewhat | 212 | of workstations. Support for these machines is still somewhat |
@@ -237,7 +225,7 @@ config DIO | |||
237 | 225 | ||
238 | config SUN3X | 226 | config SUN3X |
239 | bool "Sun3x support" | 227 | bool "Sun3x support" |
240 | depends on !MMU_SUN3 | 228 | select MMU_MOTOROLA if MMU |
241 | select M68030 | 229 | select M68030 |
242 | help | 230 | help |
243 | This option enables support for the Sun 3x series of workstations. | 231 | This option enables support for the Sun 3x series of workstations. |
@@ -250,7 +238,7 @@ config SUN3X | |||
250 | 238 | ||
251 | config Q40 | 239 | config Q40 |
252 | bool "Q40/Q60 support" | 240 | bool "Q40/Q60 support" |
253 | depends on !MMU_SUN3 | 241 | select MMU_MOTOROLA if MMU |
254 | help | 242 | help |
255 | The Q40 is a Motorola 68040-based successor to the Sinclair QL | 243 | The Q40 is a Motorola 68040-based successor to the Sinclair QL |
256 | manufactured in Germany. There is an official Q40 home page at | 244 | manufactured in Germany. There is an official Q40 home page at |
@@ -258,6 +246,19 @@ config Q40 | |||
258 | Q60. Select your CPU below. For 68LC060 don't forget to enable FPU | 246 | Q60. Select your CPU below. For 68LC060 don't forget to enable FPU |
259 | emulation. | 247 | emulation. |
260 | 248 | ||
249 | config SUN3 | ||
250 | bool "Sun3 support" | ||
251 | depends on !MMU_MOTOROLA | ||
252 | select MMU_SUN3 if MMU | ||
253 | select M68020 | ||
254 | help | ||
255 | This option enables support for the Sun 3 series of workstations | ||
256 | (3/50, 3/60, 3/1xx, 3/2xx systems). Enabling this option requires | ||
257 | that all other hardware types must be disabled, as Sun 3 kernels | ||
258 | are incompatible with all other m68k targets (including Sun 3x!). | ||
259 | |||
260 | If you don't want to compile a kernel exclusively for a Sun 3, say N. | ||
261 | |||
261 | comment "Processor type" | 262 | comment "Processor type" |
262 | 263 | ||
263 | config M68020 | 264 | config M68020 |
@@ -295,10 +296,10 @@ config M68060 | |||
295 | config MMU_MOTOROLA | 296 | config MMU_MOTOROLA |
296 | bool | 297 | bool |
297 | depends on MMU && !MMU_SUN3 | 298 | depends on MMU && !MMU_SUN3 |
298 | default y | ||
299 | 299 | ||
300 | config MMU_SUN3 | 300 | config MMU_SUN3 |
301 | bool | 301 | bool |
302 | depends on MMU && !MMU_MOTOROLA | ||
302 | 303 | ||
303 | config M68KFPU_EMU | 304 | config M68KFPU_EMU |
304 | bool "Math emulation support (EXPERIMENTAL)" | 305 | bool "Math emulation support (EXPERIMENTAL)" |