diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/dataflash.h | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/dataflash.h')
| -rw-r--r-- | include/dataflash.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/dataflash.h b/include/dataflash.h index de04139..63b3bf9 100644 --- a/include/dataflash.h +++ b/include/dataflash.h @@ -40,7 +40,7 @@ /*number of protected area*/ #define NB_DATAFLASH_AREA 5 -#ifdef CFG_NO_FLASH +#ifdef CONFIG_SYS_NO_FLASH /*----------------------------------------------------------------------- * return codes from flash_write(): @@ -66,7 +66,7 @@ * Set Environment according to label: */ # define FLAG_SETENV 0x80 -#endif /* CFG_NO_FLASH */ +#endif /* CONFIG_SYS_NO_FLASH */ /*define the area structure*/ typedef struct { @@ -213,7 +213,7 @@ extern void dataflash_print_info (void); extern void dataflash_perror (int err); extern void AT91F_DataflashSetEnv (void); -extern struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS]; +extern struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS]; extern dataflash_protect_t area_list[NB_DATAFLASH_AREA]; extern AT91S_DATAFLASH_INFO dataflash_info[]; #endif |