Merge with Stefan Roese's branch with CFI driver fixes

diff --cc CHANGELOG
index a4b0700dbcd7bf409be920fbe418e46cceffc4b0,e7683ecfb8dee4b68016d38052f1ce2bc9683238..baa9537cb920af8e56883cd2b9cc4cdf1f4188ee
--- 1/CHANGELOG
--- 2/CHANGELOG
+++ b/CHANGELOG
@@@ -2,9 -2,48 +2,51 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Convert mcc200 to use common CFI flash driver
+   Patch by Stefan Roese, 28 Feb 2006
+ 
+ * Add env-variable "unlock" to handle initial state of sectors
+   (locked/unlocked).
+ 
+   Only the U-Boot image and it's environment is protected,
+   all other sectors are unprotected (unlocked) if flash
+   hardware protection is used (CFG_FLASH_PROTECTION) and
+   the environment variable "unlock" is set to "yes".
+ 
+   Patch by Stefan Roese, 28 Feb 2006
+ 
+ * Update drivers/cfi_flash.c:
+   - find_sector() called in both versions of flash_write_cfiword()
+   Patch by Peter Pearse, 27th Feb 2006
+ 
+ * CFI support for a x8/x16 AMD/Spansion flash configured in x8 mode
+   Patch by Jose Maria Lopez, 16 Jan 2006
+ 
+ * Add support for AMD/Spansion Flashes in flash_write_cfibuffer
+   Patch by Alex Bastos and Thomas Schaefer, 2005-08-29
+ 
+ * Changes/fixes for drivers/cfi_flash.c:
+   We *should* check if there are any error bits if the previous call
+   returned ERR_OK (Otherwise we will have output an error message in
+   flash_status_check() already.)  The original code would only check for
+   error bits if flash_status_check() returns ERR_TIMEOUT.
+   Patch by Marcus Hall, 23 Aug 2005
+ 
+ * Changes/fixes for drivers/cfi_flash.c:
+   - Add CFG_FLASH_PROTECT_CLEAR on drivers/cfi_flash.c
+   - Prohibit buffer write when buffer_size is 1 on drivers/cfi_flash.c
+   Patch by Sangmoon Kim, 19 Aug 2005
+ 
+ * Fixes for drivers/cfi_flash.c:
+   - Fix wrong timeout value usage in flash_status_check()
+   - Round write_tout up when converting to msec in flash_get_size()
+   - Remove clearing flash status at the end of flash_write_cfibuffer()
+     which sets Intel 28F640J3 flash back to command mode on CSB472
+   Patch by Tolunay Orkun, 02 July 2005
+ 
 +* Add basic support for the SMMACO4 Board from PanDaCom.
 +  Patch by Heiko Schocher, 20 Feb 2006
 +
  * Add GIT version information (commid ID) to untagged U-Boot versions
  
    As done in the linux kernel, the U-Boot version (U_BOOT_VERSION)