Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / bf609-ezkit.h

diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h
index f0ac86b8ab90e33d1950a645bd7c38af75bbc8e8..55127c58a89e715e019f7cf1ab412e4e01de2c67 100644 (file)
--- a/include/configs/bf609-ezkit.h
+++ b/include/configs/bf609-ezkit.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF609 EZ-Kit board
+ * U-Boot - Configuration file for BF609 EZ-Kit board
  */
 
 #ifndef __CONFIG_BF609_EZKIT_H__
@@ -13,7 +13,6 @@
 #define CONFIG_BFIN_CPU             bf609-0.0
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_PARA
 
-
 /* For ez-board version 1.0, else undef this */
 #define CONFIG_BFIN_BOARD_VERSION_1_0
 
@@ -69,24 +68,19 @@
  */
 #define ADI_CMDS_NETWORK
 #define CONFIG_NETCONSOLE
-#define CONFIG_NET_MULTI
 #define CONFIG_HOSTNAME                "bf609-ezkit"
-#define CONFIG_DESIGNWARE_ETH
+#define CONFIG_PHY_ADDR                1
 #define CONFIG_DW_PORTS                1
-#define CONFIG_DW_AUTONEG
 #define CONFIG_DW_ALTDESCRIPTOR
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_MII
 #define CONFIG_MII
 
 /* i2c Settings */
-#define CONFIG_BFIN_TWI_I2C
-#define CONFIG_HARD_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
 
 /*
  * Flash Settings
  */
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_JFFS2
 #define CONFIG_SYS_FLASH_CFI_WIDTH     2
 #define CONFIG_FLASH_CFI_DRIVER
@@ -103,7 +97,6 @@
 #define CONFIG_BFIN_SPI6XX
 #define CONFIG_ENV_SPI_MAX_HZ  25000000
 #define CONFIG_SF_DEFAULT_SPEED        25000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_ALL
 
 /*
@@ -134,21 +127,20 @@
  * SDH Settings
  */
 #define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
 #define CONFIG_BFIN_SDH
 
 /*
  * Misc Settings
  */
-#define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_UART_CONSOLE    0
 
-#define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_SOFTSWITCH
 
 #define CONFIG_SYS_MEMTEST_END (CONFIG_STACKBASE - 20*1024*1024 + 4)
 #define CONFIG_BFIN_SOFT_SWITCH
 
+#define CONFIG_ADI_GPIO2
+
 #if 0
 #define CONFIG_UART_MEM 1024
 #undef CONFIG_UART_CONSOLE
@@ -156,6 +148,8 @@
 #undef CONFIG_UART_CONSOLE_IS_JTAG
 #endif
 
+#define CONFIG_BOARD_SIZE_LIMIT $$((512 * 1024))
+
 /*
  * Run core 1 from L1 SRAM start address when init uboot on core 0
  */