From 42d1f0394bef0624fc9664714d54bb137931d6a6 Mon Sep 17 00:00:00 2001 From: wdenk Date: Wed, 15 Oct 2003 23:53:47 +0000 Subject: * Patches by Xianghua Xiao, 15 Oct 2003: - Added Motorola CPU 8540/8560 support (cpu/85xx) - Added Motorola MPC8540ADS board support (board/mpc8540ads) - Added Motorola MPC8560ADS board support (board/mpc8560ads) * Minor code cleanup --- board/omap1610inn/flash.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'board/omap1610inn/flash.c') diff --git a/board/omap1610inn/flash.c b/board/omap1610inn/flash.c index 0108545..e7d6515 100644 --- a/board/omap1610inn/flash.c +++ b/board/omap1610inn/flash.c @@ -54,7 +54,6 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ #define mb() __asm__ __volatile__ ("" : : : "memory") - /* Flash Organization Structure */ typedef struct OrgDef { unsigned int sector_number; @@ -240,8 +239,6 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info) } - - /* unprotects a sector for write and erase * on some intel parts, this unprotects the entire chip, but it * wont hurt to call this additional times per sector... @@ -298,8 +295,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) } - - start = get_timer (0); last = start; @@ -326,7 +321,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) { - if (get_timer_masked () > + if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) { printf ("Timeout\n"); /* suspend erase */ -- cgit v1.1