diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 76913f3..532e477 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -27,19 +27,26 @@
 
 endchoice
 
-menu "Select your board options"
+choice 
+	prompt "Select your board options"
+	depends on MACH_IPE337
+	default MACH_IPE337_V2
+
+config MACH_IPE337_V1
+	bool "revision 1 (25MHz)"
+	help
+	  Say Y here if you are using the first revision of the PII IPE337 board (Crystal running at 25Mhz)
 
 config MACH_IPE337_V2
-	bool "PII ipe337 revision 2 (40MHz)" if MACH_IPE337
-	default y
+	bool "revision 2 (40MHz)"
 	help
-	  Say Y here if you are using the second revision of the PII IPE337 board (running at 40Mhz)
+	  Say Y here if you are using the second revision of the PII IPE337 board (Crystal running at 40Mhz)
 
-endmenu
+endchoice
 
 choice
 	prompt "Boot Mode"
-	default BFIN_BOOT_BYPASS
+	default BFIN_BOOT_FLASH16
 
 config BFIN_BOOT_BYPASS
 	bool "bypass"
diff --git a/include/configs/ipe337.h b/include/configs/ipe337.h
index 2b9376a..7799345 100644
--- a/include/configs/ipe337.h
+++ b/include/configs/ipe337.h
@@ -14,10 +14,12 @@
  */
 
 /* CONFIG_CLKIN_HZ is any value in Hz                            */
-#ifdef CONFIG_MACH_IPE337_V2
+#if   defined(CONFIG_MACH_IPE337_V1)
+#define CONFIG_CLKIN_HZ          25000000
+#elif defined(CONFIG_MACH_IPE337_V2)
 #define CONFIG_CLKIN_HZ          40000000
 #else
-#define CONFIG_CLKIN_HZ          25000000
+#error "Unknown IPE337 revision"
 #endif
 
 /* CONFIG_CLKIN_HALF controls what is passed to PLL 0=CLKIN      */