dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert CONFIG_SYS_FLASH_ERASE_TOUT et al to Kconfig

Browse Source 
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>
This commit is contained in:
Tom Rini
2022-07-23 13:05:00 -04:00
parent 90e9b3d335
commit 5d68d2f41d
41 changed files with 22 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README
View File

@@ -1731,18 +1731,6 @@ Configuration Settings:
- CONFIG_SYS_MAX_FLASH_SECT: - CONFIG_SYS_MAX_FLASH_SECT:
Max number of sectors on a Flash chip 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 - CONFIG_SYS_FLASH_PROTECTION
If defined, hardware flash sectors protection is used If defined, hardware flash sectors protection is used
instead of U-Boot software protection. instead of U-Boot software protection.

8
board/cobra5272/flash.c
View File

@@ -200,8 +200,8 @@ int flash_erase(flash_info_t *info, int s_first, int s_last)
do { do {
result = *addr; result = *addr;
/* check timeout */ /* check timeout, 1000ms */
if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) { if (get_timer(start) > 1000) {
MEM_FLASH_ADDR1 = CMD_READ_ARRAY; MEM_FLASH_ADDR1 = CMD_READ_ARRAY;
chip1 = TMO; chip1 = TMO;
break; break;
@@ -289,8 +289,8 @@ static int write_word(flash_info_t *info, ulong dest, ulong data)
do { do {
result = *addr; result = *addr;
/* check timeout */ /* check timeout, 1000ms */
if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) { if (get_timer(start) > 1000) {
chip1 = ERR | TMO; chip1 = ERR | TMO;
break; break;
} }

10
board/freescale/m5253demo/flash.c
View File

@@ -242,7 +242,8 @@ int flash_erase(flash_info_t * info, int s_first, int s_last)
count = 0; count = 0;
} }
if (get_timer(start) > CONFIG_SYS_FLASH_ERASE_TOUT) { /* check timeout, 1000ms */
if (get_timer(start) > 1000) {
printf("Timeout\n"); printf("Timeout\n");
*addr = 0x00F0; /* reset to read mode */ *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(); enable_interrupts();
while ((*addr & 0x0080) != 0x0080) { while ((*addr & 0x0080) != 0x0080) {
if (get_timer(start) > /* check timeout, 1000ms */
CONFIG_SYS_FLASH_ERASE_TOUT) { if (get_timer(start) > 1000) {
printf("Timeout\n"); printf("Timeout\n");
*addr = 0x00F0; /* reset to read mode */ *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 */ /* data polling for D7 */
while (res == 0 while (res == 0
&& (*dest & (u8) 0x00800080) != (data & (u8) 0x00800080)) { && (*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 */ *dest = (u8) 0x00F000F0; /* reset bank */
res = 1; res = 1;
} }

12
drivers/mtd/Kconfig
View File

@@ -157,6 +157,18 @@ config FLASH_PIC32
This enables access to Microchip PIC32 internal non-CFI flash This enables access to Microchip PIC32 internal non-CFI flash
chips through PIC32 Non-Volatile-Memory Controller. 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 config RENESAS_RPC_HF
bool "Renesas RCar Gen3 RPC HyperFlash driver" bool "Renesas RCar Gen3 RPC HyperFlash driver"
depends on RCAR_GEN3 && DM_MTD depends on RCAR_GEN3 && DM_MTD

2
include/configs/M5253DEMO.h
View File

@@ -94,7 +94,6 @@
/* FLASH organization */ /* FLASH organization */
#define CONFIG_SYS_FLASH_BASE (CONFIG_SYS_CS0_BASE) #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_MAX_FLASH_SECT 2048 /* max number of sectors on one chip */
#define CONFIG_SYS_FLASH_ERASE_TOUT 1000
#define FLASH_SST6401B 0x200 #define FLASH_SST6401B 0x200
#define SST_ID_xF6401B 0x236D236D #define SST_ID_xF6401B 0x236D236D
@@ -110,7 +109,6 @@
#else #else
# define CONFIG_SYS_SST_SECT 2048 # define CONFIG_SYS_SST_SECT 2048
# define CONFIG_SYS_SST_SECTSZ 0x1000 # define CONFIG_SYS_SST_SECTSZ 0x1000
# define CONFIG_SYS_FLASH_WRITE_TOUT 500
#endif #endif
/* Cache Configuration */ /* Cache Configuration */

1
include/configs/M5275EVB.h
View File

@@ -92,7 +92,6 @@
* FLASH organization * FLASH organization
*/ */
#define CONFIG_SYS_MAX_FLASH_SECT 11 /* max number of sectors on one chip */ #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 #define CONFIG_SYS_FLASH_SIZE 0x200000

2
include/configs/MCR3000.h
View File

@@ -70,8 +70,6 @@
/* FLASH organization */ /* FLASH organization */
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_MAX_FLASH_SECT 35 #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 * For booting Linux, the board info and command line data

3
include/configs/MPC837XERDB.h
View File

@@ -144,9 +144,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max sectors per device */ #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 * NAND Flash on the Local Bus
*/ */

2
include/configs/MPC8548CDS.h
View File

@@ -125,8 +125,6 @@
#define CONFIG_SYS_FLASH_BANKS_LIST \ #define CONFIG_SYS_FLASH_BANKS_LIST \
{CONFIG_SYS_FLASH_BASE_PHYS + 0x800000, CONFIG_SYS_FLASH_BASE_PHYS} {CONFIG_SYS_FLASH_BASE_PHYS + 0x800000, CONFIG_SYS_FLASH_BASE_PHYS}
#define CONFIG_SYS_MAX_FLASH_SECT 128 /* sectors per device */ #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 */ #define CONFIG_HWCONFIG /* enable hwconfig */

3
include/configs/P1010RDB.h
View File

@@ -166,9 +166,6 @@ extern unsigned long get_sdram_size(void);
#define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_QUIET_TEST
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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 */ /* CFI for NOR Flash */
/* NAND Flash on IFC */ /* NAND Flash on IFC */

2
include/configs/P2041RDB.h
View File

@@ -124,8 +124,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 */ /* Nand Flash */
#ifdef CONFIG_NAND_FSL_ELBC #ifdef CONFIG_NAND_FSL_ELBC

2
include/configs/T102xRDB.h
View File

@@ -169,8 +169,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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} #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS}

2
include/configs/T104xRDB.h
View File

@@ -131,8 +131,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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} #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS}

2
include/configs/T208xQDS.h
View File

@@ -134,8 +134,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 \ #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS \
+ 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}

2
include/configs/T208xRDB.h
View File

@@ -124,8 +124,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 } #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS }
/* CPLD on IFC */ /* CPLD on IFC */

2
include/configs/T4240RDB.h
View File

@@ -205,8 +205,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 \ #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS \
+ 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS} + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}

1
include/configs/amcore.h
View File

@@ -37,7 +37,6 @@
#define CONFIG_SYS_SDRAM_SIZE 0x1000000 #define CONFIG_SYS_SDRAM_SIZE 0x1000000
#define CONFIG_SYS_FLASH_BASE 0xffc00000 #define CONFIG_SYS_FLASH_BASE 0xffc00000
#define CONFIG_SYS_MAX_FLASH_SECT 1024 #define CONFIG_SYS_MAX_FLASH_SECT 1024
#define CONFIG_SYS_FLASH_ERASE_TOUT 1000
/* amcore design has flash data bytes wired swapped */ /* amcore design has flash data bytes wired swapped */
#define CONFIG_SYS_WRITE_SWAPPED_DATA #define CONFIG_SYS_WRITE_SWAPPED_DATA

5
include/configs/armadillo-800eva.h
View File

@@ -50,11 +50,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 512 #define CONFIG_SYS_MAX_FLASH_SECT 512
#define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) } #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 */ /* ENV setting */
/* SH Ether */ /* SH Ether */

1
include/configs/astro_mcf5373l.h
View File

@@ -207,7 +207,6 @@
/* FLASH organization */ /* FLASH organization */
#define CONFIG_SYS_MAX_FLASH_SECT 259 #define CONFIG_SYS_MAX_FLASH_SECT 259
#define CONFIG_SYS_FLASH_ERASE_TOUT 1000
#define CONFIG_SYS_FLASH_SIZE 0x2000000 #define CONFIG_SYS_FLASH_SIZE 0x2000000
#define CONFIG_SYS_FLASH_CFI_NONBLOCK 1 #define CONFIG_SYS_FLASH_CFI_NONBLOCK 1

3
include/configs/ax25-ae350.h
View File

@@ -46,9 +46,6 @@
#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1
#define CONFIG_SYS_FLASH_BANKS_LIST { 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 */ /* max number of memory banks */
/* /*
* There are 4 banks supported for this Controller, * There are 4 banks supported for this Controller,

5
include/configs/blanche.h
View File

@@ -33,11 +33,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 1024 #define CONFIG_SYS_MAX_FLASH_SECT 1024
#define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) } #define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) }
#define CONFIG_SYS_FLASH_BANKS_SIZES { (CONFIG_SYS_FLASH_SIZE) } #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 #endif
/* Board Clock */ /* Board Clock */

1
include/configs/cobra5272.h
View File

@@ -190,7 +190,6 @@ enter a valid image address in flash */
* FLASH organization * FLASH organization
*/ */
#define CONFIG_SYS_MAX_FLASH_SECT 11 /* max number of sectors on one chip */ #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 * Cache Configuration

2
include/configs/corenet_ds.h
View File

@@ -114,8 +114,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 */ /* Nand Flash */
#ifdef CONFIG_NAND_FSL_ELBC #ifdef CONFIG_NAND_FSL_ELBC

1
include/configs/eb_cpu5282.h
View File

@@ -95,7 +95,6 @@
#define CONFIG_SYS_INT_FLASH_ENABLE 0x21 #define CONFIG_SYS_INT_FLASH_ENABLE 0x21
#define CONFIG_SYS_MAX_FLASH_SECT 128 #define CONFIG_SYS_MAX_FLASH_SECT 128
#define CONFIG_SYS_FLASH_ERASE_TOUT 10000000
#define CONFIG_SYS_FLASH_SIZE 16*1024*1024 #define CONFIG_SYS_FLASH_SIZE 16*1024*1024

3
include/configs/ids8313.h
View File

@@ -112,9 +112,6 @@
#define CONFIG_SYS_MAX_FLASH_SECT 128 #define CONFIG_SYS_MAX_FLASH_SECT 128
#define CONFIG_SYS_FLASH_ERASE_TOUT 60000
#define CONFIG_SYS_FLASH_WRITE_TOUT 500
/* /*
* NAND FLASH setup * NAND FLASH setup
*/ */

2
include/configs/integrator-common.h
View File

@@ -44,5 +44,3 @@
#define CONFIG_SYS_FLASH_BASE 0x24000000 #define CONFIG_SYS_FLASH_BASE 0x24000000
/* Timeout values in ticks */ /* 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 */

2
include/configs/km/pg-wcom-ls102xa.h
View File

@@ -65,8 +65,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 } #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS }

4
include/configs/kzm9g.h
View File

@@ -44,13 +44,9 @@
#define FLASH_SECTOR_SIZE (256 * 1024) /* 256 KB sectors */ #define FLASH_SECTOR_SIZE (256 * 1024) /* 256 KB sectors */
/* Timeout for Flash erase operations (in ms) */ /* Timeout for Flash erase operations (in ms) */
#define CONFIG_SYS_FLASH_ERASE_TOUT (3 * 1000)
/* Timeout for Flash write operations (in ms) */ /* 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) */ /* 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) */ /* Timeout for Flash clear lock bit operations (in ms) */
#define CONFIG_SYS_FLASH_UNLOCK_TOUT (3 * 1000)
/* GPIO / PFC */ /* GPIO / PFC */
#define CONFIG_SH_GPIO_PFC #define CONFIG_SH_GPIO_PFC

2
include/configs/ls1021aqds.h
View File

@@ -70,8 +70,6 @@
#define CONFIG_SYS_WRITE_SWAPPED_DATA #define CONFIG_SYS_WRITE_SWAPPED_DATA
#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #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, \ #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS, \
CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}

2
include/configs/ls1021atwr.h
View File

@@ -99,8 +99,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 } #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS }

2
include/configs/ls1043aqds.h
View File

@@ -75,8 +75,6 @@
#define CONFIG_SYS_NOR_FTIM3 0 #define CONFIG_SYS_NOR_FTIM3 0
#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #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, \ #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS, \
CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}

2
include/configs/ls1043ardb.h
View File

@@ -43,8 +43,6 @@
#define CONFIG_SYS_IFC_CCR 0x01000000 #define CONFIG_SYS_IFC_CCR 0x01000000
#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #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 } #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS }

2
include/configs/ls1046aqds.h
View File

@@ -92,8 +92,6 @@
#define CONFIG_SYS_NOR_FTIM3 0 #define CONFIG_SYS_NOR_FTIM3 0
#define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #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, \ #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS, \
CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000} CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000}

2
include/configs/ls1088aqds.h
View File

@@ -66,8 +66,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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,\ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE,\
CONFIG_SYS_FLASH_BASE + 0x40000000} CONFIG_SYS_FLASH_BASE + 0x40000000}

2
include/configs/ls1088ardb.h
View File

@@ -51,8 +51,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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 } #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE }
#endif #endif

2
include/configs/ls2080aqds.h
View File

@@ -68,8 +68,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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,\ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE,\
CONFIG_SYS_FLASH_BASE + 0x40000000} CONFIG_SYS_FLASH_BASE + 0x40000000}

2
include/configs/ls2080ardb.h
View File

@@ -65,8 +65,6 @@
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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_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,\ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE,\
CONFIG_SYS_FLASH_BASE + 0x40000000} CONFIG_SYS_FLASH_BASE + 0x40000000}

3
include/configs/p1_p2_rdb_pc.h
View File

@@ -198,9 +198,6 @@
#define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_QUIET_TEST
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ #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 */ /* Nand Flash */
#ifdef CONFIG_NAND_FSL_ELBC #ifdef CONFIG_NAND_FSL_ELBC
#define CONFIG_SYS_NAND_BASE 0xff800000 #define CONFIG_SYS_NAND_BASE 0xff800000

2
include/configs/socrates.h
View File

@@ -89,8 +89,6 @@
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_LBC_FLASH_BASE /* start of FLASH */ #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_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_LCRR 0x00030004 /* LB clock ratio reg */
#define CONFIG_SYS_LBC_LBCR 0x00000000 /* LB config reg */ #define CONFIG_SYS_LBC_LBCR 0x00000000 /* LB config reg */

2
include/configs/vexpress_common.h
View File

@@ -173,8 +173,6 @@
#define CONFIG_SYS_FLASH_BASE1 V2M_NOR1 #define CONFIG_SYS_FLASH_BASE1 V2M_NOR1
/* Timeout values in ticks */ /* 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 */ /* 255 0x40000 sectors + first or last sector may have 4 erase regions = 259 */
#define CONFIG_SYS_MAX_FLASH_SECT 259 /* Max sectors */ #define CONFIG_SYS_MAX_FLASH_SECT 259 /* Max sectors */

2
include/configs/zynq-common.h
View File

@@ -39,8 +39,6 @@
/* NOR */ /* NOR */
#ifdef CONFIG_MTD_NOR_FLASH #ifdef CONFIG_MTD_NOR_FLASH
# define CONFIG_SYS_MAX_FLASH_SECT 512 # 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_FLASH_SHOW_PROGRESS 10
# define CONFIG_SYS_FLASH_QUIET_TEST # define CONFIG_SYS_FLASH_QUIET_TEST
#endif #endif