--- ecl-uclinux-2.4.x/include/asm-m68knommu/coldfire.h	Mon Feb 25 16:01:35 2002
+++ uclinux-2.4.x/include/asm-m68knommu/coldfire.h	Thu Feb 28 11:12:15 2002
@@ -23,32 +23,62 @@
 /*
  *	Define master clock frequency.
  */
-#if defined(CONFIG_M5204)
-# define	MCF_CLK		25000000
+#if defined(CONFIG_CLOCK_16MHz)
+#define	MCF_CLK		16000000
+#elif defined(CONFIG_CLOCK_20MHz)
+#define	MCF_CLK		20000000
+#elif defined(CONFIG_CLOCK_25MHz)
+#define	MCF_CLK		25000000
+#elif defined(CONFIG_CLOCK_33MHz)
+#define	MCF_CLK		33000000
+#elif defined(CONFIG_CLOCK_40MHz)
+#define	MCF_CLK		40000000
+#elif defined(CONFIG_CLOCK_45MHz)
+#define	MCF_CLK		45000000
+#elif defined(CONFIG_CLOCK_50MHz)
+#define	MCF_CLK		50000000
+#elif defined(CONFIG_CLOCK_54MHz)
+#define	MCF_CLK		54000000
+#elif defined(CONFIG_CLOCK_60MHz)
+#define	MCF_CLK		60000000
+#elif defined(CONFIG_CLOCK_66MHz)
+#define	MCF_CLK		66000000
+#elif defined(CONFIG_CLOCK_AUTO)
+/*
+ * this is ugly, but is the only way to "autodetect" clock frequency.
+ * we assume the lowest frequency
+ */
+#if defined(CONFIG_M68000)
+#define MCF_CLK         16000000
+#elif defined(CONFIG_M68EN302)
+#define MCF_CLK         16000000
+#elif defined(CONFIG_M68328)
+#define MCF_CLK         16000000
+#elif defined(CONFIG_M68EZ328)
+#define MCF_CLK         20000000
+#elif defined(CONFIG_M68VZ328)
+#define MCF_CLK         33000000
+#elif defined(CONFIG_M68332)
+#define MCF_CLK         16000000
+#elif defined(CONFIG_M68360)
+#define MCF_CLK         25000000
+#elif defined(CONFIG_M5204)
+#define MCF_CLK         16000000
 #elif defined(CONFIG_M5206)
-# define	MCF_CLK		25000000
+#define MCF_CLK         16000000
 #elif defined(CONFIG_M5206e)
-# if defined(CONFIG_NETtel)
-#  define	MCF_CLK		40000000
-# elif defined(CONFIG_CFV240)
-#  define MCF_CLK		40000000
-# else
-#  define	MCF_CLK		54000000
-# endif
+#define MCF_CLK         45000000 
 #elif defined(CONFIG_M5272)
-# if defined(CONFIG_CLOCK_45MHz)
-#  define	MCF_CLK		45000000
-# else
-#  define	MCF_CLK		66000000
-# endif
+#define MCF_CLK         66000000
 #elif defined(CONFIG_M5307)
-# define	MCF_CLK		45000000
+#define MCF_CLK         66000000
 #elif defined(CONFIG_M5407)
-# if defined(CONFIG_CLEOPATRA)
-# define	MCF_CLK		40000000
-# else
-# define	MCF_CLK		50000000
-# endif
+#define MCF_CLK         162000000
+#else /* Ups, what kind of processor??? */
+#error "What is your processor babe?"
+#endif /* CONFIG_M68000 */
+#else /* Very weird if we get here! */
+#error "Don't know what your ColdFire CPU clock frequency is??"
 #endif
 
 /****************************************************************************/