Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ee4896 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent bc0195aa

arch/m68k/Kconfig.cpu

+1 −13
Original line number Original line Diff line number Diff line
@@ -416,22 +416,10 @@ config HAVE_MBAR 
config HAVE_IPSBAR

config HAVE_IPSBAR

	bool

	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

config CLOCK_FREQ

	int "Set the core clock frequency"

	int "Set the core clock frequency"

	default "66666666"

	default "66666666"

	depends on CLOCK_SET

	depends on COLDFIRE

	help

	help

	  Define the CPU clock frequency in use. This is the core clock

	  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

	  frequency, it may or may not be the same as the external clock

arch/m68k/include/asm/coldfire.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
 *	in any case new boards come along from time to time that have yet

 *	in any case new boards come along from time to time that have yet

 *	another different clocking frequency.

 *	another different clocking frequency.

 */

 */

#ifdef CONFIG_CLOCK_SET

#ifdef CONFIG_CLOCK_FREQ

#define	MCF_CLK		CONFIG_CLOCK_FREQ

#define	MCF_CLK		CONFIG_CLOCK_FREQ

#else

#else

#error "Don't know what your ColdFire CPU clock frequency is??"

#error "Don't know what your ColdFire CPU clock frequency is??"