Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[karo-tx-uboot.git] / include / configs / bf518f-ezbrd.h

diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h
index 77b94a8baf9939e62d376285df7927d9d4a898ab..3db8171fb327b3f2c5170bf29910152b7b858da7 100644 (file)
--- a/include/configs/bf518f-ezbrd.h
+++ b/include/configs/bf518f-ezbrd.h
@@ -5,7 +5,7 @@
 #ifndef __CONFIG_BF518F_EZBRD_H__
 #define __CONFIG_BF518F_EZBRD_H__
 
-#include <asm/blackfin-config-pre.h>
+#include <asm/config-pre.h>
 
 
 /*
@@ -88,8 +88,9 @@
  */
 #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
 
 
@@ -132,6 +133,7 @@
 /*
  * Misc Settings
  */
+#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_MISC_INIT_R
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
@@ -142,6 +144,4 @@
  */
 #include <configs/bfin_adi_common.h>
 
-#include <asm/blackfin-config-post.h>
-
 #endif