projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4xx: Remove binary cpld bitstream from CMS700 board
[oweals/u-boot.git]
/
board
/
mbx8xx
/
flash.c
diff --git
a/board/mbx8xx/flash.c
b/board/mbx8xx/flash.c
index e1aa47bbaa96159572f2154eaf20da4ead2ddad5..2ec420d511de8a1418d067517abdcf0aea98bac0 100644
(file)
--- a/
board/mbx8xx/flash.c
+++ b/
board/mbx8xx/flash.c
@@
-32,7
+32,7
@@
#include <mpc8xx.h>
#include "vpd.h"
#include <mpc8xx.h>
#include "vpd.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
*/
/*-----------------------------------------------------------------------
* Functions
/*-----------------------------------------------------------------------
* Functions
@@
-51,13
+51,13
@@
unsigned long flash_init (void)
ulong addr;
/* Init: no FLASHes known */
ulong addr;
/* 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;
}
totsize = 0;
addr = 0xfc000000;
flash_info[i].flash_id = FLASH_UNKNOWN;
}
totsize = 0;
addr = 0xfc000000;
- for(i = 0; i < C
FG
_MAX_FLASH_BANKS; i++) {
+ for(i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; i++) {
size = flash_get_size((vu_long *)addr, &flash_info[i]);
if (flash_info[i].flash_id == FLASH_UNKNOWN)
break;
size = flash_get_size((vu_long *)addr, &flash_info[i]);
if (flash_info[i].flash_id == FLASH_UNKNOWN)
break;
@@
-66,7
+66,7
@@
unsigned long flash_init (void)
}
addr = 0xfe000000;
}
addr = 0xfe000000;
- for(i = 0; i < C
FG
_MAX_FLASH_BANKS; i++) {
+ for(i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; i++) {
size = flash_get_size((vu_long *)addr, &flash_info[i]);
if (flash_info[i].flash_id == FLASH_UNKNOWN)
size = flash_get_size((vu_long *)addr, &flash_info[i]);
if (flash_info[i].flash_id == FLASH_UNKNOWN)
@@
-75,11
+75,11
@@
unsigned long flash_init (void)
addr += size;
}
addr += 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+CFG_MONITOR_LEN
-1,
+ C
ONFIG_SYS
_MONITOR_BASE,
+ C
ONFIG_SYS_MONITOR_BASE+monitor_flash_len
-1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-274,7
+274,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;
}
@@
-397,7
+397,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);
}
}