Commit 8c68383e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 08a3db94
...@@ -105,21 +105,9 @@ config PCMCIA ...@@ -105,21 +105,9 @@ config PCMCIA
To compile this driver as modules, choose M here: the To compile this driver as modules, choose M here: the
modules will be called pcmcia_core and ds. modules will be called pcmcia_core and ds.
config SUN3
bool "Sun3 support"
select M68020
select MMU_SUN3 if MMU
help
This option enables support for the Sun 3 series of workstations
(3/50, 3/60, 3/1xx, 3/2xx systems). Enabling this option requires
that all other hardware types must be disabled, as Sun 3 kernels
are incompatible with all other m68k targets (including Sun 3x!).
If you don't want to compile a kernel exclusively for a Sun 3, say N.
config AMIGA config AMIGA
bool "Amiga support" bool "Amiga support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
help help
This option enables support for the Amiga series of computers. If This option enables support for the Amiga series of computers. If
you plan to use this kernel on an Amiga, say Y here and browse the you plan to use this kernel on an Amiga, say Y here and browse the
...@@ -127,7 +115,7 @@ config AMIGA ...@@ -127,7 +115,7 @@ config AMIGA
config ATARI config ATARI
bool "Atari support" bool "Atari support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
help help
This option enables support for the 68000-based Atari series of This option enables support for the 68000-based Atari series of
computers (including the TT, Falcon and Medusa). If you plan to use computers (including the TT, Falcon and Medusa). If you plan to use
...@@ -153,7 +141,7 @@ config PCI ...@@ -153,7 +141,7 @@ config PCI
config MAC config MAC
bool "Macintosh support" bool "Macintosh support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
help help
This option enables support for the Apple Macintosh series of This option enables support for the Apple Macintosh series of
computers (yes, there is experimental support now, at least for part computers (yes, there is experimental support now, at least for part
...@@ -174,14 +162,14 @@ config M68K_L2_CACHE ...@@ -174,14 +162,14 @@ config M68K_L2_CACHE
config APOLLO config APOLLO
bool "Apollo support" bool "Apollo support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
help help
Say Y here if you want to run Linux on an MC680x0-based Apollo Say Y here if you want to run Linux on an MC680x0-based Apollo
Domain workstation such as the DN3500. Domain workstation such as the DN3500.
config VME config VME
bool "VME (Motorola and BVM) support" bool "VME (Motorola and BVM) support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
help help
Say Y here if you want to build a kernel for a 680x0 based VME Say Y here if you want to build a kernel for a 680x0 based VME
board. Boards currently supported include Motorola boards MVME147, board. Boards currently supported include Motorola boards MVME147,
...@@ -218,7 +206,7 @@ config BVME6000 ...@@ -218,7 +206,7 @@ config BVME6000
config HP300 config HP300
bool "HP9000/300 and HP9000/400 support" bool "HP9000/300 and HP9000/400 support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
help help
This option enables support for the HP9000/300 and HP9000/400 series This option enables support for the HP9000/300 and HP9000/400 series
of workstations. Support for these machines is still somewhat of workstations. Support for these machines is still somewhat
...@@ -237,7 +225,7 @@ config DIO ...@@ -237,7 +225,7 @@ config DIO
config SUN3X config SUN3X
bool "Sun3x support" bool "Sun3x support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
select M68030 select M68030
help help
This option enables support for the Sun 3x series of workstations. This option enables support for the Sun 3x series of workstations.
...@@ -250,7 +238,7 @@ config SUN3X ...@@ -250,7 +238,7 @@ config SUN3X
config Q40 config Q40
bool "Q40/Q60 support" bool "Q40/Q60 support"
depends on !MMU_SUN3 select MMU_MOTOROLA if MMU
help help
The Q40 is a Motorola 68040-based successor to the Sinclair QL The Q40 is a Motorola 68040-based successor to the Sinclair QL
manufactured in Germany. There is an official Q40 home page at manufactured in Germany. There is an official Q40 home page at
...@@ -258,6 +246,19 @@ config Q40 ...@@ -258,6 +246,19 @@ config Q40
Q60. Select your CPU below. For 68LC060 don't forget to enable FPU Q60. Select your CPU below. For 68LC060 don't forget to enable FPU
emulation. emulation.
config SUN3
bool "Sun3 support"
depends on !MMU_MOTOROLA
select MMU_SUN3 if MMU
select M68020
help
This option enables support for the Sun 3 series of workstations
(3/50, 3/60, 3/1xx, 3/2xx systems). Enabling this option requires
that all other hardware types must be disabled, as Sun 3 kernels
are incompatible with all other m68k targets (including Sun 3x!).
If you don't want to compile a kernel exclusively for a Sun 3, say N.
comment "Processor type" comment "Processor type"
config M68020 config M68020
...@@ -295,10 +296,10 @@ config M68060 ...@@ -295,10 +296,10 @@ config M68060
config MMU_MOTOROLA config MMU_MOTOROLA
bool bool
depends on MMU && !MMU_SUN3 depends on MMU && !MMU_SUN3
default y
config MMU_SUN3 config MMU_SUN3
bool bool
depends on MMU && !MMU_MOTOROLA
config M68KFPU_EMU config M68KFPU_EMU
bool "Math emulation support (EXPERIMENTAL)" bool "Math emulation support (EXPERIMENTAL)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment