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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
wepep250
/
flash.c
diff --git
a/board/wepep250/flash.c
b/board/wepep250/flash.c
index
6223ec1
..
c6e9171
100644
(file)
--- a/
board/wepep250/flash.c
+++ b/
board/wepep250/flash.c
@@
-82,7
+82,7
@@
#endif
#endif
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
static FLASH_BUS_RET flash_status_reg (void)
{
static FLASH_BUS_RET flash_status_reg (void)
{
@@
-109,7
+109,7
@@
static int flash_ready (ulong timeout)
return ok;
}
return ok;
}
-#if ( C
FG
_MAX_FLASH_BANKS != 1 )
+#if ( C
ONFIG_SYS
_MAX_FLASH_BANKS != 1 )
# error "WEP platform has only one flash bank!"
#endif
# error "WEP platform has only one flash bank!"
#endif
@@
-120,11
+120,11
@@
ulong flash_init (void)
FLASH_BUS address = WEP_FLASH_BASE;
flash_info[0].size = WEP_FLASH_BANK_SIZE;
FLASH_BUS address = WEP_FLASH_BASE;
flash_info[0].size = WEP_FLASH_BANK_SIZE;
- flash_info[0].sector_count = C
FG
_MAX_FLASH_SECT;
+ flash_info[0].sector_count = C
ONFIG_SYS
_MAX_FLASH_SECT;
flash_info[0].flash_id = INTEL_MANUFACT;
flash_info[0].flash_id = INTEL_MANUFACT;
- memset (flash_info[0].protect, 0, C
FG
_MAX_FLASH_SECT);
+ memset (flash_info[0].protect, 0, C
ONFIG_SYS
_MAX_FLASH_SECT);
- for (i = 0; i < C
FG
_MAX_FLASH_SECT; i++) {
+ for (i = 0; i < C
ONFIG_SYS
_MAX_FLASH_SECT; i++) {
flash_info[0].start[i] = address;
#ifdef WEP_FLASH_UNLOCK
/* Some devices are hw locked after start. */
flash_info[0].start[i] = address;
#ifdef WEP_FLASH_UNLOCK
/* Some devices are hw locked after start. */
@@
-137,8
+137,8
@@
ulong flash_init (void)
}
flash_protect (FLAG_PROTECT_SET,
}
flash_protect (FLAG_PROTECT_SET,
- C
FG
_FLASH_BASE,
- C
FG
_FLASH_BASE + monitor_flash_len - 1,
+ C
ONFIG_SYS
_FLASH_BASE,
+ C
ONFIG_SYS
_FLASH_BASE + monitor_flash_len - 1,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect (FLAG_PROTECT_SET,
@@
-209,7
+209,7
@@
int flash_erase (flash_info_t * info, int s_first, int s_last)
*address = FLASH_CMD (CFI_INTEL_CMD_BLOCK_ERASE);
*address = FLASH_CMD (CFI_INTEL_CMD_CONFIRM);
*address = FLASH_CMD (CFI_INTEL_CMD_BLOCK_ERASE);
*address = FLASH_CMD (CFI_INTEL_CMD_CONFIRM);
- if (flash_ready (C
FG
_FLASH_ERASE_TOUT)) {
+ if (flash_ready (C
ONFIG_SYS
_FLASH_ERASE_TOUT)) {
*address = FLASH_CMD (CFI_INTEL_CMD_CLEAR_STATUS_REGISTER);
printf ("ok.\n");
} else {
*address = FLASH_CMD (CFI_INTEL_CMD_CLEAR_STATUS_REGISTER);
printf ("ok.\n");
} else {
@@
-257,7
+257,7
@@
static int write_data (flash_info_t * info, ulong dest, FLASH_BUS data)
*address = FLASH_CMD (CFI_INTEL_CMD_PROGRAM1);
*address = data;
*address = FLASH_CMD (CFI_INTEL_CMD_PROGRAM1);
*address = data;
- if (!flash_ready (C
FG
_FLASH_WRITE_TOUT)) {
+ if (!flash_ready (C
ONFIG_SYS
_FLASH_WRITE_TOUT)) {
*address = FLASH_CMD (CFI_INTEL_CMD_SUSPEND);
rc = ERR_TIMOUT;
printf ("timeout! Aborting...\n");
*address = FLASH_CMD (CFI_INTEL_CMD_SUSPEND);
rc = ERR_TIMOUT;
printf ("timeout! Aborting...\n");