Convert CONFIG_SYS_FLASH_ERASE_TOUT et al to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_FLASH_ERASE_TOUT
   CONFIG_SYS_FLASH_LOCK_TOUT
   CONFIG_SYS_FLASH_UNLOCK_TOUT
   CONFIG_SYS_FLASH_WRITE_TOUT

In practice, for two m68k platforms we move to hard-coding with a
comment the timeout values, rather than try and make convoluted Kconfig
logic.  We add options for the write and erase options to the pic32
flash driver, as this driver does make use of them.  Everywhere else
these are unreferenced values.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 8a50bf645cb39903638a2df3baf14566829247ce..697b0d3a357c9bd3e8dd1e32991a72df27e17c5e 100644 (file)
--- a/README
+++ b/README
@@ -1731,18 +1731,6 @@ Configuration Settings:
 - CONFIG_SYS_MAX_FLASH_SECT:
                Max number of sectors on a Flash chip
 
-- CONFIG_SYS_FLASH_ERASE_TOUT:
-               Timeout for Flash erase operations (in ms)
-
-- CONFIG_SYS_FLASH_WRITE_TOUT:
-               Timeout for Flash write operations (in ms)
-
-- CONFIG_SYS_FLASH_LOCK_TOUT
-               Timeout for Flash set sector lock bit operation (in ms)
-
-- CONFIG_SYS_FLASH_UNLOCK_TOUT
-               Timeout for Flash clear lock bits operation (in ms)
-
 - CONFIG_SYS_FLASH_PROTECTION
                If defined, hardware flash sectors protection is used
                instead of U-Boot software protection.

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 4337f4879de77306c6d5da4076791d7b93d72d09..5d15ed4e691dad5a51c618dfdeb773e82c7e7b90 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -200,8 +200,8 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
                        do {
                                result = *addr;
 
-                               /* check timeout */
-                               if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
+                               /* check timeout, 1000ms */
+                               if (get_timer(start) > 1000) {
                                        MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
                                        chip1 = TMO;
                                        break;
@@ -289,8 +289,8 @@ static int write_word(flash_info_t *info, ulong dest, ulong data)
        do {
                result = *addr;
 
-               /* check timeout */
-               if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
+               /* check timeout, 1000ms */
+               if (get_timer(start) > 1000) {
                        chip1 = ERR | TMO;
                        break;
                }

diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c
index 31974217816845e6da9201312d781543e827af31..bff1ac5fb113f4662b427620098e818cff161bb7 100644 (file)
--- a/board/freescale/m5253demo/flash.c
+++ b/board/freescale/m5253demo/flash.c
@@ -242,7 +242,8 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
                                        count = 0;
                                }
 
-                               if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) {
+                               /* check timeout, 1000ms */
+                               if (get_timer(start) > 1000) {
                                        printf("Timeout\n");
                                        *addr = 0x00F0; /* reset to read mode */
 
@@ -294,8 +295,8 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
                                                enable_interrupts();
 
                                        while ((*addr & 0x0080) != 0x0080) {
-                                               if (get_timer(start) >
-                                                   CONFIG_SYS_FLASH_ERASE_TOUT) {
+                                               /* check timeout, 1000ms */
+                                               if (get_timer(start) > 1000) {
                                                        printf("Timeout\n");
                                                        *addr = 0x00F0; /* reset to read mode */
 
@@ -430,7 +431,8 @@ int write_word(flash_info_t * info, FPWV * dest, u16 data)
        /* data polling for D7 */
        while (res == 0
               && (*dest & (u8) 0x00800080) != (data & (u8) 0x00800080)) {
-               if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
+               /* check timeout, 500ms */
+               if (get_timer(start) > 500) {
                        *dest = (u8) 0x00F000F0;        /* reset bank */
                        res = 1;
                }

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 985cc01e425d85829e02882f2c5c291b6a9f91cb..e28ff049550bab1a30432547da0493b778d6ddb6 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -157,6 +157,18 @@ config FLASH_PIC32
          This enables access to Microchip PIC32 internal non-CFI flash
          chips through PIC32 Non-Volatile-Memory Controller.
 
+config SYS_FLASH_ERASE_TOUT
+       int "Timeout in ms for performing an erase operation on the flash"
+       depends on FLASH_PIC32
+       help
+         Timeout for Flash erase operations (in ms)
+
+config SYS_FLASH_WRITE_TOUT
+       int "Timeout in ms for performing a write operation on the flash"
+       depends on FLASH_PIC32
+       help
+         Timeout for Flash write operations (in ms)
+
 config RENESAS_RPC_HF
        bool "Renesas RCar Gen3 RPC HyperFlash driver"
        depends on RCAR_GEN3 && DM_MTD

diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index cac9b24ead8e980052680ddf929abfd83961dac9..88c2bbbf25f2184e547f0f70b68d0a0245d77124 100644 (file)
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -94,7 +94,6 @@
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE          (CONFIG_SYS_CS0_BASE)
 #define CONFIG_SYS_MAX_FLASH_SECT      2048    /* max number of sectors on one chip */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    1000
 
 #define FLASH_SST6401B         0x200
 #define SST_ID_xF6401B         0x236D236D
@@ -110,7 +109,6 @@
 #else
 #      define CONFIG_SYS_SST_SECT              2048
 #      define CONFIG_SYS_SST_SECTSZ            0x1000
-#      define CONFIG_SYS_FLASH_WRITE_TOUT      500
 #endif
 
 /* Cache Configuration */

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 292578fc15b9653a7a2b7dac2dde5ca375cf543b..80d079a4899598eba06b1731041804c68600fe18 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -92,7 +92,6 @@
  * FLASH organization
  */
 #define CONFIG_SYS_MAX_FLASH_SECT      11      /* max number of sectors on one chip */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    1000
 
 #define CONFIG_SYS_FLASH_SIZE          0x200000
 

diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 41ab860850833710142aa3220ce94a8bd8c40858..f6854cb8c9855879c79fbc94cc7cf4093c1e94ed 100644 (file)
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -70,8 +70,6 @@
 /* FLASH organization */
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MAX_FLASH_SECT      35
-#define CONFIG_SYS_FLASH_ERASE_TOUT    120000
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500
 
 /*
  * For booting Linux, the board info and command line data

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 87ae9530852f10fe2710efedf37a37c68926e4c5..a25bf7464514052fba65a5a97011cabb3490e059 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -144,9 +144,6 @@
 
 #define CONFIG_SYS_MAX_FLASH_SECT      256 /* max sectors per device */
 
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
-
 /*
  * NAND Flash on the Local Bus
  */

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index febe8c2476f2e208b0e7e88d910c7f87d7c7a5c9..d4a2b0184f64fbfdaae45918fb2ce9be439731ec 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -125,8 +125,6 @@
 #define CONFIG_SYS_FLASH_BANKS_LIST \
        {CONFIG_SYS_FLASH_BASE_PHYS + 0x800000, CONFIG_SYS_FLASH_BASE_PHYS}
 #define CONFIG_SYS_MAX_FLASH_SECT      128             /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_HWCONFIG                        /* enable hwconfig */
 

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 9f680f21b8a6cad18e663e562c39e3bae45a5641..a057d59177e572e15134555c620bba0e6410cc2f 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -166,9 +166,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SYS_FLASH_QUIET_TEST
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
-
 /* CFI for NOR Flash */
 
 /* NAND Flash on IFC */

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 3a3f1d306126181d95a5591d432751da263c737d..b4a7b4688113372b5eb4cf95680827f8f8effc93 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -124,8 +124,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024            /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Write Timeout (ms) */
 
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 6e7f0bcd52ec4124c995f17c9762ca16c0192eb9..7c5fbbba5926c3d07ee2a7fa57f0b865164ee1a4 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -169,8 +169,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
 

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 140b3074784eabc643cc610a18f248846086d93f..39b04b204e5869ee3bbe74ddd3b044023c170d4d 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -131,8 +131,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS}
 

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 53f62837c66de60233334f3f6ef04237aa4a8e46..0cb8d394d11cc248a98117a404c5470042c72a25 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -134,8 +134,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS \
                                        + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 8a0b005559958fbfe2ddc9a997300e6312aee463..bccc3385cb214fc904cfdad36df5e5e03df0ba61 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -124,8 +124,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS }
 
 /* CPLD on IFC */

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index d2f5cebfc07eecca88ed2bc78f3cfe8c40581279..181b5fe2a44b0f159fe56fff91a8cd0274bead8f 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -205,8 +205,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS \
                                        + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}

diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 3c9267b14ec98a4aef39dbdd05399c632fe6ea44..89b94b29306f754e7baa6b71af109488ec75bf62 100644 (file)
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -37,7 +37,6 @@
 #define CONFIG_SYS_SDRAM_SIZE          0x1000000
 #define CONFIG_SYS_FLASH_BASE          0xffc00000
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
-#define CONFIG_SYS_FLASH_ERASE_TOUT    1000
 
 /* amcore design has flash data bytes wired swapped */
 #define CONFIG_SYS_WRITE_SWAPPED_DATA

diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 1c7494183a4d5c73ca34ef819065c78a257c73f1..d54cadd41eebf8ef3acb6e1bb35837640882d361 100644 (file)
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -50,11 +50,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      512
 #define CONFIG_SYS_FLASH_BANKS_LIST    { (CONFIG_SYS_FLASH_BASE) }
 
-#define CONFIG_SYS_FLASH_ERASE_TOUT    3000
-#define CONFIG_SYS_FLASH_WRITE_TOUT    3000
-#define CONFIG_SYS_FLASH_LOCK_TOUT     3000
-#define CONFIG_SYS_FLASH_UNLOCK_TOUT   3000
-
 /* ENV setting */
 
 /* SH Ether */

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index da4d49741d2cbecb8344814339e608e5105e3bbf..f85108463f5124f4f199c3c77529c3a1f5d82686 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -207,7 +207,6 @@
 
 /* FLASH organization */
 #define CONFIG_SYS_MAX_FLASH_SECT      259
-#define CONFIG_SYS_FLASH_ERASE_TOUT    1000
 
 #define CONFIG_SYS_FLASH_SIZE          0x2000000
 #define CONFIG_SYS_FLASH_CFI_NONBLOCK  1

diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h
index daa5cdf5b26bbcbd566f96b9d85063a390936790..653acdc9aff1df9a13d86503b79e52607d2bb5c3 100644 (file)
--- a/include/configs/ax25-ae350.h
+++ b/include/configs/ax25-ae350.h
@@ -46,9 +46,6 @@
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1
 #define CONFIG_SYS_FLASH_BANKS_LIST    { PHYS_FLASH_1, }
 
-#define CONFIG_SYS_FLASH_ERASE_TOUT    120000  /* TO for Flash Erase (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* TO for Flash Write (ms) */
-
 /* max number of memory banks */
 /*
  * There are 4 banks supported for this Controller,

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index 25b6e7005e7aebe4a68881424477220d597df398..76271ebe2e681056a4fd6eaf66ae2cac1e26c3de 100644 (file)
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -33,11 +33,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      1024
 #define CONFIG_SYS_FLASH_BANKS_LIST    { (CONFIG_SYS_FLASH_BASE) }
 #define CONFIG_SYS_FLASH_BANKS_SIZES   { (CONFIG_SYS_FLASH_SIZE) }
-
-#define CONFIG_SYS_FLASH_ERASE_TOUT    3000
-#define CONFIG_SYS_FLASH_WRITE_TOUT    3000
-#define CONFIG_SYS_FLASH_LOCK_TOUT     3000
-#define CONFIG_SYS_FLASH_UNLOCK_TOUT   3000
 #endif
 
 /* Board Clock */

diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index dd7b6c08730cc838254f78f313da45ee15bb3e5c..5e364b4990a8a7db5b750518f6ff88b625c859d6 100644 (file)
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -190,7 +190,6 @@ enter a valid image address in flash */
  * FLASH organization
  */
 #define CONFIG_SYS_MAX_FLASH_SECT      11      /* max number of sectors on one chip    */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    1000    /* flash timeout */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 7d666e553b0bee526eb38a811c30b9521fbe95b8..c12cdd413291de9b4abeb00861fb50021d0d473b 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -114,8 +114,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024            /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000           /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500             /* Flash Write Timeout (ms) */
 
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC

diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index 6e444c478922c9261a2adcdc6629da88ded6d3cb..1a05914c1b88bb419677053e4fda7a41486acfc2 100644 (file)
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -95,7 +95,6 @@
 #define CONFIG_SYS_INT_FLASH_ENABLE    0x21
 
 #define        CONFIG_SYS_MAX_FLASH_SECT       128
-#define        CONFIG_SYS_FLASH_ERASE_TOUT     10000000
 
 #define CONFIG_SYS_FLASH_SIZE          16*1024*1024
 

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 26f0741be3f10e84eae1dd6c1f1abb3cad4c0176..3dbd141a76993701ebbc43d562a3432e0695831d 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -112,9 +112,6 @@
 
 #define CONFIG_SYS_MAX_FLASH_SECT      128
 
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500
-
 /*
  * NAND FLASH setup
  */

diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index 4408fd0c2374e69cbb766caf3afa65fd0cbf6e57..512e0e61aa78b1c27db0968ac767dd49939c01f6 100644 (file)
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -44,5 +44,3 @@
 #define CONFIG_SYS_FLASH_BASE          0x24000000
 
 /* Timeout values in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (2 * CONFIG_SYS_HZ) /* Erase Timeout */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (2 * CONFIG_SYS_HZ) /* Write Timeout */

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index 1477483db5bfd4c5b06b5396567e76968410b884..1d9e0b6551e6abf7feeca5eaab14114909656eb3 100644 (file)
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -65,8 +65,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      512     /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE_PHYS }
 

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 83c676803bba7d7bb4120c97ff327d1e4fb291e4..9147a726e5923a029449921860d53d23469675e2 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -44,13 +44,9 @@
 #define FLASH_SECTOR_SIZE      (256 * 1024)    /* 256 KB sectors */
 
 /* Timeout for Flash erase operations (in ms) */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (3 * 1000)
 /* Timeout for Flash write operations (in ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (3 * 1000)
 /* Timeout for Flash set sector lock bit operations (in ms) */
-#define CONFIG_SYS_FLASH_LOCK_TOUT             (3 * 1000)
 /* Timeout for Flash clear lock bit operations (in ms) */
-#define CONFIG_SYS_FLASH_UNLOCK_TOUT   (3 * 1000)
 
 /* GPIO / PFC */
 #define CONFIG_SH_GPIO_PFC

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 73f1797b47617186cea8413c0372116e602d3e0a..f3e694c3c8cd8e0bf62343afcc731f749b054396 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -70,8 +70,6 @@
 #define CONFIG_SYS_WRITE_SWAPPED_DATA
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
                                        CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 732869ac14a76850533d7883ba728ec7deea715f..8681417eb03849a0679a1ff15c8b841273b46615 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -99,8 +99,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE_PHYS }
 

diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h
index f11d3e976bb278a5520c400218e0a9fa72af0ea2..e265b1a48eaf6a36bdd3bd15d3fa85958ad77fef 100644 (file)
--- a/include/configs/ls1043aqds.h
+++ b/include/configs/ls1043aqds.h
@@ -75,8 +75,6 @@
 #define CONFIG_SYS_NOR_FTIM3           0
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
                                        CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index 45b2359dda23823f41fe9b7d13deb14ac02b00af..352b7dbdd8d277de7552665157dc382d2ee6fbc4 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -43,8 +43,6 @@
 #define CONFIG_SYS_IFC_CCR             0x01000000
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE_PHYS }
 

diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h
index 713946301690e8572c9b2d4b6aeaf185674ee31f..261646fe703ea067411754a21df6f955e38a3592 100644 (file)
--- a/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@ -92,8 +92,6 @@
 #define CONFIG_SYS_NOR_FTIM3           0
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    {CONFIG_SYS_FLASH_BASE_PHYS, \
                                        CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}

diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 004de7cfb7348273f87eff181e5a3ef3aa32ce72..c02acfb8580653f2b9bee465a6c6365332512d87 100644 (file)
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -66,8 +66,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE,\
                                         CONFIG_SYS_FLASH_BASE + 0x40000000}

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 14b2c9793bbda4476e66b79976124bdb14e91416..61df2a4253cabb7a811ed3dd4f27b8558f125b52 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -51,8 +51,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
 #endif

diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h
index ff1c192c6b38a1cfa0c6851edee78bc591b80b49..c7146314dfee4fc9a71c9128da5075b8318db22b 100644 (file)
--- a/include/configs/ls2080aqds.h
+++ b/include/configs/ls2080aqds.h
@@ -68,8 +68,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE,\
                                         CONFIG_SYS_FLASH_BASE + 0x40000000}

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index b2dd6c65893a56328afc124171265d08704adbb8..d20eaec7527fb48459291a8e78337efa21b24f56 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -65,8 +65,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS     45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      1024    /* sectors per device */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
 
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE,\
                                         CONFIG_SYS_FLASH_BASE + 0x40000000}

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 385e338bfbe243997ed827460d8ffe7e4b019d2a..e849f5ee874ace67dac7fa578c6d2e622b42aaeb 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -198,9 +198,6 @@
 #define CONFIG_SYS_FLASH_QUIET_TEST
 #define CONFIG_FLASH_SHOW_PROGRESS     45      /* count down from 45/5: 9..1 */
 
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms) */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms) */
-
 /* Nand Flash */
 #ifdef CONFIG_NAND_FSL_ELBC
 #define CONFIG_SYS_NAND_BASE           0xff800000

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index c3b1be9698791ab0e8fd5c09e09c2af150dc993a..185da975fc2f76767f9092267abea35d934f3bb2 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -89,8 +89,6 @@
 #define CONFIG_SYS_FLASH_BASE          CONFIG_SYS_LBC_FLASH_BASE /* start of FLASH     */
 
 #define CONFIG_SYS_MAX_FLASH_SECT      256             /* sectors per device   */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    60000   /* Flash Erase Timeout (ms)     */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    500     /* Flash Write Timeout (ms)     */
 
 #define CONFIG_SYS_LBC_LCRR            0x00030004    /* LB clock ratio reg     */
 #define CONFIG_SYS_LBC_LBCR            0x00000000    /* LB config reg          */

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 91ce2fe0ca40bafcc14abde5217a9e86f82d16eb..572a5171fc5c7eb5562d4897a19ad83263637120 100644 (file)
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -173,8 +173,6 @@
 #define CONFIG_SYS_FLASH_BASE1         V2M_NOR1
 
 /* Timeout values in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT    (2 * CONFIG_SYS_HZ) /* Erase Timeout */
-#define CONFIG_SYS_FLASH_WRITE_TOUT    (2 * CONFIG_SYS_HZ) /* Write Timeout */
 
 /* 255 0x40000 sectors + first or last sector may have 4 erase regions = 259 */
 #define CONFIG_SYS_MAX_FLASH_SECT      259             /* Max sectors */

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index c9d8d09f194d282239048ef607c1f30a8d9d6f37..cb4f4209728dcaea46e0680d2c584bfb763e3b95 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -39,8 +39,6 @@
 /* NOR */
 #ifdef CONFIG_MTD_NOR_FLASH
 # define CONFIG_SYS_MAX_FLASH_SECT     512
-# define CONFIG_SYS_FLASH_ERASE_TOUT   1000
-# define CONFIG_SYS_FLASH_WRITE_TOUT   5000
 # define CONFIG_FLASH_SHOW_PROGRESS    10
 # define CONFIG_SYS_FLASH_QUIET_TEST
 #endif