diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index bc7ac5d14a8912591f9fd980af3de89335d8f3d5..3db8171fb327b3f2c5170bf29910152b7b858da7 100644
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -88,7 +88,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 #define CONFIG_SPI_FLASH_STMICRO
diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index db68a7b1aa01aefb32946eaeda1f9a104dc9b39b..97853af2d05c13098bcf47e291747df3a099af4a 100644
--- a/include/configs/bf526-ezbrd.h
+++ b/include/configs/bf526-ezbrd.h
@@ -106,7 +106,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_SST
 
diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h
index f481c791433fc7fd005a06582ece97a5390613f1..0d0235478b23e248f28d3cce71d07c1aca06defa 100644
--- a/include/configs/bf527-ezkit.h
+++ b/include/configs/bf527-ezkit.h
@@ -105,7 +105,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 9b22f2d049a14c2521ed768b4ef873581b8a1b94..c03561cef14a8edc84ed6f932c3832ec35799974 100644
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -89,7 +89,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_SPANSION
diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h
index b01197b5933bc8d076dc82a3da46c00d0eb00d38..23c2d33bc0be53186fa68b152112563f68d861ee 100644
--- a/include/configs/bf537-minotaur.h
+++ b/include/configs/bf537-minotaur.h
@@ -104,7 +104,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 284c7fc604e8fa20ebf8925a9ca76fa4df6cfb04..0f908efff203723ebda1a15fe793633f23a24c5f 100644
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -85,7 +85,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index c1bff3ee2e95aeb97e1ab45825a1d7f16e1e6db8..727b7e70e64b9fe4982c05eb1049c1d51828cfa0 100644
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -104,7 +104,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 8e068445b4deff55022e1885b08e3d137618d27d..0a86e83fbf45aeee82bb327315206659db309113 100644
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -87,7 +87,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_SPANSION
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 91622e37a6ccc23784900fd2bcf33d3b4a4b8b10..535687fdbf0107053fa247de8bf7db19e32a798e 100644
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -83,7 +83,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ATMEL
 #define CONFIG_SPI_FLASH_SPANSION
diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h
index fa90f91d54d819d1f3c91017a4722453173e4cac..dbcd2afb0d26584e699753ae23efca130b371e29 100644
--- a/include/configs/bf548-ezkit.h
+++ b/include/configs/bf548-ezkit.h
@@ -93,7 +93,7 @@
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ	30000000
-#define CONFIG_SF_DEFAULT_HZ	30000000
+#define CONFIG_SF_DEFAULT_SPEED	30000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h
index 9cbc17ac10af743d794a426700e6f9da111bde2c..1e4c716139a00be920bc1cbed98bd7574d5770c1 100644
--- a/include/configs/blackstamp.h
+++ b/include/configs/blackstamp.h
@@ -247,7 +247,7 @@
 #define CONFIG_BFIN_SPI
 /* For the M25P64 SCK Should be Kept < 20Mhz */
 #define CONFIG_ENV_SPI_MAX_HZ	20000000
-#define CONFIG_SF_DEFAULT_HZ	20000000
+#define CONFIG_SF_DEFAULT_SPEED	20000000
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO