Commit e5f8d1f0 authored by Greg Ungerer's avatar Greg Ungerer

m68k: move CONFIG_FPU set to per-CPU configuration

Move the selection of CONFIG_FPU to each CPU type configuration.

Currently for m68k we have a global set of CONFIG_FPU based on if CONFIG_MMU
is enabled or not. There is at least one CPU family we support (m5441x)
that has an MMU but has no FPU hardware. So we need to be able to have
CONFIG_MMU set and CONFIG_FPU not set.

Whether we build for a CPU with MMU enabled or not doesn't change the
fact that it has FPU hardware support. Our current non-MMU builds have
never had CONIG_FPU enabled - and in fact the kernel will not compile
with that set and CONFIG_MMU not set at the moment. It is easy enough
to fix this - but it would involve a structure change to sigcontext.h,
and that is a user space exported header (so ABI change).

This change makes no configuration visible changes, and all configs
end up with the same configuration settings as before.

This change based on changes and discussion from Yannick Gicquel
<yannick.gicquel@open.eurogiciel.org>.
Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
parent 36d050d9
...@@ -14,7 +14,6 @@ config M68K ...@@ -14,7 +14,6 @@ config M68K
select GENERIC_IOMAP select GENERIC_IOMAP
select GENERIC_STRNCPY_FROM_USER if MMU select GENERIC_STRNCPY_FROM_USER if MMU
select GENERIC_STRNLEN_USER if MMU select GENERIC_STRNLEN_USER if MMU
select FPU if MMU
select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IPC_PARSE_VERSION
select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE select ARCH_USES_GETTIMEOFFSET if MMU && !COLDFIRE
select HAVE_FUTEX_CMPXCHG if MMU && FUTEX select HAVE_FUTEX_CMPXCHG if MMU && FUTEX
......
...@@ -62,6 +62,7 @@ config MCPU32 ...@@ -62,6 +62,7 @@ config MCPU32
config M68020 config M68020
bool "68020 support" bool "68020 support"
depends on MMU depends on MMU
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68020 If you anticipate running this kernel on a computer with a MC68020
...@@ -72,6 +73,7 @@ config M68020 ...@@ -72,6 +73,7 @@ config M68020
config M68030 config M68030
bool "68030 support" bool "68030 support"
depends on MMU && !MMU_SUN3 depends on MMU && !MMU_SUN3
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68030 If you anticipate running this kernel on a computer with a MC68030
...@@ -81,6 +83,7 @@ config M68030 ...@@ -81,6 +83,7 @@ config M68030
config M68040 config M68040
bool "68040 support" bool "68040 support"
depends on MMU && !MMU_SUN3 depends on MMU && !MMU_SUN3
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68LC040 If you anticipate running this kernel on a computer with a MC68LC040
...@@ -91,6 +94,7 @@ config M68040 ...@@ -91,6 +94,7 @@ config M68040
config M68060 config M68060
bool "68060 support" bool "68060 support"
depends on MMU && !MMU_SUN3 depends on MMU && !MMU_SUN3
select FPU
select CPU_HAS_ADDRESS_SPACES select CPU_HAS_ADDRESS_SPACES
help help
If you anticipate running this kernel on a computer with a MC68060 If you anticipate running this kernel on a computer with a MC68060
...@@ -259,6 +263,7 @@ config M547x ...@@ -259,6 +263,7 @@ config M547x
bool "MCF547x" bool "MCF547x"
select M54xx select M54xx
select MMU_COLDFIRE if MMU select MMU_COLDFIRE if MMU
select FPU if MMU
select HAVE_CACHE_CB select HAVE_CACHE_CB
select HAVE_MBAR select HAVE_MBAR
select CPU_NO_EFFICIENT_FFS select CPU_NO_EFFICIENT_FFS
...@@ -268,6 +273,7 @@ config M547x ...@@ -268,6 +273,7 @@ config M547x
config M548x config M548x
bool "MCF548x" bool "MCF548x"
select MMU_COLDFIRE if MMU select MMU_COLDFIRE if MMU
select FPU if MMU
select M54xx select M54xx
select HAVE_CACHE_CB select HAVE_CACHE_CB
select HAVE_MBAR select HAVE_MBAR
......
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