6 files changed, 888 insertions, 916 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 9e8ee9d2b8ca..6c28582fb98f 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -21,6 +21,15 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
         bool
 
+config GENERIC_CLOCKEVENTS
+        bool
+
+config GENERIC_CMOS_UPDATE
+        def_bool !MMU
+
+config GENERIC_GPIO
+        bool
+
 config GENERIC_HWEIGHT
         bool
         default y
@@ -29,10 +38,16 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config GENERIC_IOMAP
+        def_bool MMU
+
 config TIME_LOW_RES
         bool
         default y
 
+config ARCH_USES_GETTIMEOFFSET
+        def_bool MMU
+
 config NO_IOPORT
         def_bool y
 
@@ -62,13 +77,31 @@ config MMU
           Select if you want MMU-based virtualised addressing space
           support by paged memory management. If unsure, say 'Y'.
 
-menu "Platform dependent setup"
+config MMU_MOTOROLA
+        bool
+
+config MMU_SUN3
+        bool
+        depends on MMU && !MMU_MOTOROLA
+
+menu "Platform setup"
+
+source arch/m68k/Kconfig.cpu
+
+source arch/m68k/Kconfig.machine
+
+source arch/m68k/Kconfig.bus
+
+endmenu
+
+menu "Kernel Features"
 
-if MMU
-source arch/m68k/Kconfig.mmu
+if COLDFIRE
+source "kernel/Kconfig.preempt"
 endif
-if !MMU
-source arch/m68k/Kconfig.nommu
+
+if !MMU || COLDFIRE
+source "kernel/time/Kconfig"
 endif
 
 source "mm/Kconfig"
@@ -85,9 +118,9 @@ if !MMU
 menu "Power management options"
 
 config PM
-        bool "Power Management support"
-        help
-          Support processor power management modes
+        bool "Power Management support"
+        help
+          Support processor power management modes
 
 endmenu
 endif
@@ -96,151 +129,7 @@ source "net/Kconfig"
 
 source "drivers/Kconfig"
 
-if MMU
-
-menu "Character devices"
-
-config ATARI_MFPSER
-        tristate "Atari MFP serial support"
-        depends on ATARI
-        ---help---
-          If you like to use the MFP serial ports ("Modem1", "Serial1") under
-          Linux, say Y. The driver equally supports all kinds of MFP serial
-          ports and automatically detects whether Serial1 is available.
-
-          To compile this driver as a module, choose M here.
-
-          Note for Falcon users: You also have an MFP port, it's just not
-          wired to the outside... But you could use the port under Linux.
-
-config ATARI_MIDI
-        tristate "Atari MIDI serial support"
-        depends on ATARI
-        help
-          If you want to use your Atari's MIDI port in Linux, say Y.
-
-          To compile this driver as a module, choose M here.
-
-config ATARI_DSP56K
-        tristate "Atari DSP56k support (EXPERIMENTAL)"
-        depends on ATARI && EXPERIMENTAL
-        help
-          If you want to be able to use the DSP56001 in Falcons, say Y. This
-          driver is still experimental, and if you don't know what it is, or
-          if you don't have this processor, just say N.
-
-          To compile this driver as a module, choose M here.
-
-config AMIGA_BUILTIN_SERIAL
-        tristate "Amiga builtin serial support"
-        depends on AMIGA
-        help
-          If you want to use your Amiga's built-in serial port in Linux,
-          answer Y.
-
-          To compile this driver as a module, choose M here.
-
-config MULTIFACE_III_TTY
-        tristate "Multiface Card III serial support"
-        depends on AMIGA
-        help
-          If you want to use a Multiface III card's serial port in Linux,
-          answer Y.
-
-          To compile this driver as a module, choose M here.
-
-config GVPIOEXT
-        tristate "GVP IO-Extender support"
-        depends on PARPORT=n && ZORRO
-        help
-          If you want to use a GVP IO-Extender serial card in Linux, say Y.
-          Otherwise, say N.
-
-config GVPIOEXT_LP
-        tristate "GVP IO-Extender parallel printer support"
-        depends on GVPIOEXT
-        help
-          Say Y to enable driving a printer from the parallel port on your
-          GVP IO-Extender card, N otherwise.
-
-config GVPIOEXT_PLIP
-        tristate "GVP IO-Extender PLIP support"
-        depends on GVPIOEXT
-        help
-          Say Y to enable doing IP over the parallel port on your GVP
-          IO-Extender card, N otherwise.
-
-config MAC_HID
-        bool
-        depends on INPUT_ADBHID
-        default y
-
-config HPDCA
-        tristate "HP DCA serial support"
-        depends on DIO && SERIAL_8250
-        help
-          If you want to use the internal "DCA" serial ports on an HP300
-          machine, say Y here.
-
-config HPAPCI
-        tristate "HP APCI serial support"
-        depends on HP300 && SERIAL_8250 && EXPERIMENTAL
-        help
-          If you want to use the internal "APCI" serial ports on an HP400
-          machine, say Y here.
-
-config MVME147_SCC
-        bool "SCC support for MVME147 serial ports"
-        depends on MVME147 && BROKEN
-        help
-          This is the driver for the serial ports on the Motorola MVME147
-          boards.  Everyone using one of these boards should say Y here.
-
-config MVME162_SCC
-        bool "SCC support for MVME162 serial ports"
-        depends on MVME16x && BROKEN
-        help
-          This is the driver for the serial ports on the Motorola MVME162 and
-          172 boards.  Everyone using one of these boards should say Y here.
-
-config BVME6000_SCC
-        bool "SCC support for BVME6000 serial ports"
-        depends on BVME6000 && BROKEN
-        help
-          This is the driver for the serial ports on the BVME4000 and BVME6000
-          boards from BVM Ltd.  Everyone using one of these boards should say
-          Y here.
-
-config DN_SERIAL
-        bool "Support for DN serial port (dummy)"
-        depends on APOLLO
-
-config SERIAL_CONSOLE
-        bool "Support for serial port console"
-        depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
-        ---help---
-          If you say Y here, it will be possible to use a serial port as the
-          system console (the system console is the device which receives all
-          kernel messages and warnings and which allows logins in single user
-          mode). This could be useful if some terminal or printer is connected
-          to that serial port.
-
-          Even if you say Y here, the currently visible virtual console
-          (/dev/tty0) will still be used as the system console by default, but
-          you can alter that using a kernel command line option such as
-          "console=ttyS1". (Try "man bootparam" or see the documentation of
-          your boot loader (lilo or loadlin) about how to pass options to the
-          kernel at boot time.)
-
-          If you don't have a VGA card installed and you say Y here, the
-          kernel will automatically use the first serial line, /dev/ttyS0, as
-          system console.
-
-          If unsure, say N.
-
-endmenu
-
-endif
+source "arch/m68k/Kconfig.devices"
 
 source "fs/Kconfig"
 
diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
new file mode 100644
index 000000000000..8294f0c1785e
--- /dev/null
+++ b/arch/m68k/Kconfig.bus
@@ -0,0 +1,55 @@
+if MMU
+
+comment "Bus Support"
+
+config NUBUS
+        bool
+        depends on MAC
+        default y
+
+config ZORRO
+        bool "Amiga Zorro (AutoConfig) bus support"
+        depends on AMIGA
+        help
+          This enables support for the Zorro bus in the Amiga. If you have
+          expansion cards in your Amiga that conform to the Amiga
+          AutoConfig(tm) specification, say Y, otherwise N. Note that even
+          expansion cards that do not fit in the Zorro slots but fit in e.g.
+          the CPU slot may fall in this category, so you have to say Y to let
+          Linux use these.
+
+config AMIGA_PCMCIA
+        bool "Amiga 1200/600 PCMCIA support (EXPERIMENTAL)"
+        depends on AMIGA && EXPERIMENTAL
+        help
+          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
+          600. If you intend to use pcmcia cards say Y; otherwise say N.
+
+config ISA
+        bool
+        depends on Q40 || AMIGA_PCMCIA
+        default y
+        help
+          Find out whether you have ISA slots on your motherboard.  ISA is the
+          name of a bus system, i.e. the way the CPU talks to the other stuff
+          inside your box.  Other bus systems are PCI, EISA, MicroChannel
+          (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
+          newer boards don't support it.  If you have ISA, say Y, otherwise N.
+
+config GENERIC_ISA_DMA
+        def_bool ISA
+
+source "drivers/pci/Kconfig"
+
+source "drivers/zorro/Kconfig"
+
+endif
+
+if !MMU
+
+config ISA_DMA_API
+        def_bool !M5272
+
+source "drivers/pcmcia/Kconfig"
+
+endif
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
new file mode 100644
index 000000000000..e632b2d12106
--- /dev/null
+++ b/arch/m68k/Kconfig.cpu
@@ -0,0 +1,429 @@
+comment "Processor Type"
+
+config M68000
+        bool
+        select CPU_HAS_NO_BITFIELDS
+        help
+          The Freescale (was Motorola) 68000 CPU is the first generation of
+          the well known M68K family of processors. The CPU core as well as
+          being available as a stand alone CPU was also used in many
+          System-On-Chip devices (eg 68328, 68302, etc). It does not contain
+          a paging MMU.
+
+config MCPU32
+        bool
+        select CPU_HAS_NO_BITFIELDS
+        help
+          The Freescale (was then Motorola) CPU32 is a CPU core that is
+          based on the 68020 processor. For the most part it is used in
+          System-On-Chip parts, and does not contain a paging MMU.
+
+config COLDFIRE
+        bool
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        select CPU_HAS_NO_BITFIELDS
+        help
+          The Freescale ColdFire family of processors is a modern derivitive
+          of the 68000 processor family. They are mainly targeted at embedded
+          applications, and are all System-On-Chip (SOC) devices, as opposed
+          to stand alone CPUs. They implement a subset of the original 68000
+          processor instruction set.
+
+config M68020
+        bool "68020 support"
+        depends on MMU
+        help
+          If you anticipate running this kernel on a computer with a MC68020
+          processor, say Y. Otherwise, say N. Note that the 68020 requires a
+          68851 MMU (Memory Management Unit) to run Linux/m68k, except on the
+          Sun 3, which provides its own version.
+
+config M68030
+        bool "68030 support"
+        depends on MMU && !MMU_SUN3
+        help
+          If you anticipate running this kernel on a computer with a MC68030
+          processor, say Y. Otherwise, say N. Note that a MC68EC030 will not
+          work, as it does not include an MMU (Memory Management Unit).
+
+config M68040
+        bool "68040 support"
+        depends on MMU && !MMU_SUN3
+        help
+          If you anticipate running this kernel on a computer with a MC68LC040
+          or MC68040 processor, say Y. Otherwise, say N. Note that an
+          MC68EC040 will not work, as it does not include an MMU (Memory
+          Management Unit).
+
+config M68060
+        bool "68060 support"
+        depends on MMU && !MMU_SUN3
+        help
+          If you anticipate running this kernel on a computer with a MC68060
+          processor, say Y. Otherwise, say N.
+
+config M68328
+        bool "MC68328"
+        depends on !MMU
+        select M68000
+        help
+          Motorola 68328 processor support.
+
+config M68EZ328
+        bool "MC68EZ328"
+        depends on !MMU
+        select M68000
+        help
+          Motorola 68EX328 processor support.
+
+config M68VZ328
+        bool "MC68VZ328"
+        depends on !MMU
+        select M68000
+        help
+          Motorola 68VZ328 processor support.
+
+config M68360
+        bool "MC68360"
+        depends on !MMU
+        select MCPU32
+        help
+          Motorola 68360 processor support.
+
+config M5206
+        bool "MCF5206"
+        depends on !MMU
+        select COLDFIRE
+        select COLDFIRE_SW_A7
+        select HAVE_MBAR
+        help
+          Motorola ColdFire 5206 processor support.
+
+config M5206e
+        bool "MCF5206e"
+        depends on !MMU
+        select COLDFIRE
+        select COLDFIRE_SW_A7
+        select HAVE_MBAR
+        help
+          Motorola ColdFire 5206e processor support.
+
+config M520x
+        bool "MCF520x"
+        depends on !MMU
+        select COLDFIRE
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CACHE_SPLIT
+        help
+           Freescale Coldfire 5207/5208 processor support.
+
+config M523x
+        bool "MCF523x"
+        depends on !MMU
+        select COLDFIRE
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CACHE_SPLIT
+        select HAVE_IPSBAR
+        help
+          Freescale Coldfire 5230/1/2/4/5 processor support
+
+config M5249
+        bool "MCF5249"
+        depends on !MMU
+        select COLDFIRE
+        select COLDFIRE_SW_A7
+        select HAVE_MBAR
+        help
+          Motorola ColdFire 5249 processor support.
+
+config M527x
+        bool
+
+config M5271
+        bool "MCF5271"
+        depends on !MMU
+        select COLDFIRE
+        select M527x
+        select HAVE_CACHE_SPLIT
+        select HAVE_IPSBAR
+        select GENERIC_CLOCKEVENTS
+        help
+          Freescale (Motorola) ColdFire 5270/5271 processor support.
+
+config M5272
+        bool "MCF5272"
+        depends on !MMU
+        select COLDFIRE
+        select COLDFIRE_SW_A7
+        select HAVE_MBAR
+        help
+          Motorola ColdFire 5272 processor support.
+
+config M5275
+        bool "MCF5275"
+        depends on !MMU
+        select COLDFIRE
+        select M527x
+        select HAVE_CACHE_SPLIT
+        select HAVE_IPSBAR
+        select GENERIC_CLOCKEVENTS
+        help
+          Freescale (Motorola) ColdFire 5274/5275 processor support.
+
+config M528x
+        bool "MCF528x"
+        depends on !MMU
+        select COLDFIRE
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CACHE_SPLIT
+        select HAVE_IPSBAR
+        help
+          Motorola ColdFire 5280/5282 processor support.
+
+config M5307
+        bool "MCF5307"
+        depends on !MMU
+        select COLDFIRE
+        select COLDFIRE_SW_A7
+        select HAVE_CACHE_CB
+        select HAVE_MBAR
+        help
+          Motorola ColdFire 5307 processor support.
+
+config M532x
+        bool "MCF532x"
+        depends on !MMU
+        select COLDFIRE
+        select HAVE_CACHE_CB
+        help
+          Freescale (Motorola) ColdFire 532x processor support.
+
+config M5407
+        bool "MCF5407"
+        depends on !MMU
+        select COLDFIRE
+        select COLDFIRE_SW_A7
+        select HAVE_CACHE_CB
+        select HAVE_MBAR
+        help
+          Motorola ColdFire 5407 processor support.
+
+config M54xx
+        bool
+
+config M547x
+        bool "MCF547x"
+        depends on !MMU
+        select COLDFIRE
+        select M54xx
+        select HAVE_CACHE_CB
+        select HAVE_MBAR
+        help
+          Freescale ColdFire 5470/5471/5472/5473/5474/5475 processor support.
+
+config M548x
+        bool "MCF548x"
+        depends on !MMU
+        select COLDFIRE
+        select M54xx
+        select HAVE_CACHE_CB
+        select HAVE_MBAR
+        help
+          Freescale ColdFire 5480/5481/5482/5483/5484/5485 processor support.
+
+
+comment "Processor Specific Options"
+
+config M68KFPU_EMU
+        bool "Math emulation support (EXPERIMENTAL)"
+        depends on MMU
+        depends on EXPERIMENTAL
+        help
+          At some point in the future, this will cause floating-point math
+          instructions to be emulated by the kernel on machines that lack a
+          floating-point math coprocessor.  Thrill-seekers and chronically
+          sleep-deprived psychotic hacker types can say Y now, everyone else
+          should probably wait a while.
+
+config M68KFPU_EMU_EXTRAPREC
+        bool "Math emulation extra precision"
+        depends on M68KFPU_EMU
+        help
+          The fpu uses normally a few bit more during calculations for
+          correct rounding, the emulator can (often) do the same but this
+          extra calculation can cost quite some time, so you can disable
+          it here. The emulator will then "only" calculate with a 64 bit
+          mantissa and round slightly incorrect, what is more than enough
+          for normal usage.
+
+config M68KFPU_EMU_ONLY
+        bool "Math emulation only kernel"
+        depends on M68KFPU_EMU
+        help
+          This option prevents any floating-point instructions from being
+          compiled into the kernel, thereby the kernel doesn't save any
+          floating point context anymore during task switches, so this
+          kernel will only be usable on machines without a floating-point
+          math coprocessor. This makes the kernel a bit faster as no tests
+          needs to be executed whether a floating-point instruction in the
+          kernel should be executed or not.
+
+config ADVANCED
+        bool "Advanced configuration options"
+        depends on MMU
+        ---help---
+          This gives you access to some advanced options for the CPU. The
+          defaults should be fine for most users, but these options may make
+          it possible for you to improve performance somewhat if you know what
+          you are doing.
+
+          Note that the answer to this question won't directly affect the
+          kernel: saying N will just cause the configurator to skip all
+          the questions about these options.
+
+          Most users should say N to this question.
+
+config RMW_INSNS
+        bool "Use read-modify-write instructions"
+        depends on ADVANCED
+        ---help---
+          This allows to use certain instructions that work with indivisible
+          read-modify-write bus cycles. While this is faster than the
+          workaround of disabling interrupts, it can conflict with DMA
+          ( = direct memory access) on many Amiga systems, and it is also said
+          to destabilize other machines. It is very likely that this will
+          cause serious problems on any Amiga or Atari Medusa if set. The only
+          configuration where it should work are 68030-based Ataris, where it
+          apparently improves performance. But you've been warned! Unless you
+          really know what you are doing, say N. Try Y only if you're quite
+          adventurous.
+
+config SINGLE_MEMORY_CHUNK
+        bool "Use one physical chunk of memory only" if ADVANCED && !SUN3
+        depends on MMU
+        default y if SUN3
+        select NEED_MULTIPLE_NODES
+        help
+          Ignore all but the first contiguous chunk of physical memory for VM
+          purposes.  This will save a few bytes kernel size and may speed up
+          some operations.  Say N if not sure.
+
+config ARCH_DISCONTIGMEM_ENABLE
+        def_bool MMU && !SINGLE_MEMORY_CHUNK
+
+config 060_WRITETHROUGH
+        bool "Use write-through caching for 68060 supervisor accesses"
+        depends on ADVANCED && M68060
+        ---help---
+          The 68060 generally uses copyback caching of recently accessed data.
+          Copyback caching means that memory writes will be held in an on-chip
+          cache and only written back to memory some time later.  Saying Y
+          here will force supervisor (kernel) accesses to use writethrough
+          caching.  Writethrough caching means that data is written to memory
+          straight away, so that cache and memory data always agree.
+          Writethrough caching is less efficient, but is needed for some
+          drivers on 68060 based systems where the 68060 bus snooping signal
+          is hardwired on.  The 53c710 SCSI driver is known to suffer from
+          this problem.
+
+config M68K_L2_CACHE
+        bool
+        depends on MAC
+        default y
+
+config NODES_SHIFT
+        int
+        default "3"
+        depends on !SINGLE_MEMORY_CHUNK
+
+config FPU
+        bool
+
+config COLDFIRE_SW_A7
+        bool
+
+config HAVE_CACHE_SPLIT
+        bool
+
+config HAVE_CACHE_CB
+        bool
+
+config HAVE_MBAR
+        bool
+
+config HAVE_IPSBAR
+        bool
+
+config CLOCK_SET
+        bool "Enable setting the CPU clock frequency"
+        depends on COLDFIRE
+        default n
+        help
+          On some CPU's you do not need to know what the core CPU clock
+          frequency is. On these you can disable clock setting. On some
+          traditional 68K parts, and on all ColdFire parts you need to set
+          the appropriate CPU clock frequency. On these devices many of the
+          onboard peripherals derive their timing from the master CPU clock
+          frequency.
+
+config CLOCK_FREQ
+        int "Set the core clock frequency"
+        default "66666666"
+        depends on CLOCK_SET
+        help
+          Define the CPU clock frequency in use. This is the core clock
+          frequency, it may or may not be the same as the external clock
+          crystal fitted to your board. Some processors have an internal
+          PLL and can have their frequency programmed at run time, others
+          use internal dividers. In general the kernel won't setup a PLL
+          if it is fitted (there are some exceptions). This value will be
+          specific to the exact CPU that you are using.
+
+config OLDMASK
+        bool "Old mask 5307 (1H55J) silicon"
+        depends on M5307
+        help
+          Build support for the older revision ColdFire 5307 silicon.
+          Specifically this is the 1H55J mask revision.
+
+if HAVE_CACHE_SPLIT
+choice
+        prompt "Split Cache Configuration"
+        default CACHE_I
+
+config CACHE_I
+        bool "Instruction"
+        help
+          Use all of the ColdFire CPU cache memory as an instruction cache.
+
+config CACHE_D
+        bool "Data"
+        help
+          Use all of the ColdFire CPU cache memory as a data cache.
+
+config CACHE_BOTH
+        bool "Both"
+        help
+          Split the ColdFire CPU cache, and use half as an instruction cache
+          and half as a data cache.
+endchoice
+endif
+
+if HAVE_CACHE_CB
+choice
+        prompt "Data cache mode"
+        default CACHE_WRITETHRU
+
+config CACHE_WRITETHRU
+        bool "Write-through"
+        help
+          The ColdFire CPU cache is set into Write-through mode.
+
+config CACHE_COPYBACK
+        bool "Copy-back"
+        help
+          The ColdFire CPU cache is set into Copy-back mode.
+endchoice
+endif
+
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
new file mode 100644
index 000000000000..d964dc4c2ce8
--- /dev/null
+++ b/arch/m68k/Kconfig.devices
@@ -0,0 +1,171 @@
+if MMU
+
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        depends on BROKEN && (Q40 || SUN3X)
+        default y
+
+menu "Platform devices"
+
+config HEARTBEAT
+        bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
+        default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300
+        help
+          Use the power-on LED on your machine as a load meter.  The exact
+          behavior is platform-dependent, but normally the flash frequency is
+          a hyperbolic function of the 5-minute load average.
+
+# We have a dedicated heartbeat LED. :-)
+config PROC_HARDWARE
+        bool "/proc/hardware support"
+        help
+          Say Y here to support the /proc/hardware file, which gives you
+          access to information about the machine you're running on,
+          including the model, CPU, MMU, clock speed, BogoMIPS rating,
+          and memory size.
+
+endmenu
+
+menu "Character devices"
+
+config ATARI_MFPSER
+        tristate "Atari MFP serial support"
+        depends on ATARI
+        ---help---
+          If you like to use the MFP serial ports ("Modem1", "Serial1") under
+          Linux, say Y. The driver equally supports all kinds of MFP serial
+          ports and automatically detects whether Serial1 is available.
+
+          To compile this driver as a module, choose M here.
+
+          Note for Falcon users: You also have an MFP port, it's just not
+          wired to the outside... But you could use the port under Linux.
+
+config ATARI_MIDI
+        tristate "Atari MIDI serial support"
+        depends on ATARI
+        help
+          If you want to use your Atari's MIDI port in Linux, say Y.
+
+          To compile this driver as a module, choose M here.
+
+config ATARI_DSP56K
+        tristate "Atari DSP56k support (EXPERIMENTAL)"
+        depends on ATARI && EXPERIMENTAL
+        help
+          If you want to be able to use the DSP56001 in Falcons, say Y. This
+          driver is still experimental, and if you don't know what it is, or
+          if you don't have this processor, just say N.
+
+          To compile this driver as a module, choose M here.
+
+config AMIGA_BUILTIN_SERIAL
+        tristate "Amiga builtin serial support"
+        depends on AMIGA
+        help
+          If you want to use your Amiga's built-in serial port in Linux,
+          answer Y.
+
+          To compile this driver as a module, choose M here.
+
+config MULTIFACE_III_TTY
+        tristate "Multiface Card III serial support"
+        depends on AMIGA
+        help
+          If you want to use a Multiface III card's serial port in Linux,
+          answer Y.
+
+          To compile this driver as a module, choose M here.
+
+config GVPIOEXT
+        tristate "GVP IO-Extender support"
+        depends on PARPORT=n && ZORRO
+        help
+          If you want to use a GVP IO-Extender serial card in Linux, say Y.
+          Otherwise, say N.
+
+config GVPIOEXT_LP
+        tristate "GVP IO-Extender parallel printer support"
+        depends on GVPIOEXT
+        help
+          Say Y to enable driving a printer from the parallel port on your
+          GVP IO-Extender card, N otherwise.
+
+config GVPIOEXT_PLIP
+        tristate "GVP IO-Extender PLIP support"
+        depends on GVPIOEXT
+        help
+          Say Y to enable doing IP over the parallel port on your GVP
+          IO-Extender card, N otherwise.
+
+config MAC_HID
+        bool
+        depends on INPUT_ADBHID
+        default y
+
+config HPDCA
+        tristate "HP DCA serial support"
+        depends on DIO && SERIAL_8250
+        help
+          If you want to use the internal "DCA" serial ports on an HP300
+          machine, say Y here.
+
+config HPAPCI
+        tristate "HP APCI serial support"
+        depends on HP300 && SERIAL_8250 && EXPERIMENTAL
+        help
+          If you want to use the internal "APCI" serial ports on an HP400
+          machine, say Y here.
+
+config MVME147_SCC
+        bool "SCC support for MVME147 serial ports"
+        depends on MVME147 && BROKEN
+        help
+          This is the driver for the serial ports on the Motorola MVME147
+          boards.  Everyone using one of these boards should say Y here.
+
+config MVME162_SCC
+        bool "SCC support for MVME162 serial ports"
+        depends on MVME16x && BROKEN
+        help
+          This is the driver for the serial ports on the Motorola MVME162 and
+          172 boards.  Everyone using one of these boards should say Y here.
+
+config BVME6000_SCC
+        bool "SCC support for BVME6000 serial ports"
+        depends on BVME6000 && BROKEN
+        help
+          This is the driver for the serial ports on the BVME4000 and BVME6000
+          boards from BVM Ltd.  Everyone using one of these boards should say
+          Y here.
+
+config DN_SERIAL
+        bool "Support for DN serial port (dummy)"
+        depends on APOLLO
+
+config SERIAL_CONSOLE
+        bool "Support for serial port console"
+        depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
+        ---help---
+          If you say Y here, it will be possible to use a serial port as the
+          system console (the system console is the device which receives all
+          kernel messages and warnings and which allows logins in single user
+          mode). This could be useful if some terminal or printer is connected
+          to that serial port.
+
+          Even if you say Y here, the currently visible virtual console
+          (/dev/tty0) will still be used as the system console by default, but
+          you can alter that using a kernel command line option such as
+          "console=ttyS1". (Try "man bootparam" or see the documentation of
+          your boot loader (lilo or loadlin) about how to pass options to the
+          kernel at boot time.)
+
+          If you don't have a VGA card installed and you say Y here, the
+          kernel will automatically use the first serial line, /dev/ttyS0, as
+          system console.
+
+          If unsure, say N.
+
+endmenu
+
+endif
diff --git a/arch/m68k/Kconfig.nommu b/arch/m68k/Kconfig.machine
index ff46383112a4..7d5c20b896c7 100644
--- a/arch/m68k/Kconfig.nommu
+++ b/arch/m68k/Kconfig.machine
@@ -1,297 +1,142 @@
-config FPU
-        bool
-        default n
-
-config GENERIC_GPIO
-        bool
-        default n
-
-config GENERIC_CMOS_UPDATE
-        bool
-        default y
-
-config GENERIC_CLOCKEVENTS
-        bool
-        default n
-
-config M68000
-        bool
-        select CPU_HAS_NO_BITFIELDS
-        help
-          The Freescale (was Motorola) 68000 CPU is the first generation of
-          the well known M68K family of processors. The CPU core as well as
-          being available as a stand alone CPU was also used in many
-          System-On-Chip devices (eg 68328, 68302, etc). It does not contain
-          a paging MMU.
-
-config MCPU32
-        bool
-        select CPU_HAS_NO_BITFIELDS
-        help
-          The Freescale (was then Motorola) CPU32 is a CPU core that is
-          based on the 68020 processor. For the most part it is used in
-          System-On-Chip parts, and does not contain a paging MMU.
-
-config COLDFIRE
-        bool
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        select CPU_HAS_NO_BITFIELDS
-        help
-          The Freescale ColdFire family of processors is a modern derivitive
-          of the 68000 processor family. They are mainly targeted at embedded
-          applications, and are all System-On-Chip (SOC) devices, as opposed
-          to stand alone CPUs. They implement a subset of the original 68000
-          processor instruction set.
-
-config COLDFIRE_SW_A7
-        bool
-        default n
-
-config HAVE_CACHE_SPLIT
-        bool
-
-config HAVE_CACHE_CB
-        bool
-
-config HAVE_MBAR
-        bool
-
-config HAVE_IPSBAR
-        bool
-
-choice
-        prompt "CPU"
-        default M68EZ328
-
-config M68328
-        bool "MC68328"
-        select M68000
-        help
-          Motorola 68328 processor support.
-
-config M68EZ328
-        bool "MC68EZ328"
-        select M68000
-        help
-          Motorola 68EX328 processor support.
-
-config M68VZ328
-        bool "MC68VZ328"
-        select M68000
-        help
-          Motorola 68VZ328 processor support.
-
-config M68360
-        bool "MC68360"
-        select MCPU32
-        help
-          Motorola 68360 processor support.
-
-config M5206
-        bool "MCF5206"
-        select COLDFIRE
-        select COLDFIRE_SW_A7
-        select HAVE_MBAR
-        help
-          Motorola ColdFire 5206 processor support.
+comment "Machine Types"
+
+config AMIGA
+        bool "Amiga support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        help
+          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
+          material available in <file:Documentation/m68k>; otherwise say N.
+
+config ATARI
+        bool "Atari support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        help
+          This option enables support for the 68000-based Atari series of
+          computers (including the TT, Falcon and Medusa). If you plan to use
+          this kernel on an Atari, say Y here and browse the material
+          available in <file:Documentation/m68k>; otherwise say N.
+
+config MAC
+        bool "Macintosh support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        help
+          This option enables support for the Apple Macintosh series of
+          computers (yes, there is experimental support now, at least for part
+          of the series).
+
+          Say N unless you're willing to code the remaining necessary support.
+          ;)
+
+config APOLLO
+        bool "Apollo support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        help
+          Say Y here if you want to run Linux on an MC680x0-based Apollo
+          Domain workstation such as the DN3500.
+
+config VME
+        bool "VME (Motorola and BVM) support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        help
+          Say Y here if you want to build a kernel for a 680x0 based VME
+          board.  Boards currently supported include Motorola boards MVME147,
+          MVME162, MVME166, MVME167, MVME172, and MVME177.  BVME4000 and
+          BVME6000 boards from BVM Ltd are also supported.
+
+config MVME147
+        bool "MVME147 support"
+        depends on MMU
+        depends on VME
+        help
+          Say Y to include support for early Motorola VME boards.  This will
+          build a kernel which can run on MVME147 single-board computers.  If
+          you select this option you will have to select the appropriate
+          drivers for SCSI, Ethernet and serial ports later on.
+
+config MVME16x
+        bool "MVME162, 166 and 167 support"
+        depends on MMU
+        depends on VME
+        help
+          Say Y to include support for Motorola VME boards.  This will build a
+          kernel which can run on MVME162, MVME166, MVME167, MVME172, and
+          MVME177 boards.  If you select this option you will have to select
+          the appropriate drivers for SCSI, Ethernet and serial ports later
+          on.
+
+config BVME6000
+        bool "BVME4000 and BVME6000 support"
+        depends on MMU
+        depends on VME
+        help
+          Say Y to include support for VME boards from BVM Ltd.  This will
+          build a kernel which can run on BVME4000 and BVME6000 boards.  If
+          you select this option you will have to select the appropriate
+          drivers for SCSI, Ethernet and serial ports later on.
+
+config HP300
+        bool "HP9000/300 and HP9000/400 support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        help
+          This option enables support for the HP9000/300 and HP9000/400 series
+          of workstations. Support for these machines is still somewhat
+          experimental. If you plan to try to use the kernel on such a machine
+          say Y here.
+          Everybody else says N.
+
+config SUN3X
+        bool "Sun3x support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        select M68030
+        help
+          This option enables support for the Sun 3x series of workstations.
+          Be warned that this support is very experimental.
+          Note that Sun 3x kernels are not compatible with Sun 3 hardware.
+          General Linux information on the Sun 3x series (now discontinued)
+          is at <http://www.angelfire.com/ca2/tech68k/sun3.html>.
+
+          If you don't want to compile a kernel for a Sun 3x, say N.
+
+config Q40
+        bool "Q40/Q60 support"
+        depends on MMU
+        select MMU_MOTOROLA if MMU
+        help
+          The Q40 is a Motorola 68040-based successor to the Sinclair QL
+          manufactured in Germany.  There is an official Q40 home page at
+          <http://www.q40.de/>.  This option enables support for the Q40 and
+          Q60. Select your CPU below.  For 68LC060 don't forget to enable FPU
+          emulation.
+
+config SUN3
+        bool "Sun3 support"
+        depends on MMU
+        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.
 
-config M5206e
-        bool "MCF5206e"
-        select COLDFIRE
-        select COLDFIRE_SW_A7
-        select HAVE_MBAR
-        help
-          Motorola ColdFire 5206e processor support.
-
-config M520x
-        bool "MCF520x"
-        select COLDFIRE
-        select GENERIC_CLOCKEVENTS
-        select HAVE_CACHE_SPLIT
-        help
-           Freescale Coldfire 5207/5208 processor support.
-
-config M523x
-        bool "MCF523x"
-        select COLDFIRE
-        select GENERIC_CLOCKEVENTS
-        select HAVE_CACHE_SPLIT
-        select HAVE_IPSBAR
-        help
-          Freescale Coldfire 5230/1/2/4/5 processor support
-
-config M5249
-        bool "MCF5249"
-        select COLDFIRE
-        select COLDFIRE_SW_A7
-        select HAVE_MBAR
-        help
-          Motorola ColdFire 5249 processor support.
-
-config M5271
-        bool "MCF5271"
-        select COLDFIRE
-        select HAVE_CACHE_SPLIT
-        select HAVE_IPSBAR
-        help
-          Freescale (Motorola) ColdFire 5270/5271 processor support.
-
-config M5272
-        bool "MCF5272"
-        select COLDFIRE
-        select COLDFIRE_SW_A7
-        select HAVE_MBAR
-        help
-          Motorola ColdFire 5272 processor support.
-
-config M5275
-        bool "MCF5275"
-        select COLDFIRE
-        select HAVE_CACHE_SPLIT
-        select HAVE_IPSBAR
-        help
-          Freescale (Motorola) ColdFire 5274/5275 processor support.
-
-config M528x
-        bool "MCF528x"
-        select COLDFIRE
-        select GENERIC_CLOCKEVENTS
-        select HAVE_CACHE_SPLIT
-        select HAVE_IPSBAR
-        help
-          Motorola ColdFire 5280/5282 processor support.
-
-config M5307
-        bool "MCF5307"
-        select COLDFIRE
-        select COLDFIRE_SW_A7
-        select HAVE_CACHE_CB
-        select HAVE_MBAR
-        help
-          Motorola ColdFire 5307 processor support.
-
-config M532x
-        bool "MCF532x"
-        select COLDFIRE
-        select HAVE_CACHE_CB
-        help
-          Freescale (Motorola) ColdFire 532x processor support.
-
-config M5407
-        bool "MCF5407"
-        select COLDFIRE
-        select COLDFIRE_SW_A7
-        select HAVE_CACHE_CB
-        select HAVE_MBAR
-        help
-          Motorola ColdFire 5407 processor support.
-
-config M547x
-        bool "MCF547x"
-        select COLDFIRE
-        select HAVE_CACHE_CB
-        select HAVE_MBAR
-        help
-          Freescale ColdFire 5470/5471/5472/5473/5474/5475 processor support.
-
-config M548x
-        bool "MCF548x"
-        select COLDFIRE
-        select HAVE_CACHE_CB
-        select HAVE_MBAR
-        help
-          Freescale ColdFire 5480/5481/5482/5483/5484/5485 processor support.
-
-endchoice
-
-config M527x
-        bool
-        depends on (M5271 || M5275)
-        select GENERIC_CLOCKEVENTS
-        default y
-
-config M54xx
+config PILOT
         bool
