--- ecl-uclinux-2.4.x/arch/m68knommu/config.in	Thu Feb 14 16:21:21 2002
+++ uclinux-2.4.x/arch/m68knommu/config.in	Thu Feb 28 10:39:28 2002
@@ -53,6 +53,19 @@
          MCF5307	CONFIG_M5307 \
 	 MCF5407	CONFIG_M5407" M68EZ328
 
+choice 'CPU CLOCK Frequency' \
+	" AUTO	CONFIG_CLOCK_AUTO \
+	 16MHz	CONFIG_CLOCK_16MHz \
+	 20MHz	CONFIG_CLOCK_20MHz \
+	 25MHz	CONFIG_CLOCK_25MHz \
+	 33MHz	CONFIG_CLOCK_33MHz \
+	 40MHz	CONFIG_CLOCK_40MHz \
+	 45MHz	CONFIG_CLOCK_45MHz \
+	 50MHz	CONFIG_CLOCK_50MHz \
+	 54MHz	CONFIG_CLOCK_54MHz \
+	 60MHz	CONFIG_CLOCK_60MHz \
+	 66MHz	CONFIG_CLOCK_66MHz" AUTO
+
 comment 'Platform'
 
 if [ "$CONFIG_M68328" = "y" ]; then
@@ -84,12 +97,7 @@
 fi
 
 if [ "$CONFIG_M68EN302" = "y" ]; then
-	choice 'CLOCK' \
-		"CLOCK_20MHz CONFIG_CLOCK_20MHz \
-		 CLOCK_25MHz CONFIG_CLOCK_25MHz" CLOCK_25MHz
-
 	bool 'Aplio/Pro or Aplio/Entrecote support' CONFIG_APLIO
-
 	if [ "$CONFIG_APLIO" = "y" ]; then
 		bool 'Aplio Pro' CONFIG_APLIO_PRO
 		bool 'Aplio Entrecote' CONFIG_APLIO_ENTRECOTE
@@ -109,49 +117,46 @@
 
 if [ "$CONFIG_M5206" = "y" ]; then
 	define_bool CONFIG_COLDFIRE y
-	bool 'Arnewsh 5206 eval board support' CONFIG_ARNEWSH
+	bool 'Arnewsh 5206 board support' CONFIG_ARNEWSH
 fi
 
 if [ "$CONFIG_M5206e" = "y" ]; then
 	define_bool CONFIG_COLDFIRE y
-	bool 'Cadre-III support' CONFIG_CADRE3
-	bool 'eLITE-5206e support' CONFIG_ELITE
+	bool 'Motorola M5206eC3 (Cadre-III) board support' CONFIG_CADRE3
+	bool 'Motorola eLITE-5206e board support' CONFIG_ELITE
 	if [ "$CONFIG_ELITE" = "y" ]; then
 		bool '    SRAM only eLITE-5206e support' CONFIG_SMALL
 	fi
-	bool 'Lineo (formerly Moreton Bay) NETtel 1500 support' CONFIG_NETtel
-	bool 'Telos Omnia ToolVox support' CONFIG_TELOS
-        bool 'Netburner CFV2-40  support' CONFIG_CFV240
+	bool 'SnapGear/SecureEdge/NETtel board support' CONFIG_NETtel
+	bool 'Telos Omnia ToolVox board support' CONFIG_TELOS
+        bool 'Netburner CFV2-40 board support' CONFIG_CFV240
 fi
 
 if [ "$CONFIG_M5272" = "y" ]; then
 	define_bool CONFIG_COLDFIRE y
-	bool 'Motorola M5272C3 eval board support' CONFIG_MOTOROLA
-	bool 'NETtel/SecureEdge support' CONFIG_NETtel
+	bool 'Motorola M5272C3 board support' CONFIG_MOTOROLA
+	bool 'SnapGear/SecureEdge/NETtel board support' CONFIG_NETtel
 	dep_bool '  Reset switch support' CONFIG_RESETSWITCH $CONFIG_NETtel
-	bool 'Marconi/NAP support' CONFIG_MARCONINAP
+	bool 'Marconi/NAP board support' CONFIG_MARCONINAP
 	bool 'ROMFS image not RAM resident' CONFIG_ROMFS_FROM_ROM
-	choice 'CLOCK' \
-		"CLOCK_45MHz CONFIG_CLOCK_45MHz \
-		 CLOCK_66MHz CONFIG_CLOCK_66MHz" CLOCK_66MHz
 fi
 
 if [ "$CONFIG_M5307" = "y" ]; then
 	define_bool CONFIG_COLDFIRE y
-	bool 'Arnewsh 5307 eval board support' CONFIG_ARNEWSH
-	bool 'Lineo NETtel support' CONFIG_NETtel
-	bool 'Lineo eLIA board support' CONFIG_eLIA
-	bool 'Lineo DISKtel support' CONFIG_DISKtel
-	bool 'Lineo MP3 support' CONFIG_LINEOMP3
-	bool 'SnapGear support' CONFIG_SNAPGEAR
-	bool 'Cadre-III eval board support' CONFIG_CADRE3
-	bool 'Old mask (broken watchdog timer)' CONFIG_OLDMASK
+	bool 'Arnewsh 5307 board support' CONFIG_ARNEWSH
+	bool 'SecureEdge/NETtel board support' CONFIG_NETtel
+	bool 'eLIA board support' CONFIG_eLIA
+	bool 'DISKtel board support' CONFIG_DISKtel
+	bool 'SnapGear router board support' CONFIG_SNAPGEAR
+	bool 'SecureEdge MP3 board support' CONFIG_SECUREEDGEMP3
+	bool 'Motorola M5307C3 (Cadre-III) board support' CONFIG_CADRE3
 	bool 'Feith CLEOPATRA board support' CONFIG_CLEOPATRA
+	bool 'Old mask (broken watchdog timer)' CONFIG_OLDMASK
 fi
 
 if [ "$CONFIG_M5407" = "y" ]; then
 	define_bool CONFIG_COLDFIRE y
-	bool 'Motorola 5407 eval board support' CONFIG_MOTOROLA
+	bool 'Motorola M5407C3 board support' CONFIG_MOTOROLA
 	bool 'Feith CLEOPATRA board support' CONFIG_CLEOPATRA
 fi