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
/
impa7
/
flash.c
diff --git
a/board/impa7/flash.c
b/board/impa7/flash.c
index
1dea22b
..
d0c5880
100644
(file)
--- a/
board/impa7/flash.c
+++ b/
board/impa7/flash.c
@@
-28,7
+28,7
@@
#define MAIN_SECT_SIZE 0x20000
#define PARAM_SECT_SIZE 0x4000
#define MAIN_SECT_SIZE 0x20000
#define PARAM_SECT_SIZE 0x4000
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
/*-----------------------------------------------------------------------
/*-----------------------------------------------------------------------
@@
-39,15
+39,15
@@
ulong flash_init (void)
int i, j;
ulong size = 0;
int i, j;
ulong size = 0;
- for (i = 0; i < C
FG
_MAX_FLASH_BANKS; i++) {
+ for (i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; i++) {
ulong flashbase = 0;
flash_info[i].flash_id =
(INTEL_MANUFACT & FLASH_VENDMASK) |
(INTEL_ID_28F320B3T & FLASH_TYPEMASK);
flash_info[i].size = FLASH_BANK_SIZE;
ulong flashbase = 0;
flash_info[i].flash_id =
(INTEL_MANUFACT & FLASH_VENDMASK) |
(INTEL_ID_28F320B3T & FLASH_TYPEMASK);
flash_info[i].size = FLASH_BANK_SIZE;
- flash_info[i].sector_count = C
FG
_MAX_FLASH_SECT;
- memset (flash_info[i].protect, 0, C
FG
_MAX_FLASH_SECT);
+ flash_info[i].sector_count = C
ONFIG_SYS
_MAX_FLASH_SECT;
+ memset (flash_info[i].protect, 0, C
ONFIG_SYS
_MAX_FLASH_SECT);
if (i == 0)
flashbase = PHYS_FLASH_1;
else if (i == 1)
if (i == 0)
flashbase = PHYS_FLASH_1;
else if (i == 1)
@@
-69,8
+69,8
@@
ulong flash_init (void)
/* Protect monitor and environment sectors
*/
flash_protect (FLAG_PROTECT_SET,
/* Protect monitor and environment sectors
*/
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,
@@
-175,7
+175,7
@@
int flash_erase (flash_info_t * info, int s_first, int s_last)
while ((*addr & 0x00800080) != 0x00800080) {
if (get_timer_masked () >
while ((*addr & 0x00800080) != 0x00800080) {
if (get_timer_masked () >
- C
FG
_FLASH_ERASE_TOUT) {
+ C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
*addr = 0x00B000B0; /* suspend erase */
*addr = 0x00FF00FF; /* reset to read mode */
rc = ERR_TIMOUT;
*addr = 0x00B000B0; /* suspend erase */
*addr = 0x00FF00FF; /* reset to read mode */
rc = ERR_TIMOUT;
@@
-243,7
+243,7
@@
static int write_word (flash_info_t * info, ulong dest, ulong data)
/* wait while polling the status register */
while ((*addr & 0x00800080) != 0x00800080) {
/* wait while polling the status register */
while ((*addr & 0x00800080) != 0x00800080) {
- if (get_timer_masked () > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer_masked () > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
rc = ERR_TIMOUT;
/* suspend program command */
*addr = 0x00B000B0;
rc = ERR_TIMOUT;
/* suspend program command */
*addr = 0x00B000B0;