-        depends on (M548x || M547x)
-        default y
-
-config CLOCK_SET
-        bool "Enable setting the CPU clock frequency"
-        default n
-        help
-          On some CPU's you do not need to know what the core CPU clock
-          frequency is. On these you can disable clock setting. On some
-          traditional 68K parts, and on all ColdFire parts you need to set
-          the appropriate CPU clock frequency. On these devices many of the
-          onboard peripherals derive their timing from the master CPU clock
-          frequency.
-
-config CLOCK_FREQ
-        int "Set the core clock frequency"
-        default "66666666"
-        depends on CLOCK_SET
-        help
-          Define the CPU clock frequency in use. This is the core clock
-          frequency, it may or may not be the same as the external clock
-          crystal fitted to your board. Some processors have an internal
-          PLL and can have their frequency programmed at run time, others
-          use internal dividers. In general the kernel won't setup a PLL
-          if it is fitted (there are some exceptions). This value will be
-          specific to the exact CPU that you are using.
-
-config OLDMASK
-        bool "Old mask 5307 (1H55J) silicon"
-        depends on M5307
-        help
-          Build support for the older revision ColdFire 5307 silicon.
-          Specifically this is the 1H55J mask revision.
-
-if HAVE_CACHE_SPLIT
-choice
-        prompt "Split Cache Configuration"
-        default CACHE_I
-
-config CACHE_I
-        bool "Instruction"
-        help
-          Use all of the ColdFire CPU cache memory as an instruction cache.
-
-config CACHE_D
-        bool "Data"
-        help
-          Use all of the ColdFire CPU cache memory as a data cache.
-
-config CACHE_BOTH
-        bool "Both"
-        help
-          Split the ColdFire CPU cache, and use half as an instruction cache
-          and half as a data cache.
-endchoice
-endif
-
-if HAVE_CACHE_CB
-choice
-        prompt "Data cache mode"
-        default CACHE_WRITETHRU
-
-config CACHE_WRITETHRU
-        bool "Write-through"
-        help
-          The ColdFire CPU cache is set into Write-through mode.
-
-config CACHE_COPYBACK
-        bool "Copy-back"
-        help
-          The ColdFire CPU cache is set into Copy-back mode.
-endchoice
-endif
-
-comment "Platform"
 
 config PILOT3
         bool "Pilot 1000/5000, PalmPilot Personal/Pro, or PalmIII support"
         depends on M68328
