flash: complete CONFIG_SYS_NO_FLASH move with renaming

[people/ms/u-boot.git] / include / configs / bf561-acvilon.h

diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h
index 03f3cec9dbb03ea6c051da7c2d9828563164eadf..3a4631e4fee673aaff361c1c74bd184962bbdbc1 100644 (file)
--- a/include/configs/bf561-acvilon.h
+++ b/include/configs/bf561-acvilon.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BF561 Acvilon System On Module
+ * U-Boot - Configuration file for BF561 Acvilon System On Module
  * For more information please go to http://www.niistt.ru/
  */
 
@@ -8,14 +8,12 @@
 
 #include <asm/config-pre.h>
 
-
 /*
  * Processor Settings
  */
 #define CONFIG_BFIN_CPU             bf561-0.5
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_BYPASS
 
-
 /*
  * Clock Settings
  *     CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@ -39,7 +37,6 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                                5
 
-
 /*
  * Memory Settings
  */
@@ -56,7 +53,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (384 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)
 
-
 /*
  * RTC Settings
  */
@@ -71,13 +67,10 @@
 #define CONFIG_SYS_DTT_LOW_TEMP -30
 #define CONFIG_SYS_DTT_HYSTERESIS       3*/
 
-
 /*
  * Network Settings
  */
 #define ADI_CMDS_NETWORK                       1
-#define CONFIG_CMD_NET
-#define CONFIG_CMD_MII
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DTT
 
@@ -92,13 +85,6 @@
 
 #define CONFIG_HOSTNAME                bf561-acvilon
 
-
-/*
- * Flash Settings
- */
-#define CONFIG_SYS_NO_FLASH
-
-
 /*
  * I2C Settings
  */
@@ -108,27 +94,21 @@
 #define CONFIG_PCA9564_I2C
 #define CONFIG_PCA9564_BASE                    0x2c000000
 
-
 /*
  * SPI Settings
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ          10000000
 #define CONFIG_SF_DEFAULT_SPEED                10000000
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_ATMEL
-
 
 /*
  * Env Storage Settings
  */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
-/* #define CONFIG_CMD_SAVEENV */
 #define CONFIG_ENV_SECT_SIZE           (1056 * 8)
 #define CONFIG_ENV_OFFSET                      ((16 + 256) * 1056)
 #define CONFIG_ENV_SIZE                                (8 * 1056)
 
-
 /*
  * NAND Settings
  * We're using NAND_PLAT driver to make things simplier
@@ -150,13 +130,11 @@
 #define NAND_PLAT_WRITE_ADR(chip, cmd) BFIN_NAND_WRITE(BFIN_NAND_ALE(chip), cmd)
 #define NAND_PLAT_GPIO_DEV_READY       GPIO_PF10
 
-
 /*
  * Misc Settings
  */
 #define CONFIG_UART_CONSOLE                    0
 #define CONFIG_BAUDRATE                                57600
-#define CONFIG_SYS_PROMPT "Acvilon> "
 
 /*
  * Pull in common ADI header for remaining command/environment setup