projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-mpc86xx
[platform/kernel/u-boot.git]
/
include
/
dataflash.h
diff --git
a/include/dataflash.h
b/include/dataflash.h
index
de04139
..
63b3bf9
100644
(file)
--- a/
include/dataflash.h
+++ b/
include/dataflash.h
@@
-40,7
+40,7
@@
/*number of protected area*/
#define NB_DATAFLASH_AREA 5
/*number of protected area*/
#define NB_DATAFLASH_AREA 5
-#ifdef C
FG
_NO_FLASH
+#ifdef C
ONFIG_SYS
_NO_FLASH
/*-----------------------------------------------------------------------
* return codes from flash_write():
/*-----------------------------------------------------------------------
* return codes from flash_write():
@@
-66,7
+66,7
@@
* Set Environment according to label:
*/
# define FLAG_SETENV 0x80
* Set Environment according to label:
*/
# define FLAG_SETENV 0x80
-#endif /* C
FG
_NO_FLASH */
+#endif /* C
ONFIG_SYS
_NO_FLASH */
/*define the area structure*/
typedef struct {
/*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 void dataflash_perror (int err);
extern void AT91F_DataflashSetEnv (void);
-extern struct dataflash_addr cs[C
FG
_MAX_DATAFLASH_BANKS];
+extern struct dataflash_addr cs[C
ONFIG_SYS
_MAX_DATAFLASH_BANKS];
extern dataflash_protect_t area_list[NB_DATAFLASH_AREA];
extern AT91S_DATAFLASH_INFO dataflash_info[];
#endif
extern dataflash_protect_t area_list[NB_DATAFLASH_AREA];
extern AT91S_DATAFLASH_INFO dataflash_info[];
#endif