+        select PILOT
         help
           Support for the Palm Pilot 1000/5000, Personal/Pro and PalmIII.
 
@@ -302,7 +147,7 @@ config XCOPILOT_BUGS
           Support the bugs of Xcopilot.
 
 config UC5272
-        bool 'Arcturus Networks uC5272 dimm board support'
+        bool "Arcturus Networks uC5272 dimm board support"
         depends on M5272
         help
           Support for the Arcturus Networks uC5272 dimm board.
@@ -356,15 +201,23 @@ config UCQUICC
         help
           Support for the Lineo uCquicc board.
 
+config ARNEWSH
+        bool
+
 config ARN5206
         bool "Arnewsh 5206 board support"
         depends on M5206
+        select ARNEWSH
         help
           Support for the Arnewsh 5206 board.
 
+config FREESCALE
+        bool
+
 config M5206eC3
         bool "Motorola M5206eC3 board support"
         depends on M5206e
+        select FREESCALE
         help
           Support for the Motorola M5206eC3 board.
 
@@ -377,75 +230,95 @@ config ELITE
 config M5208EVB
         bool "Freescale M5208EVB board support"
         depends on M520x
+        select FREESCALE
         help
           Support for the Freescale Coldfire M5208EVB.
 
 config M5235EVB
         bool "Freescale M5235EVB support"
         depends on M523x
