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
/
emk
/
common
/
flash.c
diff --git
a/board/emk/common/flash.c
b/board/emk/common/flash.c
index
04c35bc
..
330978b
100644
(file)
--- a/
board/emk/common/flash.c
+++ b/
board/emk/common/flash.c
@@
-26,7
+26,7
@@
#include <common.h>
#include <common.h>
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS]; /* info for FLASH chips */
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined (CONFIG_TOP860)
typedef unsigned short FLASH_PORT_WIDTH;
#if defined (CONFIG_TOP860)
typedef unsigned short FLASH_PORT_WIDTH;
@@
-95,7
+95,7
@@
unsigned long flash_init (void)
int i = 0;
extern void flash_preinit(void);
extern void flash_afterinit(uint, ulong, ulong);
int i = 0;
extern void flash_preinit(void);
extern void flash_afterinit(uint, ulong, ulong);
- ulong flashbase = C
FG
_FLASH_BASE;
+ ulong flashbase = C
ONFIG_SYS
_FLASH_BASE;
flash_preinit();
flash_preinit();
@@
-105,12
+105,12
@@
unsigned long flash_init (void)
flash_get_size((FPW *)flashbase, &flash_info[i]);
size += flash_info[i].size;
flash_get_size((FPW *)flashbase, &flash_info[i]);
size += flash_info[i].size;
-#if C
FG_MONITOR_BASE >= CFG
_FLASH_BASE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH_BASE
/* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
/* monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET,
- C
FG
_MONITOR_BASE,
- C
FG
_MONITOR_BASE+monitor_flash_len-1,
- flash_get_info(C
FG
_MONITOR_BASE));
+ C
ONFIG_SYS
_MONITOR_BASE,
+ C
ONFIG_SYS
_MONITOR_BASE+monitor_flash_len-1,
+ flash_get_info(C
ONFIG_SYS
_MONITOR_BASE));
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
#endif
#ifdef CONFIG_ENV_IS_IN_FLASH
@@
-147,14
+147,14
@@
static flash_info_t *flash_get_info(ulong base)
int i;
flash_info_t * info;
int i;
flash_info_t * info;
- for (i = 0; i < C
FG
_MAX_FLASH_BANKS; i ++) {
+ for (i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; i ++) {
info = & flash_info[i];
if (info->size &&
info->start[0] <= base && base <= info->start[0] + info->size - 1)
break;
}
info = & flash_info[i];
if (info->size &&
info->start[0] <= base && base <= info->start[0] + info->size - 1)
break;
}
- return i == C
FG
_MAX_FLASH_BANKS ? 0 : info;
+ return i == C
ONFIG_SYS
_MAX_FLASH_BANKS ? 0 : info;
}
/*-----------------------------------------------------------------------
}
/*-----------------------------------------------------------------------
@@
-459,7
+459,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
udelay (1000);
while ((*addr & (FPW)0x00800080) != (FPW)0x00800080) {
udelay (1000);
while ((*addr & (FPW)0x00800080) != (FPW)0x00800080) {
- if ((now = get_timer(start)) > C
FG
_FLASH_ERASE_TOUT) {
+ if ((now = get_timer(start)) > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout\n");
if (intel) {
printf ("Timeout\n");
if (intel) {
@@
-473,14
+473,14
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
}
/* show that we're waiting */
}
/* show that we're waiting */
- if ((get_timer(last)) > C
FG
_HZ) {/* every second */
+ if ((get_timer(last)) > C
ONFIG_SYS
_HZ) {/* every second */
putc ('.');
last = get_timer(0);
}
}
/* show that we're waiting */
putc ('.');
last = get_timer(0);
}
}
/* show that we're waiting */
- if ((get_timer(last)) > C
FG_HZ) {
/* every second */
+ if ((get_timer(last)) > C
ONFIG_SYS_HZ) {
/* every second */
putc ('.');
last = get_timer(0);
}
putc ('.');
last = get_timer(0);
}
@@
-581,7
+581,7
@@
static int write_word_amd (flash_info_t *info, FPWV *dest, FPW data)
/* data polling for D7 */
while (res == 0 && (*dest & (FPW)0x00800080) != (data & (FPW)0x00800080)) {
/* data polling for D7 */
while (res == 0 && (*dest & (FPW)0x00800080) != (data & (FPW)0x00800080)) {
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
*dest = (FPW)0x00F000F0; /* reset bank */
res = 1;
}
*dest = (FPW)0x00F000F0; /* reset bank */
res = 1;
}