flash: complete CONFIG_SYS_NO_FLASH move with renaming

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

diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index 3767502..ff8d432 100644 (file)
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for IP04 board (having BF532 processor)
+ * U-Boot - Configuration file for IP04 board (having BF532 processor)
  *
  * Copyright (c) 2006 Intratrade Ltd., Ivan Danov, idanov@gmail.com
  *
@@ -16,14 +16,12 @@
 
 #include <asm/config-pre.h>
 
-
 /*
  * Processor Settings
  */
 #define CONFIG_BFIN_CPU             bf532-0.5
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_NAND
 
-
 /*
  * Clock Settings
  *     CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@ -47,7 +45,6 @@
 /* Values can range from 1-15                                          */
 #define CONFIG_SCLK_DIV                        3
 
-
 /*
  * Memory Settings
  */
@@ -61,10 +58,9 @@
 #define CONFIG_EBIU_AMBCTL0_VAL        0xffc2ffc2
 #define CONFIG_EBIU_AMBCTL1_VAL        0xffc2ffc2
 
-#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN         (384 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)
 
-
 /*
  * Network Settings
  */
@@ -77,14 +73,10 @@
 #define DM9000_IO              CONFIG_DM9000_BASE
 #define DM9000_DATA            (CONFIG_DM9000_BASE + 2)
 
-#define CONFIG_LIB_RAND
-
 /*
  * Flash Settings
  */
 #define CONFIG_ENV_OVERWRITE   1
-#define CONFIG_SYS_NO_FLASH            /* we have only NAND */
-
 
 /*
  * SPI Settings
@@ -92,10 +84,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ  30000000
 #define CONFIG_SF_DEFAULT_SPEED        30000000
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_STMICRO
-#define CONFIG_SPI_FLASH_WINBOND
-
 
 /*
  * Env Storage Settings
@@ -106,7 +94,6 @@
 #define CONFIG_ENV_SIZE                0x10000
 #define CONFIG_ENV_SECT_SIZE   0x10000
 
-
 /*
  * NAND Settings
  */
@@ -126,21 +113,16 @@
 #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_BAUDRATE                115200
-#define CONFIG_MISC_INIT_R     /* needed for MAC address */
 #define CONFIG_UART_CONSOLE    0
-#define CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED
 
 #undef CONFIG_SHOW_BOOT_PROGRESS
 /* Enable this if bootretry required; currently it's disabled */
 #define CONFIG_BOOT_RETRY_TIME -1
 #define CONFIG_BOOTCOMMAND     "run nandboot"
-#define CONFIG_AUTOBOOT_PROMPT "autoboot in %d seconds\n"
-
 
 /*
  * Pull in common ADI header for remaining command/environment setup