Merge git://www.denx.de/git/u-boot-cfi-flash
This commit is contained in:
commit
60e12b3a71
@ -8,7 +8,10 @@
|
||||
#ifndef _FLASH_H_
|
||||
#define _FLASH_H_
|
||||
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
#ifndef CONFIG_SYS_MAX_FLASH_SECT
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 512
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* FLASH Info: contains chip specific data, per FLASH bank
|
||||
*/
|
||||
@ -503,6 +506,4 @@ extern flash_info_t *flash_get_info(ulong base);
|
||||
#define FLASH_ERASE_TIMEOUT 120000 /* timeout for erasing in ms */
|
||||
#define FLASH_WRITE_TIMEOUT 500 /* timeout for writes in ms */
|
||||
|
||||
#endif /* !CONFIG_SYS_NO_FLASH */
|
||||
|
||||
#endif /* _FLASH_H_ */
|
||||
|
Loading…
Reference in New Issue
Block a user