Patch by Paul Ruhland, 11 Jun 2004:

Remove debug code from 'board/lpd7a40x/flash.c'

diff --git a/CHANGELOG b/CHANGELOG
index 13e223ea82bf0b85986030159fd2c641920cc6e6..5d4754b048fb4c60dde0e8f18d386ac00004a059 100644 (file)
--- 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 7b8e0141fe7aec5ad9429f913cf459f8b1b051d9..2dfe37656fc1c112041488f6def5cc3a699ff9ed 100644 (file)
--- 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;