+        select FREESCALE
         help
           Support for the Freescale M5235EVB board.
 
 config M5249C3
         bool "Motorola M5249C3 board support"
         depends on M5249
+        select FREESCALE
         help
           Support for the Motorola M5249C3 board.
 
 config M5271EVB
         bool "Freescale (Motorola) M5271EVB board support"
         depends on M5271
+        select FREESCALE
         help
           Support for the Freescale (Motorola) M5271EVB board.
 
 config M5275EVB
         bool "Freescale (Motorola) M5275EVB board support"
         depends on M5275
+        select FREESCALE
         help
           Support for the Freescale (Motorola) M5275EVB board.
 
 config M5272C3
         bool "Motorola M5272C3 board support"
         depends on M5272
+        select FREESCALE
         help
           Support for the Motorola M5272C3 board.
 
+config senTec
+        bool
+
 config COBRA5272
         bool "senTec COBRA5272 board support"
         depends on M5272
+        select senTec
         help
           Support for the senTec COBRA5272 board.
 
+config AVNET
+        bool
+
 config AVNET5282
         bool "Avnet 5282 board support"
         depends on M528x
+        select AVNET
         help
-          Support for the Avnet 5282 board.  
-          
+          Support for the Avnet 5282 board.
+
 config M5282EVB
         bool "Motorola M5282EVB board support"
         depends on M528x
+        select FREESCALE
         help
           Support for the Motorola M5282EVB board.
 
 config COBRA5282
         bool "senTec COBRA5282 board support"
         depends on M528x
+        select senTec
         help
           Support for the senTec COBRA5282 board.
-          
+
+config EMAC_INC
+        bool
+
 config SOM5282EM
         bool "EMAC.Inc SOM5282EM board support"
         depends on M528x
+        select EMAC_INC
         help
-          Support for the EMAC.Inc SOM5282EM module.  
-          
+          Support for the EMAC.Inc SOM5282EM module.
+
 config WILDFIRE
         bool "Intec Automation Inc. WildFire board support"
         depends on M528x
         help
           Support for the Intec Automation Inc. WildFire.
-          
+
 config WILDFIREMOD
         bool "Intec Automation Inc. WildFire module support"
         depends on M528x
@@ -455,12 +328,14 @@ config WILDFIREMOD
 config ARN5307
         bool "Arnewsh 5307 board support"
         depends on M5307
+        select ARNEWSH
         help
           Support for the Arnewsh 5307 board.
 
 config M5307C3
         bool "Motorola M5307C3 board support"
         depends on M5307
+        select FREESCALE
         help
           Support for the Motorola M5307C3 board.
 
@@ -473,6 +348,7 @@ config SECUREEDGEMP3
 config M5329EVB
         bool "Freescale (Motorola) M5329EVB board support"
         depends on M532x
+        select FREESCALE
         help
           Support for the Freescale (Motorola) M5329EVB board.
 
@@ -485,6 +361,7 @@ config COBRA5329
 config M5407C3
         bool "Motorola M5407C3 board support"
         depends on M5407
+        select FREESCALE
         help
           Support for the Motorola M5407C3 board.
 
@@ -494,21 +371,27 @@ config FIREBEE
         help
           Support for the FireBee ColdFire 5475 based board.
 
+config HW_FEITH
+        bool
+
 config CLEOPATRA
         bool "Feith CLEOPATRA board support"
         depends on (M5307 || M5407)
+        select HW_FEITH
         help
           Support for the Feith Cleopatra boards.
 
 config CANCam
         bool "Feith CANCam board support"
         depends on M5272
+        select HW_FEITH
         help
           Support for the Feith CANCam board.
 
 config SCALES
         bool "Feith SCALES board support"
         depends on M5272
+        select HW_FEITH
         help
           Support for the Feith SCALES board.
 
@@ -524,9 +407,13 @@ config SNAPGEAR
         help
           Special additional support for SnapGear router boards.
 
+config SNEHA
+        bool
+
 config CPU16B
         bool "Sneha Technologies S.L. Sarasvati board support"
         depends on M5272
+        select SNEHA
         help
           Support for the SNEHA CPU16B board.
 
@@ -536,12 +423,21 @@ config MOD5272
         help
           Support for the Netburner MOD-5272 board.
 
+config SAVANT
+        bool
+
 config SAVANTrosie1
         bool "Savant Rosie1 board support"
         depends on M523x
+        select SAVANT
         help
           Support for the Savant Rosie1 board.
 
+
+if !MMU || COLDFIRE
+
+comment "Machine Options"
+
 config ROMFS_FROM_ROM
         bool "ROMFS image not RAM resident"
         depends on (NETtel || SNAPGEAR)
@@ -549,51 +445,6 @@ config ROMFS_FROM_ROM
           The ROMfs filesystem will stay resident in the FLASH/ROM, not be
           moved into RAM.
 
