Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[karo-tx-linux.git] / arch / m68k / Kconfig.cpu

diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 2b53254ad994abad15b6f8e3a047aaecbd6a0694..82068349a2bb266c5c16f2fdf10e68235c31b4da 100644 (file)
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -23,7 +23,7 @@ config M68KCLASSIC
 config COLDFIRE
        bool "Coldfire CPU family support"
        select GENERIC_GPIO
-       select ARCH_REQUIRE_GPIOLIB
+       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_HAVE_CUSTOM_GPIO_H
        select CPU_HAS_NO_BITFIELDS
        select CPU_HAS_NO_MULDIV64
@@ -37,6 +37,7 @@ config M68000
        bool
        select CPU_HAS_NO_BITFIELDS
        select CPU_HAS_NO_MULDIV64
+       select CPU_HAS_NO_UNALIGNED
        select GENERIC_CSUM
        help
          The Freescale (was Motorola) 68000 CPU is the first generation of
@@ -48,6 +49,7 @@ config M68000
 config MCPU32
        bool
        select CPU_HAS_NO_BITFIELDS
+       select CPU_HAS_NO_UNALIGNED
        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
@@ -167,6 +169,14 @@ config M5249
        help
          Motorola ColdFire 5249 processor support.
 
+config M525x
+       bool "MCF525x"
+       depends on !MMU
+       select COLDFIRE_SW_A7
+       select HAVE_MBAR
+       help
+         Freescale (Motorola) Coldfire 5251/5253 processor support.
+
 config M527x
        bool
 
@@ -253,6 +263,14 @@ config M548x
        help
          Freescale ColdFire 5480/5481/5482/5483/5484/5485 processor support.
 
+config M5441x
+       bool "MCF5441x"
+       depends on !MMU
+       select GENERIC_CLOCKEVENTS
+       select HAVE_CACHE_CB
+       help
+         Freescale Coldfire 54410/54415/54416/54417/54418 processor support.
+
 endif # COLDFIRE
 
 
@@ -360,6 +378,18 @@ config NODES_SHIFT
        default "3"
        depends on !SINGLE_MEMORY_CHUNK
 
+config CPU_HAS_NO_BITFIELDS
+       bool
+
+config CPU_HAS_NO_MULDIV64
+       bool
+
+config CPU_HAS_NO_UNALIGNED
+       bool
+
+config CPU_HAS_ADDRESS_SPACES
+       bool
+
 config FPU
        bool