From: Wolfgang Denk <wd@nyx.denx.de>
Date: Thu, 2 Mar 2006 11:30:17 +0000 (+0100)
Subject: Merge with /home/sr/git/u-boot/cfi-flash-fix
X-Git-Tag: LABEL_2006_03_12_0025~12^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aed9e2269c770a8ccf66e6e9e963e766fbd532b3;p=u-boot

Merge with /home/sr/git/u-boot/cfi-flash-fix
---

aed9e2269c770a8ccf66e6e9e963e766fbd532b3
diff --cc CHANGELOG
index 2e0a957a66,8e9115eb75..85ae3efbd5
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -2,12 -2,9 +2,15 @@@
  Changes since U-Boot 1.1.4:
  ======================================================================
  
+ * Fix problem with flash_get_size() from CFI driver update
+   Patch by Stefan Roese, 1 Mar 2006
+ 
 +* Make CFG_NO_FLASH work on ARM systems
 +  Patch by Markus Klotzbuecher, 27 Feb 2006
 +
 +* Update mcc200 config: Disable PCI and DoC, use 133 MHz IPB clock,
 +  use hush shell.
 +
  * Convert mcc200 to use common CFI flash driver
    Patch by Stefan Roese, 28 Feb 2006