flash: complete CONFIG_SYS_NO_FLASH move with renaming

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

diff --git a/include/configs/br4.h b/include/configs/br4.h
index 959f9a92f02adef4763ed32d4b79305aac898f31..64b379a979f92778ea12219a95e87e7f73692a4f 100644 (file)
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BR4 Appliance
+ * U-Boot - Configuration file for BR4 Appliance
  *
  * based on bf537-stamp.h
  * Copyright (c) Switchfin Org. <dpn@switchfin.org>
@@ -10,14 +10,12 @@
 
 #include <asm/config-pre.h>
 
-
 /*
  * Processor Settings
  */
 #define CONFIG_BFIN_CPU             bf537-0.3
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_SPI_MASTER
 
-
 /*
  * Clock Settings
  *     CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@ -41,7 +39,6 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        5
 
-
 /*
  * Memory Settings
  */
@@ -58,7 +55,6 @@
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (384 * 1024)
 
-
 /*
  * Network Settings
  */
@@ -70,20 +66,12 @@
 #define CONFIG_HOSTNAME                br4
 #define CONFIG_TFTP_BLOCKSIZE  4404
 
-/*
- * Flash Settings
- */
-#define CONFIG_SYS_NO_FLASH    /* We have no parallel FLASH */
-
-
 /*
  * SPI Settings
  */
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ  30000000
 #define CONFIG_SF_DEFAULT_SPEED        30000000
-#define CONFIG_SPI_FLASH_STMICRO
-
 
 /*
  * Env Storage Settings
@@ -94,14 +82,12 @@
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
-
 /*
  * I2C Settings
  */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_ADI
 
-
 /*
  * NAND Settings
  */
@@ -128,7 +114,6 @@
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
 #define CONFIG_BOOTCOMMAND     "run nandboot"
-#define CONFIG_BOOTDELAY       2
 #define CONFIG_LOADADDR                0x2000000
 
 /*