Patch by Paul Ruhland, 11 Jun 2004:

Remove debug code from 'board/lpd7a40x/flash.c'
This commit is contained in:
wdenk 2004-07-01 22:02:29 +00:00
parent e55ca7e262
commit 78953f2f93
2 changed files with 5 additions and 7 deletions

View File

@ -2,6 +2,9 @@
Changes since U-Boot 1.1.1: Changes since U-Boot 1.1.1:
====================================================================== ======================================================================
* Patch by Paul Ruhland, 11 Jun 2004:
Remove debug code from 'board/lpd7a40x/flash.c'
* Patch by Andrea Marson, 11 Jun 2004: * Patch by Andrea Marson, 11 Jun 2004:
Update for PPChameleon board: Update for PPChameleon board:
- support for SysClk @ 25MHz - support for SysClk @ 25MHz

View File

@ -284,25 +284,20 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
sect, info->start[sect]); sect, info->start[sect]);
/* arm simple, non interrupt dependent timer */ /* arm simple, non interrupt dependent timer */
reset_timer(); reset_timer_masked();
if (info->protect[sect] == 0) { /* not protected */ if (info->protect[sect] == 0) { /* not protected */
vu_long *addr = (vu_long *) (info->start[sect]); vu_long *addr = (vu_long *) (info->start[sect]);
ulong bsR7, bsR7_2, bsR5, bsR5_2; ulong bsR7, bsR7_2, bsR5, bsR5_2;
ulong tstart;
/* *addr = CMD_STATUS_RESET; */ /* *addr = CMD_STATUS_RESET; */
*addr = CMD_ERASE_SETUP; *addr = CMD_ERASE_SETUP;
*addr = CMD_ERASE_CONFIRM; *addr = CMD_ERASE_CONFIRM;
/* wait until flash is ready */ /* wait until flash is ready */
tstart = get_timer(0);
do { do {
ulong now;
/* check timeout */ /* check timeout */
/*if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) { */ if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) {
if ((now = get_timer(tstart)) > CFG_FLASH_ERASE_TOUT) {
printf("tstart = 0x%08lx, now = 0x%08lx\n", tstart, now);
*addr = CMD_STATUS_RESET; *addr = CMD_STATUS_RESET;
result = BIT_TIMEOUT; result = BIT_TIMEOUT;
break; break;