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
/
sbc8260
/
flash.c
diff --git
a/board/sbc8260/flash.c
b/board/sbc8260/flash.c
index
d3b1f31
..
645c67f
100644
(file)
--- a/
board/sbc8260/flash.c
+++ b/
board/sbc8260/flash.c
@@
-31,7
+31,7
@@
#include <common.h>
#include <mpc8xx.h>
#include <common.h>
#include <mpc8xx.h>
-flash_info_t flash_info[C
FG
_MAX_FLASH_BANKS];
+flash_info_t flash_info[C
ONFIG_SYS
_MAX_FLASH_BANKS];
/*-----------------------------------------------------------------------
* Functions
/*-----------------------------------------------------------------------
* Functions
@@
-49,21
+49,21
@@
unsigned long flash_init (void)
int i;
/* Init: no FLASHes known */
int i;
/* Init: no FLASHes known */
- for (i=0; i<C
FG
_MAX_FLASH_BANKS; ++i) {
+ for (i=0; i<C
ONFIG_SYS
_MAX_FLASH_BANKS; ++i) {
flash_info[i].flash_id = FLASH_UNKNOWN;
}
/* for now, only support the 4 MB Flash SIMM */
flash_info[i].flash_id = FLASH_UNKNOWN;
}
/* for now, only support the 4 MB Flash SIMM */
- size = flash_get_size((vu_long *)C
FG
_FLASH0_BASE, &flash_info[0]);
+ size = flash_get_size((vu_long *)C
ONFIG_SYS
_FLASH0_BASE, &flash_info[0]);
/*
* protect monitor and environment sectors
*/
/*
* protect monitor and environment sectors
*/
-#if C
FG_MONITOR_BASE >= CFG
_FLASH0_BASE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH0_BASE
flash_protect(FLAG_PROTECT_SET,
flash_protect(FLAG_PROTECT_SET,
- C
FG
_MONITOR_BASE,
- C
FG
_MONITOR_BASE+monitor_flash_len-1,
+ C
ONFIG_SYS
_MONITOR_BASE,
+ C
ONFIG_SYS
_MONITOR_BASE+monitor_flash_len-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-77,7
+77,7
@@
unsigned long flash_init (void)
&flash_info[0]);
#endif
&flash_info[0]);
#endif
- return /*size*/ (C
FG
_FLASH0_SIZE * 1024 * 1024);
+ return /*size*/ (C
ONFIG_SYS
_FLASH0_SIZE * 1024 * 1024);
}
/*-----------------------------------------------------------------------
}
/*-----------------------------------------------------------------------
@@
-258,7
+258,7
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
last = start;
addr = (vu_long*)(info->start[l_sect]);
while ((addr[0] & 0x80808080) != 0x80808080) {
last = start;
addr = (vu_long*)(info->start[l_sect]);
while ((addr[0] & 0x80808080) != 0x80808080) {
- if ((now = get_timer(start)) > C
FG
_FLASH_ERASE_TOUT) {
+ if ((now = get_timer(start)) > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout\n");
return 1;
}
printf ("Timeout\n");
return 1;
}
@@
-381,7
+381,7
@@
static int write_word (flash_info_t *info, ulong dest, ulong data)
/* data polling for D7 */
start = get_timer (0);
while ((*((vu_long *)dest) & 0x80808080) != (data & 0x80808080)) {
/* data polling for D7 */
start = get_timer (0);
while ((*((vu_long *)dest) & 0x80808080) != (data & 0x80808080)) {
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
return (1);
}
}
return (1);
}
}