summaryrefslogtreecommitdiffstats
path: root/arch/m68k/Kconfig.cpu
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2015-07-07 14:21:21 +1000
committerGreg Ungerer <gerg@uclinux.org>2015-07-13 09:34:39 +1000
commitd9ee489619744ee5ac246b8fb3dd65bb078d2f0a (patch)
tree25ae659f5a1d929a4948a2a6147b0fa3874f514c /arch/m68k/Kconfig.cpu
parentbc0195aad0daa2ad5b0d76cce22b167bc3435590 (diff)
downloadtalos-op-linux-d9ee489619744ee5ac246b8fb3dd65bb078d2f0a.tar.gz
talos-op-linux-d9ee489619744ee5ac246b8fb3dd65bb078d2f0a.zip
m68knommu: force setting of CONFIG_CLOCK_FREQ for ColdFire
It is possible to disable the clock selection at configuration time, but for ColdFire targets we always expect a clock frequency to be selected. This results in the following compile time error: CC arch/m68k/kernel/asm-offsets.s In file included from ./arch/m68k/include/asm/timex.h:14:0, from include/linux/timex.h:65, from include/linux/sched.h:19, from arch/m68k/kernel/asm-offsets.c:14: ./arch/m68k/include/asm/coldfire.h:25:2: error: #error "Don't know what your ColdFire CPU clock frequency is??" Remove CONFIG_CLOCK_SELECT completely and always enable CONFIG_CLOCK_FREQ for ColdFire. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/Kconfig.cpu')
-rw-r--r--arch/m68k/Kconfig.cpu14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index 33013dfcd3e1..7da594994765 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -416,22 +416,10 @@ config HAVE_MBAR
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
+ depends on COLDFIRE
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
OpenPOWER on IntegriCloud