-config PILOT
-        bool
-        default y
-        depends on (PILOT3 || PILOT5)
-
-config ARNEWSH
-        bool
-        default y
-        depends on (ARN5206 || ARN5307)
-
-config FREESCALE
-        bool
-        default y
-        depends on (M5206eC3 || M5208EVB || M5235EVB || M5249C3 || M5271EVB || M5272C3 || M5275EVB || M5282EVB || M5307C3 || M5329EVB || M5407C3)
-
-config HW_FEITH
-        bool
-        default y
-        depends on (CLEOPATRA || CANCam || SCALES)
-
-config senTec
-        bool
-        default y
-        depends on (COBRA5272 || COBRA5282)
-        
-config EMAC_INC
-        bool
-        default y
-        depends on (SOM5282EM)
-
-config SNEHA
-        bool
-        default y
-        depends on CPU16B
-
-config SAVANT
-        bool
-        default y
-        depends on SAVANTrosie1
-
-config AVNET
-        bool
-        default y
-        depends on (AVNET5282)
-
 config UBOOT
         bool "Support for U-Boot command line parameters"
         help
@@ -772,16 +623,4 @@ config ROMKERNEL
 
 endchoice
 
-if COLDFIRE
-source "kernel/Kconfig.preempt"
 endif
-
-source "kernel/time/Kconfig"
-
-config ISA_DMA_API
-        bool
-        depends on !M5272
-        default y
-
-source "drivers/pcmcia/Kconfig"
-
diff --git a/arch/m68k/Kconfig.mmu b/arch/m68k/Kconfig.mmu
deleted file mode 100644
index 13e20bbc4079..000000000000
--- a/arch/m68k/Kconfig.mmu
+++ /dev/null
@@ -1,411 +0,0 @@
-config GENERIC_IOMAP
-        bool
-        default y
-
-config ARCH_MAY_HAVE_PC_FDC
-        bool
-        depends on BROKEN && (Q40 || SUN3X)
-        default y
-
-config ARCH_USES_GETTIMEOFFSET
-        def_bool y
-
-config EISA
-        bool
-        ---help---
-          The Extended Industry Standard Architecture (EISA) bus was
-          developed as an open alternative to the IBM MicroChannel bus.
-
-          The EISA bus provided some of the features of the IBM MicroChannel
-          bus while maintaining backward compatibility with cards made for
-          the older ISA bus.  The EISA bus saw limited use between 1988 and
-          1995 when it was made obsolete by the PCI bus.
-
-          Say Y here if you are building a kernel for an EISA-based machine.
-
-          Otherwise, say N.
-
-config MCA
-        bool
-        help
-          MicroChannel Architecture is found in some IBM PS/2 machines and
-          laptops.  It is a bus system similar to PCI or ISA. See
-          <file:Documentation/mca.txt> (and especially the web page given
-          there) before attempting to build an MCA bus kernel.
-
-config PCMCIA
-        tristate
-        ---help---
-          Say Y here if you want to attach PCMCIA- or PC-cards to your Linux
-          computer.  These are credit-card size devices such as network cards,
-          modems or hard drives often used with laptops computers.  There are
-          actually two varieties of these cards: the older 16 bit PCMCIA cards
-          and the newer 32 bit CardBus cards.  If you want to use CardBus
-          cards, you need to say Y here and also to "CardBus support" below.
-
-          To use your PC-cards, you will need supporting software from David
-          Hinds' pcmcia-cs package (see the file <file:Documentation/Changes>
-          for location).  Please also read the PCMCIA-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as modules, choose M here: the
-          modules will be called pcmcia_core and ds.
-
-config AMIGA
-        bool "Amiga support"
-        select MMU_MOTOROLA if MMU
-        help
-          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
-          material available in <file:Documentation/m68k>; otherwise say N.
-
-config ATARI
-        bool "Atari support"
-        select MMU_MOTOROLA if MMU
-        help
-          This option enables support for the 68000-based Atari series of
-          computers (including the TT, Falcon and Medusa). If you plan to use
-          this kernel on an Atari, say Y here and browse the material
-          available in <file:Documentation/m68k>; otherwise say N.
-
-config MAC
-        bool "Macintosh support"
-        select MMU_MOTOROLA if MMU
-        help
-          This option enables support for the Apple Macintosh series of
-          computers (yes, there is experimental support now, at least for part
-          of the series).
-
-          Say N unless you're willing to code the remaining necessary support.
-          ;)
-
-config NUBUS
-        bool
-        depends on MAC
-        default y
-
-config M68K_L2_CACHE
-        bool
-        depends on MAC
-        default y
-
-config APOLLO
-        bool "Apollo support"
-        select MMU_MOTOROLA if MMU
-        help
-          Say Y here if you want to run Linux on an MC680x0-based Apollo
-          Domain workstation such as the DN3500.
-
-config VME
-        bool "VME (Motorola and BVM) support"
-        select MMU_MOTOROLA if MMU
-        help
-          Say Y here if you want to build a kernel for a 680x0 based VME
-          board.  Boards currently supported include Motorola boards MVME147,
-          MVME162, MVME166, MVME167, MVME172, and MVME177.  BVME4000 and
-          BVME6000 boards from BVM Ltd are also supported.
-
-config MVME147
-        bool "MVME147 support"
-        depends on VME
-        help
-          Say Y to include support for early Motorola VME boards.  This will
-          build a kernel which can run on MVME147 single-board computers.  If
-          you select this option you will have to select the appropriate
-          drivers for SCSI, Ethernet and serial ports later on.
-
-config MVME16x
-        bool "MVME162, 166 and 167 support"
-        depends on VME
-        help
-          Say Y to include support for Motorola VME boards.  This will build a
-          kernel which can run on MVME162, MVME166, MVME167, MVME172, and
-          MVME177 boards.  If you select this option you will have to select
-          the appropriate drivers for SCSI, Ethernet and serial ports later
-          on.
-
-config BVME6000
-        bool "BVME4000 and BVME6000 support"
-        depends on VME
-        help
-          Say Y to include support for VME boards from BVM Ltd.  This will
-          build a kernel which can run on BVME4000 and BVME6000 boards.  If
-          you select this option you will have to select the appropriate
-          drivers for SCSI, Ethernet and serial ports later on.
-
-config HP300
-        bool "HP9000/300 and HP9000/400 support"
-        select MMU_MOTOROLA if MMU
-        help
-          This option enables support for the HP9000/300 and HP9000/400 series
-          of workstations. Support for these machines is still somewhat
-          experimental. If you plan to try to use the kernel on such a machine
-          say Y here.
-          Everybody else says N.
-
-config DIO
-        bool "DIO bus support"
-        depends on HP300
-        default y
-        help
-          Say Y here to enable support for the "DIO" expansion bus used in
-          HP300 machines. If you are using such a system you almost certainly
-          want this.
-
-config SUN3X
-        bool "Sun3x support"
-        select MMU_MOTOROLA if MMU
-        select M68030
-        help
-          This option enables support for the Sun 3x series of workstations.
-          Be warned that this support is very experimental.
-          Note that Sun 3x kernels are not compatible with Sun 3 hardware.
-          General Linux information on the Sun 3x series (now discontinued)
-          is at <http://www.angelfire.com/ca2/tech68k/sun3.html>.
-
-          If you don't want to compile a kernel for a Sun 3x, say N.
-
-config Q40
-        bool "Q40/Q60 support"
-        select MMU_MOTOROLA if MMU
-        help
-          The Q40 is a Motorola 68040-based successor to the Sinclair QL
-          manufactured in Germany.  There is an official Q40 home page at
-          <http://www.q40.de/>.  This option enables support for the Q40 and
-          Q60. Select your CPU below.  For 68LC060 don't forget to enable FPU
-          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.
-
-config NATFEAT
-        bool "ARAnyM emulator support"
-        depends on ATARI
-        help
-          This option enables support for ARAnyM native features, such as
-          access to a disk image as /dev/hda.
-
-config NFBLOCK
-        tristate "NatFeat block device support"
-        depends on BLOCK && NATFEAT
-        help
-          Say Y to include support for the ARAnyM NatFeat block device
-          which allows direct access to the hard drives without using
-          the hardware emulation.
-
-config NFCON
-        tristate "NatFeat console driver"
-        depends on NATFEAT
-        help
-          Say Y to include support for the ARAnyM NatFeat console driver
-          which allows the console output to be redirected to the stderr
-          output of ARAnyM.
-
-config NFETH
-        tristate "NatFeat Ethernet support"
-        depends on NET_ETHERNET && NATFEAT
-        help
-          Say Y to include support for the ARAnyM NatFeat network device
-          which will emulate a regular ethernet device while presenting an
-          ethertap device to the host system.
-
-comment "Processor type"
-
-config M68020
-        bool "68020 support"
-        help
-          If you anticipate running this kernel on a computer with a MC68020
-          processor, say Y. Otherwise, say N. Note that the 68020 requires a
-          68851 MMU (Memory Management Unit) to run Linux/m68k, except on the
-          Sun 3, which provides its own version.
-
-config M68030
-        bool "68030 support"
-        depends on !MMU_SUN3
-        help
-          If you anticipate running this kernel on a computer with a MC68030
-          processor, say Y. Otherwise, say N. Note that a MC68EC030 will not
-          work, as it does not include an MMU (Memory Management Unit).
-
-config M68040
-        bool "68040 support"
-        depends on !MMU_SUN3
-        help
-          If you anticipate running this kernel on a computer with a MC68LC040
-          or MC68040 processor, say Y. Otherwise, say N. Note that an
-          MC68EC040 will not work, as it does not include an MMU (Memory
-          Management Unit).
-
-config M68060
-        bool "68060 support"
-        depends on !MMU_SUN3
-        help
-          If you anticipate running this kernel on a computer with a MC68060
-          processor, say Y. Otherwise, say N.
-
-config MMU_MOTOROLA
-        bool
-
-config MMU_SUN3
-        bool
-        depends on MMU && !MMU_MOTOROLA
-
-config M68KFPU_EMU
-        bool "Math emulation support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-        help
-          At some point in the future, this will cause floating-point math
-          instructions to be emulated by the kernel on machines that lack a
-          floating-point math coprocessor.  Thrill-seekers and chronically
-          sleep-deprived psychotic hacker types can say Y now, everyone else
-          should probably wait a while.
-
-config M68KFPU_EMU_EXTRAPREC
-        bool "Math emulation extra precision"
-        depends on M68KFPU_EMU
-        help
-          The fpu uses normally a few bit more during calculations for
-          correct rounding, the emulator can (often) do the same but this
-          extra calculation can cost quite some time, so you can disable
-          it here. The emulator will then "only" calculate with a 64 bit
-          mantissa and round slightly incorrect, what is more than enough
-          for normal usage.
-
-config M68KFPU_EMU_ONLY
-        bool "Math emulation only kernel"
-        depends on M68KFPU_EMU
-        help
-          This option prevents any floating-point instructions from being
-          compiled into the kernel, thereby the kernel doesn't save any
-          floating point context anymore during task switches, so this
-          kernel will only be usable on machines without a floating-point
-          math coprocessor. This makes the kernel a bit faster as no tests
-          needs to be executed whether a floating-point instruction in the
-          kernel should be executed or not.
-
-config ADVANCED
-        bool "Advanced configuration options"
-        ---help---
-          This gives you access to some advanced options for the CPU. The
-          defaults should be fine for most users, but these options may make
-          it possible for you to improve performance somewhat if you know what
-          you are doing.
-
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about these options.
-
-          Most users should say N to this question.
-
-config RMW_INSNS
-        bool "Use read-modify-write instructions"
-        depends on ADVANCED
-        ---help---
-          This allows to use certain instructions that work with indivisible
-          read-modify-write bus cycles. While this is faster than the
-          workaround of disabling interrupts, it can conflict with DMA
-          ( = direct memory access) on many Amiga systems, and it is also said
-          to destabilize other machines. It is very likely that this will
-          cause serious problems on any Amiga or Atari Medusa if set. The only
-          configuration where it should work are 68030-based Ataris, where it
-          apparently improves performance. But you've been warned! Unless you
-          really know what you are doing, say N. Try Y only if you're quite
-          adventurous.
-
-config SINGLE_MEMORY_CHUNK
-        bool "Use one physical chunk of memory only" if ADVANCED && !SUN3
-        default y if SUN3
-        select NEED_MULTIPLE_NODES
-        help
-          Ignore all but the first contiguous chunk of physical memory for VM
-          purposes.  This will save a few bytes kernel size and may speed up
-          some operations.  Say N if not sure.
-
-config 060_WRITETHROUGH
-        bool "Use write-through caching for 68060 supervisor accesses"
-        depends on ADVANCED && M68060
-        ---help---
-          The 68060 generally uses copyback caching of recently accessed data.
-          Copyback caching means that memory writes will be held in an on-chip
-          cache and only written back to memory some time later.  Saying Y
-          here will force supervisor (kernel) accesses to use writethrough
-          caching.  Writethrough caching means that data is written to memory
-          straight away, so that cache and memory data always agree.
-          Writethrough caching is less efficient, but is needed for some
-          drivers on 68060 based systems where the 68060 bus snooping signal
-          is hardwired on.  The 53c710 SCSI driver is known to suffer from
-          this problem.
-
-config ARCH_DISCONTIGMEM_ENABLE
-        def_bool !SINGLE_MEMORY_CHUNK
-
-config NODES_SHIFT
-        int
-        default "3"
-        depends on !SINGLE_MEMORY_CHUNK
-
-config ZORRO
-        bool "Amiga Zorro (AutoConfig) bus support"
-        depends on AMIGA
-        help
-          This enables support for the Zorro bus in the Amiga. If you have
-          expansion cards in your Amiga that conform to the Amiga
-          AutoConfig(tm) specification, say Y, otherwise N. Note that even
-          expansion cards that do not fit in the Zorro slots but fit in e.g.
-          the CPU slot may fall in this category, so you have to say Y to let
-          Linux use these.
-
-config AMIGA_PCMCIA
-        bool "Amiga 1200/600 PCMCIA support (EXPERIMENTAL)"
-        depends on AMIGA && EXPERIMENTAL
-        help
-          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
-          600. If you intend to use pcmcia cards say Y; otherwise say N.
-
-config HEARTBEAT
-        bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
-        default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300
-        help
-          Use the power-on LED on your machine as a load meter.  The exact
-          behavior is platform-dependent, but normally the flash frequency is
-          a hyperbolic function of the 5-minute load average.
-
-# We have a dedicated heartbeat LED. :-)
-config PROC_HARDWARE
-        bool "/proc/hardware support"
-        help
-          Say Y here to support the /proc/hardware file, which gives you
-          access to information about the machine you're running on,
-          including the model, CPU, MMU, clock speed, BogoMIPS rating,
-          and memory size.
-
-config ISA
-        bool
-        depends on Q40 || AMIGA_PCMCIA
-        default y
-        help
-          Find out whether you have ISA slots on your motherboard.  ISA is the
-          name of a bus system, i.e. the way the CPU talks to the other stuff
-          inside your box.  Other bus systems are PCI, EISA, MicroChannel
-          (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
-          newer boards don't support it.  If you have ISA, say Y, otherwise N.
-
-config GENERIC_ISA_DMA
-        bool
-        depends on Q40 || AMIGA_PCMCIA
-        default y
-
-source "drivers/pci/Kconfig"
-
-source "drivers/zorro/Kconfig"
-