From 78953f2f93a17fb87aa5c67df385ef1104c1c692 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Thu, 1 Jul 2004 22:02:29 +0000
Subject: [PATCH] Patch by Paul Ruhland, 11 Jun 2004: Remove debug code from
'board/lpd7a40x/flash.c'
---
CHANGELOG | 3 +++
board/lpd7a40x/flash.c | 9 ++-------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 13e223ea82..5d4754b048 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 7b8e0141fe..2dfe37656f 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;
--
2.39.5