diff options
| author | wdenk <wdenk> | 2004-07-01 22:02:29 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-07-01 22:02:29 +0000 |
| commit | 78953f2f93a17fb87aa5c67df385ef1104c1c692 (patch) | |
| tree | 8f4d9e8ecb13ad304e294dd77f1bd4073bdc662f | |
| parent | e55ca7e2624988f82d6f77ddab54246621260c8b (diff) | |
Patch by Paul Ruhland, 11 Jun 2004:
Remove debug code from 'board/lpd7a40x/flash.c'
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | board/lpd7a40x/flash.c | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index 13e223ea82b..5d4754b048f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ 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: Update for PPChameleon board: - support for SysClk @ 25MHz diff --git a/board/lpd7a40x/flash.c b/board/lpd7a40x/flash.c index 7b8e0141fe7..2dfe37656fc 100644 --- a/board/lpd7a40x/flash.c +++ b/board/lpd7a40x/flash.c @@ -284,25 +284,20 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) sect, info->start[sect]); /* arm simple, non interrupt dependent timer */ - reset_timer(); + reset_timer_masked(); if (info->protect[sect] == 0) { /* not protected */ vu_long *addr = (vu_long *) (info->start[sect]); ulong bsR7, bsR7_2, bsR5, bsR5_2; - ulong tstart; /* *addr = CMD_STATUS_RESET; */ *addr = CMD_ERASE_SETUP; *addr = CMD_ERASE_CONFIRM; /* wait until flash is ready */ - tstart = get_timer(0); do { - ulong now; /* check timeout */ - /*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); + if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) { *addr = CMD_STATUS_RESET; result = BIT_TIMEOUT; break; |