integrator: consolidate flash info

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

diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h
index 608719a7eacb7725a3cfac08521397a8b7d6acc0..7c1ef2483ea24da88bf9450314102efe80f894fb 100644 (file)
--- a/include/configs/integratorcp.h
+++ b/include/configs/integratorcp.h
@@ -55,28 +55,10 @@
  */
 #define CONFIG_SYS_PROMPT      "Integrator-CP # "      /* Monitor Command Prompt */
 
-/*
- * FLASH and environment organization
- * Top varies according to amount fitted
- * Reserve top 4 blocks of flash
- * - ARM Boot Monitor
- * - Unused
- * - SIB block
- * - U-Boot environment
- *
- * Base is always 0x24000000
- */
-#define CONFIG_SYS_FLASH_BASE          0x24000000
-#define CONFIG_SYS_FLASH_CFI           1
-#define CONFIG_FLASH_CFI_DRIVER                1
-#define CONFIG_SYS_MAX_FLASH_SECT      64
-#define CONFIG_SYS_MAX_FLASH_BANKS     1               /* max number of memory banks */
 #define PHYS_FLASH_SIZE                        0x01000000      /* 16MB */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (2*CONFIG_SYS_HZ)       /* Timeout for Flash Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (2*CONFIG_SYS_HZ)       /* Timeout for Flash Write */
-
-#define CONFIG_SYS_MONITOR_LEN         0x00100000
+#define CONFIG_SYS_MAX_FLASH_SECT      64
 #define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_SYS_MONITOR_LEN         0x00100000
 
 /*
  * Move up the U-Boot & monitor area if more flash is fitted.