*** ../u-boot-1.1.3/drivers/cfi_flash.c	Sat Aug 13 17:53:35 2005
--- u-boot-1.1.3/drivers/cfi_flash.c	Tue Aug 23 14:47:06 2005
***************
*** 502,508 ****
  		if ((i % 5) == 0)
  			printf ("\n   ");
  		printf (" %08lX%s",
! 			info->start[i], info->protect[i] ? " (RO)  " : "     ");
  #endif
  	}
  	putc ('\n');
--- 502,508 ----
  		if ((i % 5) == 0)
  			printf ("\n   ");
  		printf (" %08lX%s",
! 			info->start[i], info->protect[i] ? " (RO)" : "     ");
  #endif
  	}
  	putc ('\n');
***************
*** 718,724 ****
  	switch (info->vendor) {
  	case CFI_CMDSET_INTEL_EXTENDED:
  	case CFI_CMDSET_INTEL_STANDARD:
! 		if ((retcode != ERR_OK)
  		    && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
  			retcode = ERR_INVAL;
  			printf ("Flash %s error at address %lx\n", prompt,
--- 718,724 ----
  	switch (info->vendor) {
  	case CFI_CMDSET_INTEL_EXTENDED:
  	case CFI_CMDSET_INTEL_STANDARD:
! 		if ((retcode == ERR_OK)
  		    && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
  			retcode = ERR_INVAL;
  			printf ("Flash %s error at address %lx\n", prompt,