Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze

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

diff --git a/include/configs/balloon3.h b/include/configs/balloon3.h
index cbf2853549b608fa3f55b7314ec16fe6d9fbc6bc..2f5a6609b8e84ae73a3d0aa9568d73121815f5bb 100644 (file)
--- a/include/configs/balloon3.h
+++ b/include/configs/balloon3.h
@@ -54,6 +54,7 @@
 #undef CONFIG_CMD_IMLS
 #define        CONFIG_CMD_USB
 #define        CONFIG_CMD_FPGA
+#define        CONFIG_CMD_FPGA_LOADMK
 #undef CONFIG_LCD
 
 /*
@@ -61,7 +62,6 @@
  */
 #ifdef CONFIG_CMD_KGDB
 #define        CONFIG_KGDB_BAUDRATE            230400  /* kgdb serial port speed */
-#define        CONFIG_KGDB_SER_INDEX           2       /* which serial port to use */
 #endif
 
 /*
@@ -73,7 +73,6 @@
 #ifdef CONFIG_SYS_HUSH_PARSER
 #define        CONFIG_SYS_PROMPT               "$ "
 #else
-#define        CONFIG_SYS_PROMPT               "=> "
 #endif
 #define        CONFIG_SYS_CBSIZE               256
 #define        CONFIG_SYS_PBSIZE               \
@@ -86,7 +85,6 @@
  * Clock Configuration
  */
 #undef CONFIG_SYS_CLKS_IN_HZ
-#define        CONFIG_SYS_HZ                   3250000         /* Timer @ 3250000 Hz */
 #define        CONFIG_SYS_CPUSPEED             0x290           /* 520MHz */
 
 /*
@@ -129,10 +127,10 @@
 
 #define        CONFIG_SYS_FLASH_USE_BUFFER_WRITE       1
 
-#define        CONFIG_SYS_FLASH_ERASE_TOUT     (2*CONFIG_SYS_HZ)
-#define        CONFIG_SYS_FLASH_WRITE_TOUT     (2*CONFIG_SYS_HZ)
-#define        CONFIG_SYS_FLASH_LOCK_TOUT      (2*CONFIG_SYS_HZ)
-#define        CONFIG_SYS_FLASH_UNLOCK_TOUT    (2*CONFIG_SYS_HZ)
+#define        CONFIG_SYS_FLASH_ERASE_TOUT     240000
+#define        CONFIG_SYS_FLASH_WRITE_TOUT     240000
+#define        CONFIG_SYS_FLASH_LOCK_TOUT      240000
+#define        CONFIG_SYS_FLASH_UNLOCK_TOUT    240000
 #define        CONFIG_SYS_FLASH_PROTECTION
 #define        CONFIG_ENV_IS_IN_FLASH
 #else