Merge branch 'next' of git://git.denx.de/u-boot-coldfire into next

[oweals/u-boot.git] / include / configs / bf526-ezbrd.h

diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h
index db68a7b1aa01aefb32946eaeda1f9a104dc9b39b..711fa27b4464dee4a5eeee8357ffd304e4e5fe53 100644 (file)
--- 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
 
@@ -126,7 +126,7 @@
 #define CONFIG_ENV_SIZE                0x2000
 #define CONFIG_ENV_SECT_SIZE   0x2000
 #endif
-#define ENV_IS_EMBEDDED_CUSTOM
+#define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
 
 /*