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

[people/ms/u-boot.git] / include / configs / bf537-srv1.h

diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h
index fc4f50bc2df9123f8ed839cdae956b5f2ae23e13..6ad5682a19e76ea34c7f3a571c51aa1594d2f4ef 100644 (file)
--- a/include/configs/bf537-srv1.h
+++ b/include/configs/bf537-srv1.h
@@ -20,14 +20,12 @@
 
 #include <asm/config-pre.h>
 
-
 /*
  * Processor Settings
  */
 #define CONFIG_BFIN_CPU             bf537-0.2
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_SPI_MASTER
 
-
 /*
  * Clock Settings
  *     CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@ -51,7 +49,6 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        5
 
-
 /*
  * Memory Settings
  */
@@ -68,7 +65,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (384 << 10)
 
-
 /*
  * Network Settings
  */
@@ -93,7 +89,6 @@
 /* We don't have a parallel flash chip there */
 #define CONFIG_SYS_NO_FLASH
 
-
 /*
  * SPI Settings
  */
@@ -101,7 +96,6 @@
 #define CONFIG_ENV_SPI_MAX_HZ  30000000
 #define CONFIG_SF_DEFAULT_SPEED        30000000
 
-
 /*
  * Env Storage Settings
  */
@@ -111,7 +105,6 @@
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
-
 /*
  * I2C settings
  */
@@ -120,7 +113,6 @@
 #define CONFIG_SYS_I2C_SPEED           50000
 #define CONFIG_SYS_I2C_SLAVE           0
 
-
 /*
  * Misc Settings
  */
@@ -137,17 +129,7 @@
 #define CONFIG_BOOT_RETRY_TIME -1
 #define CONFIG_LOADS_ECHO              1
 
-#if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_UART)
-# define CONFIG_BOOTDELAY      -1
-#else
-# define CONFIG_BOOTDELAY      5
-#endif
-
-#ifdef CONFIG_BFIN_MAC
-#endif
-
 #define CONFIG_CMD_BOOTLDR
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_DATE
 
 #define CONFIG_BOOTCOMMAND     "run flashboot"