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
/
MAI
/
AmigaOneG3SE
/
flash_new.c
diff --git
a/board/MAI/AmigaOneG3SE/flash_new.c
b/board/MAI/AmigaOneG3SE/flash_new.c
index
3efee7e
..
7b7ea16
100644
(file)
--- a/
board/MAI/AmigaOneG3SE/flash_new.c
+++ b/
board/MAI/AmigaOneG3SE/flash_new.c
@@
-39,7
+39,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 ulong flash_get_size (ulong addr, flash_info_t *info);
static int flash_get_offsets (ulong base, flash_info_t *info);
static ulong flash_get_size (ulong addr, flash_info_t *info);
static int flash_get_offsets (ulong base, flash_info_t *info);
@@
-80,7
+80,7
@@
unsigned long flash_init_old(void)
{
int i;
{
int i;
- 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;
flash_info[i].sector_count = 0;
{
flash_info[i].flash_id = FLASH_UNKNOWN;
flash_info[i].sector_count = 0;
@@
-101,25
+101,25
@@
unsigned long flash_init (void)
flash_to_xd();
/* Init: no FLASHes known */
flash_to_xd();
/* 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;
flash_info[i].sector_count = 0;
flash_info[i].size = 0;
}
flash_info[i].flash_id = FLASH_UNKNOWN;
flash_info[i].sector_count = 0;
flash_info[i].size = 0;
}
- DEBUGF("\n## Get flash size @ 0x%08x\n", C
FG
_FLASH_BASE);
+ DEBUGF("\n## Get flash size @ 0x%08x\n", C
ONFIG_SYS
_FLASH_BASE);
- flash_size = flash_get_size (C
FG
_FLASH_BASE, flash_info);
+ flash_size = flash_get_size (C
ONFIG_SYS
_FLASH_BASE, flash_info);
DEBUGF("## Flash bank size: %08lx\n", flash_size);
if (flash_size) {
DEBUGF("## Flash bank size: %08lx\n", flash_size);
if (flash_size) {
-#if C
FG_MONITOR_BASE >= CFG
_FLASH_BASE && \
- C
FG_MONITOR_BASE < CFG_FLASH_BASE + CFG
_FLASH_MAX_SIZE
+#if C
ONFIG_SYS_MONITOR_BASE >= CONFIG_SYS
_FLASH_BASE && \
+ C
ONFIG_SYS_MONITOR_BASE < CONFIG_SYS_FLASH_BASE + CONFIG_SYS
_FLASH_MAX_SIZE
/* 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,
+ C
ONFIG_SYS
_MONITOR_BASE,
+ C
ONFIG_SYS
_MONITOR_BASE + monitor_flash_len - 1,
&flash_info[0]);
#endif
&flash_info[0]);
#endif
@@
-286,10
+286,10
@@
static ulong flash_get_size (ulong addr, flash_info_t *info)
}
}
- if (info->sector_count > C
FG
_MAX_FLASH_SECT) {
+ if (info->sector_count > C
ONFIG_SYS
_MAX_FLASH_SECT) {
printf ("** ERROR: sector count %d > max (%d) **\n",
printf ("** ERROR: sector count %d > max (%d) **\n",
- info->sector_count, C
FG
_MAX_FLASH_SECT);
- info->sector_count = C
FG
_MAX_FLASH_SECT;
+ info->sector_count, C
ONFIG_SYS
_MAX_FLASH_SECT);
+ info->sector_count = C
ONFIG_SYS
_MAX_FLASH_SECT;
}
if (! flash_get_offsets (addr, info)) {
}
if (! flash_get_offsets (addr, info)) {
@@
-418,10
+418,10
@@
int flash_erase (flash_info_t *info, int s_first, int s_last)
last = start;
addr = info->start[l_sect];
last = start;
addr = info->start[l_sect];
- DEBUGF ("Start erase timeout: %d\n", C
FG
_FLASH_ERASE_TOUT);
+ DEBUGF ("Start erase timeout: %d\n", C
ONFIG_SYS
_FLASH_ERASE_TOUT);
while ((in8(addr) & 0x80) != 0x80) {
while ((in8(addr) & 0x80) != 0x80) {
- if ((now = get_timer(start)) > C
FG
_FLASH_ERASE_TOUT) {
+ if ((now = get_timer(start)) > C
ONFIG_SYS
_FLASH_ERASE_TOUT) {
printf ("Timeout\n");
flash_reset (info->start[0]);
flash_to_mem();
printf ("Timeout\n");
flash_reset (info->start[0]);
flash_to_mem();
@@
-562,7
+562,7
@@
static int write_word (flash_info_t *info, ulong dest, ulong data)
/* data polling for D7 */
start = get_timer (0);
while ((in8(dest+i) & 0x80) != (data_ch[i] & 0x80)) {
/* data polling for D7 */
start = get_timer (0);
while ((in8(dest+i) & 0x80) != (data_ch[i] & 0x80)) {
- if (get_timer(start) > C
FG
_FLASH_WRITE_TOUT) {
+ if (get_timer(start) > C
ONFIG_SYS
_FLASH_WRITE_TOUT) {
flash_reset (addr);
flash_to_mem();
return (1);
flash_reset (addr);
flash_to_mem();
return (1);