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_ENV macros to CONFIG_ENV
[platform/kernel/u-boot.git]
/
board
/
ep7312
/
flash.c
diff --git
a/board/ep7312/flash.c
b/board/ep7312/flash.c
index
373d238
..
1ef06f8
100644
(file)
--- a/
board/ep7312/flash.c
+++ b/
board/ep7312/flash.c
@@
-50,7
+50,7
@@
ulong flash_init (void)
if (i == 0)
flashbase = PHYS_FLASH_1;
else
if (i == 0)
flashbase = PHYS_FLASH_1;
else
- panic ("configured to many flash banks!\n");
+ panic ("configured to
o
many flash banks!\n");
for (j = 0; j < flash_info[i].sector_count; j++) {
flash_info[i].start[j] = flashbase + j * MAIN_SECT_SIZE;
}
for (j = 0; j < flash_info[i].sector_count; j++) {
flash_info[i].start[j] = flashbase + j * MAIN_SECT_SIZE;
}
@@
-61,12
+61,12
@@
ulong flash_init (void)
*/
flash_protect ( FLAG_PROTECT_SET,
CFG_FLASH_BASE,
*/
flash_protect ( FLAG_PROTECT_SET,
CFG_FLASH_BASE,
- CFG_FLASH_BASE +
_armboot_end_data - _armboot_start
,
+ CFG_FLASH_BASE +
monitor_flash_len - 1
,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
&flash_info[0]);
flash_protect ( FLAG_PROTECT_SET,
- C
F
G_ENV_ADDR,
- C
FG_ENV_ADDR + CF
G_ENV_SIZE - 1, &flash_info[0]);
+ C
ONFI
G_ENV_ADDR,
+ C
ONFIG_ENV_ADDR + CONFI
G_ENV_SIZE - 1, &flash_info[0]);
return size;
}
return size;
}
@@
-109,7
+109,7
@@
void flash_print_info (flash_info_t * info)
}
printf ("\n");
}
printf ("\n");
- Done:
+Done: ;
}
/*-----------------------------------------------------------------------
}
/*-----------------------------------------------------------------------