mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
committed by
Wolfgang Denk
parent
71edc27181
commit
6d0f6bcf33
@@ -24,7 +24,7 @@
|
||||
#ifndef _FLASH_H_
|
||||
#define _FLASH_H_
|
||||
|
||||
#ifndef CFG_NO_FLASH
|
||||
#ifndef CONFIG_SYS_NO_FLASH
|
||||
/*-----------------------------------------------------------------------
|
||||
* FLASH Info: contains chip specific data, per FLASH bank
|
||||
*/
|
||||
@@ -33,9 +33,9 @@ typedef struct {
|
||||
ulong size; /* total bank size in bytes */
|
||||
ushort sector_count; /* number of erase units */
|
||||
ulong flash_id; /* combined device & manufacturer code */
|
||||
ulong start[CFG_MAX_FLASH_SECT]; /* physical sector start addresses */
|
||||
uchar protect[CFG_MAX_FLASH_SECT]; /* sector protection status */
|
||||
#ifdef CFG_FLASH_CFI
|
||||
ulong start[CONFIG_SYS_MAX_FLASH_SECT]; /* physical sector start addresses */
|
||||
uchar protect[CONFIG_SYS_MAX_FLASH_SECT]; /* sector protection status */
|
||||
#ifdef CONFIG_SYS_FLASH_CFI
|
||||
uchar portwidth; /* the width of the port */
|
||||
uchar chipwidth; /* the width of the chip */
|
||||
ushort buffer_size; /* # of bytes in write buffer */
|
||||
@@ -100,11 +100,11 @@ extern flash_info_t *addr2info (ulong);
|
||||
extern int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt);
|
||||
|
||||
/* board/?/flash.c */
|
||||
#if defined(CFG_FLASH_PROTECTION)
|
||||
#if defined(CONFIG_SYS_FLASH_PROTECTION)
|
||||
extern int flash_real_protect(flash_info_t *info, long sector, int prot);
|
||||
extern void flash_read_user_serial(flash_info_t * info, void * buffer, int offset, int len);
|
||||
extern void flash_read_factory_serial(flash_info_t * info, void * buffer, int offset, int len);
|
||||
#endif /* CFG_FLASH_PROTECTION */
|
||||
#endif /* CONFIG_SYS_FLASH_PROTECTION */
|
||||
|
||||
#ifdef CONFIG_FLASH_CFI_LEGACY
|
||||
extern ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info);
|
||||
@@ -486,6 +486,6 @@ extern int jedec_flash_match(flash_info_t *info, ulong base);
|
||||
#define FLASH_ERASE_TIMEOUT 120000 /* timeout for erasing in ms */
|
||||
#define FLASH_WRITE_TIMEOUT 500 /* timeout for writes in ms */
|
||||
|
||||
#endif /* !CFG_NO_FLASH */
|
||||
#endif /* !CONFIG_SYS_NO_FLASH */
|
||||
|
||||
#endif /* _FLASH_H_ */
|
||||
|
Reference in New Issue
Block a user