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

[platform/kernel/u-boot.git] / include / configs / bf525-ucr2.h

diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h
index fce6fc2..f7a45e9 100644 (file)
--- a/include/configs/bf525-ucr2.h
+++ b/include/configs/bf525-ucr2.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for bf525-ucr2 board
+ * U-Boot - Configuration file for bf525-ucr2 board
  * The board includes ADSP-BF525 rev. 0.2,
  * 32-bit SDRAM (SAMSUNG K4S561632H-UC75),
  * USB 2.0 High Speed OTG USB WIFI,
@@ -67,9 +67,7 @@
 
 /* support for serial flash */
 #define CONFIG_BFIN_SPI
-#define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_HZ   30000000
-#define CONFIG_SPI_FLASH_EON
 
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SPI_MAX_HZ  30000000
@@ -87,7 +85,6 @@
 #define CONFIG_BFIN_SERIAL
 #define CONFIG_BOOTARGS                "root=/dev/mtdblock0 rw"
 #define CONFIG_BOOTCOMMAND     "run sfboot"
-#define CONFIG_BOOTDELAY       5
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "sfboot=sf probe 1;" \
                "sf read 0x1000000 0x20000 0x300000;" \