diff options
| author | wdenk <wdenk> | 2004-12-31 09:32:47 +0000 | 
|---|---|---|
| committer | wdenk <wdenk> | 2004-12-31 09:32:47 +0000 | 
| commit | e2ffd59b4d93c9149de1caaa087371b0cfc512c9 (patch) | |
| tree | 86cfb6e30bec1686253b0542d76f57c5d62d183a /board/cmc_pu2/flash.c | |
| parent | 400ab719c6025c176c50bcdff342384222d7424b (diff) | |
| download | olio-uboot-2014.01-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.tar.xz olio-uboot-2014.01-e2ffd59b4d93c9149de1caaa087371b0cfc512c9.zip | |
* Code cleanup, mostly for GCC-3.3.x
* Cleanup confusing use of CONFIG_ETH*ADDR - ust his only to
  pre-define a MAC address; use CONFIG_HAS_ETH* to enable support for
  additional ethernet addresses.
* Cleanup drivers/i82365.c - avoid duplication of code
* Fix bogus "cannot span across banks" flash error message
* Add support for CompactFlash for the CPC45 Board.
Diffstat (limited to 'board/cmc_pu2/flash.c')
| -rw-r--r-- | board/cmc_pu2/flash.c | 5 | 
1 files changed, 2 insertions, 3 deletions
| diff --git a/board/cmc_pu2/flash.c b/board/cmc_pu2/flash.c index 846a2e6bf..9983c7b78 100644 --- a/board/cmc_pu2/flash.c +++ b/board/cmc_pu2/flash.c @@ -264,7 +264,7 @@ int	flash_erase (flash_info_t *info, int s_first, int s_last)  {  	vu_short *addr = (vu_short *)(info->start[0]);  	int flag, prot, sect, ssect, l_sect; -	ulong start, now, last; +	ulong now, last;  	debug ("flash_erase: first: %d last: %d\n", s_first, s_last); @@ -336,7 +336,7 @@ int	flash_erase (flash_info_t *info, int s_first, int s_last)  			goto DONE;  		reset_timer_masked (); -		last  = start; +		last  = 0;  		addr = (vu_short *)(info->start[l_sect]);  		while ((addr[0] & 0x0080) != 0x0080) {  			if ((now = get_timer_masked ()) > CFG_FLASH_ERASE_TOUT) { @@ -432,7 +432,6 @@ printf ("write_buff 1: write_word_amd() rc=%d\n", rc);   */  static int write_word_amd (flash_info_t *info, vu_short *dest, ushort data)  { -	ulong start;  	int flag;  	vu_short *base;		/* first address in flash bank	*/ |